Automatic translation importHEADreplicant-6.0-0004-rc3replicant-6.0-0004-rc2cm-13.0

Change-Id: Ib93059b46ae36881aa5402b335b6d49efc28fee6

119 files changed, 5979 insertions, 12766 deletions

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 7b748b0..638f161 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Rapporteer as gemors na %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Verwyder \'unicode\'</string>
-  <string name="pref_unicode_stripping_leave_intact">Laat karakters ongeskonde</string>
-  <string name="pref_unicode_stripping_non_encodable">Verwyder nie-enkodeerbare karakters</string>
-  <string name="pref_unicode_stripping_all">Verwyder al \'unicode\' karakters</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Geldigheid tydperk</string>
-  <string name="validity_period_slot1_pref_title">Geldigheid tydperk vir SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Geldigheid tydperk vir SIM 2</string>
-  <string name="sms_validity_period_not_set">Nie gestel nie</string>
-  <string name="sms_validity_period_one_hour">1 uur</string>
-  <string name="sms_validity_period_six_hours">6 ure</string>
-  <string name="sms_validity_period_twelve_hours">12 ure</string>
-  <string name="sms_validity_period_one_day">1 dag</string>
-  <string name="mms_validity_period_two_days">2 dae</string>
-  <string name="mms_validity_period_one_week">1 week</string>
-  <string name="validity_period_maximum">Maksimum</string>
-  <string name="pref_summary_mms_delivery_reports">Versoek \'n aflewering verslag vir elke boodskap wat jy stuur</string>
-  <string name="pref_summary_mms_read_reports">Versoek \'n lees verslag vir elke boodskap wat jy stuur</string>
-  <string name="delivery_reports_mms_pref_title">Aflewering verslae</string>
-  <string name="read_reports_mms_pref_title">Lees verslae</string>
-  <string name="status_label">Status:\u0020</string>
-  <string name="status_read">Lees</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Stuur prioriteit</string>
-  <string name="priority_low">Laag</string>
-  <string name="priority_normal">Normaal</string>
-  <string name="priority_high">Hoog</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Stoor spasie</string>
-  <string name="pref_summary_auto_delete">Verwyder ou boodskappe, want jou limiet is bereik</string>
-  <string name="auto_delete_pref_title">Verwyder ou boodskappe</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> boodskappe per gesprek</string>
-  <string name="sms_delete_pref_title">SMS-boodskap limiet</string>
-  <string name="mms_delete_pref_title">Multimedia boodskap limiet</string>
-  <string name="set">Stel</string>
-  <string name="no">Kanselleer</string>
-  <string name="pref_messages_to_save">Stel aantal boodskappe om te stoor</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Sleep om uit te vee</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Vee na regs om gesprek uit te vee</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Vinnige boodskap en antwoord</string>
-  <string name="pref_quickmessage_title">Wys vinnige boodskap</string>
-  <string name="pref_quickmessage_summary">Outomaties maak oop die vinnige boodskap pop-up vir inkomende SMS-boodskappe</string>
-  <string name="pref_close_all_title">Maak almal toe</string>
-  <string name="pref_close_all_summary">Die \'Maak toe\'-knoppie maak alle boodskappe in die Kitsboodskap-dialoog toe</string>
-  <string name="message_counter">%1$d van %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Maak toe</string>
-  <string name="button_view">Maak oop</string>
-  <string name="button_templates">Sjablone</string>
-  <string name="qm_button_full_conversation">Vol gesprek</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Raak om te antwoord</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Stuur \'n boodskap\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Kitsantwoord</string>
-  <string name="send">Stuur</string>
-  <string name="compose_message_hint_text">Tik boodskap</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Emosieikone toegang</string>
-  <string name="show_emoticons_pref_summary">Wys emosieikone sleutel op die sleutelbord</string>
-  <string name="select_phone_account_title">Stuur met</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Bestuur SIM-kaart boodskappe</string>
-  <string name="pref_title_manage_sim_messages_slot1">Bestuur SIM 1 se boodskappe</string>
-  <string name="pref_title_manage_sim_messages_slot2">Bestuur SIM 2 se boodskappe</string>
-  <string name="copy_to_sim">Kopieer boodskap na SIM-kaart</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> van <xliff:g id="total">%2$d</xliff:g> boodskappe gestoor na SIM-kaart.</string>
-  <string name="copy_to_sim_fail">Kon nie boodskap stoor nie</string>
-  <string name="copy_to_phone_success">Boodskap gestoor</string>
-  <string name="copy_to_phone_fail">Kon nie boodskap stoor nie</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">Geen boodskappe op die SIM-kaart.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Stuur e-pos 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">Bel <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">Voeg <xliff:g id="contactEmailOrNumber">%s</xliff:g> by mense</string>
-  <string name="sim_capacity_title">SIM kapasiteit</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> SIM-kaart inskrywings word gebruik</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Verwyder?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">SMS-boodskappe op die SIM-kaart</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Herlaai tans\u2026</string>
-  <string name="confirm_delete_selected_messages">Die geselekteerde boodskap sal verwyder word.</string>
-  <!-- Delete button title -->
-  <string name="delete">Verwyder</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Vorentoe</string>
-  <string name="menu_reply">Antwoord</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Kopieer na tablet geheue</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Kopieer na foon geheue</string>
-  <string name="selected_all">Kies alles</string>
-  <string name="deselected_all">Ontkies alles</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> gekies</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">Kopieer boodskap na SIM-kaart</string>
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Kies prente of video\'s van hierdie toestel</string>
-  <string name="mediapicker_audioListChooserDescription">Kies oudio-lêers van hierdie toestel</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Kan nie video aanheg nie. Maks boodskap grootte oorskry.</string>
-  <string name="mediapicker_audio_list_title">Kies oudio</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Oudio is gekies.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Die oudio is nie gekies nie.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> gekies</string>
+    <string name="report_as_spam_to">Rapporteer as gemors na %s</string>
+    <string name="unicode_stripping_pref_title">Verwyder \'unicode\'</string>
+    <string name="pref_unicode_stripping_leave_intact">Laat karakters ongeskonde</string>
+    <string name="pref_unicode_stripping_non_encodable">Verwyder nie-enkodeerbare karakters</string>
+    <string name="pref_unicode_stripping_all">Verwyder al \'unicode\' karakters</string>
+    <string name="validity_period_pref_title">Geldigheid tydperk</string>
+    <string name="validity_period_slot1_pref_title">Geldigheid tydperk vir SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Geldigheid tydperk vir SIM 2</string>
+    <string name="sms_validity_period_not_set">Nie gestel nie</string>
+    <string name="sms_validity_period_one_hour">1 uur</string>
+    <string name="sms_validity_period_six_hours">6 ure</string>
+    <string name="sms_validity_period_twelve_hours">12 ure</string>
+    <string name="sms_validity_period_one_day">1 dag</string>
+    <string name="mms_validity_period_two_days">2 dae</string>
+    <string name="mms_validity_period_one_week">1 week</string>
+    <string name="validity_period_maximum">Maksimum</string>
+    <string name="pref_summary_mms_delivery_reports">Versoek \'n aflewering verslag vir elke boodskap wat jy stuur</string>
+    <string name="pref_summary_mms_read_reports">Versoek \'n lees verslag vir elke boodskap wat jy stuur</string>
+    <string name="delivery_reports_mms_pref_title">Aflewering verslae</string>
+    <string name="read_reports_mms_pref_title">Lees verslae</string>
+    <string name="status_label">Status:\u0020</string>
+    <string name="status_read">Lees</string>
+    <string name="priority_pref_title">Stuur prioriteit</string>
+    <string name="priority_low">Laag</string>
+    <string name="priority_normal">Normaal</string>
+    <string name="priority_high">Hoog</string>
+    <string name="sms_storage_pref_title">Stoor spasie</string>
+    <string name="pref_summary_auto_delete">Verwyder ou boodskappe, want jou limiet is bereik</string>
+    <string name="auto_delete_pref_title">Verwyder ou boodskappe</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> boodskappe per gesprek</string>
+    <string name="sms_delete_pref_title">SMS-boodskap limiet</string>
+    <string name="mms_delete_pref_title">Multimedia boodskap limiet</string>
+    <string name="set">Stel</string>
+    <string name="no">Kanselleer</string>
+    <string name="pref_messages_to_save">Stel aantal boodskappe om te stoor</string>
+    <string name="swipe_to_delete_conversation_pref_title">Sleep om uit te vee</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Vee na regs om gesprek uit te vee</string>
+    <string name="pref_quickmessage">Vinnige boodskap en antwoord</string>
+    <string name="pref_quickmessage_title">Wys vinnige boodskap</string>
+    <string name="pref_quickmessage_summary">Outomaties maak oop die vinnige boodskap pop-up vir inkomende SMS-boodskappe</string>
+    <string name="pref_close_all_title">Maak almal toe</string>
+    <string name="pref_close_all_summary">Die \'Maak toe\'-knoppie maak alle boodskappe in die Kitsboodskap-dialoog toe</string>
+    <string name="message_counter">%1$d van %2$d</string>
+    <string name="button_close">Maak toe</string>
+    <string name="button_view">Maak oop</string>
+    <string name="button_templates">Sjablone</string>
+    <string name="qm_button_full_conversation">Vol gesprek</string>
+    <string name="type_to_reply_text_enter_to_send">Raak om te antwoord</string>
+    <string name="toast_sending_message">Stuur \'n boodskap\u2026</string>
+    <string name="qm_quick_reply">Kitsantwoord</string>
+    <string name="send">Stuur</string>
+    <string name="compose_message_hint_text">Tik boodskap</string>
+    <string name="show_emoticons_pref_title">Emosieikone toegang</string>
+    <string name="show_emoticons_pref_summary">Wys emosieikone sleutel op die sleutelbord</string>
+    <string name="select_phone_account_title">Stuur met</string>
+    <string name="pref_title_manage_sim_messages">Bestuur SIM-kaart boodskappe</string>
+    <string name="pref_title_manage_sim_messages_slot1">Bestuur SIM 1 se boodskappe</string>
+    <string name="pref_title_manage_sim_messages_slot2">Bestuur SIM 2 se boodskappe</string>
+    <string name="copy_to_sim">Kopieer boodskap na SIM-kaart</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> van <xliff:g id="total">%2$d</xliff:g> boodskappe gestoor na SIM-kaart.</string>
+    <string name="copy_to_sim_fail">Kon nie boodskap stoor nie</string>
+    <string name="copy_to_phone_success">Boodskap gestoor</string>
+    <string name="copy_to_phone_fail">Kon nie boodskap stoor nie</string>
+    <string name="sim_empty">Geen boodskappe op die SIM-kaart.</string>
+    <string name="menu_send_email">Stuur e-pos na <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Bel <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Voeg <xliff:g id="contactEmailOrNumber">%s</xliff:g> by mense</string>
+    <string name="sim_capacity_title">SIM kapasiteit</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> SIM-kaart inskrywings word gebruik</string>
+    <string name="confirm_dialog_title">Verwyder?</string>
+    <string name="sim_manage_messages_title">SMS-boodskappe op die SIM-kaart</string>
+    <string name="refreshing">Herlaai tans\u2026</string>
+    <string name="confirm_delete_selected_messages">Die geselekteerde boodskap sal verwyder word.</string>
+    <string name="delete">Verwyder</string>
+    <string name="menu_forward">Vorentoe</string>
+    <string name="menu_reply">Antwoord</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Kopieer na tablet geheue</string>
+    <string name="sim_copy_to_phone_memory" product="default">Kopieer na foon geheue</string>
+    <string name="selected_all">Kies alles</string>
+    <string name="deselected_all">Ontkies alles</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> gekies</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Kopieer boodskap na SIM-kaart</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Kies prente of video\'s van hierdie toestel</string>
+    <string name="mediapicker_audioListChooserDescription">Kies oudio-lêers van hierdie toestel</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Kan nie video aanheg nie. Maks boodskap grootte oorskry.</string>
+    <string name="mediapicker_audio_list_title">Kies oudio</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Oudio is gekies.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Die oudio is nie gekies nie.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> gekies</string>
 </resources>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-am/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 26c95d1..b4aff6f 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -16,88 +16,96 @@
     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">١ يوم</string>
-  <string name="mms_validity_period_two_days">2 يوم</string>
-  <string name="mms_validity_period_one_week">١ أسبوع</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>
-  <!-- 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_close_all_title">إغلاق الكل</string>
-  <string name="pref_close_all_summary">زر الإغلاق يعمل على إغلاق كل الرسائل</string>
-  <string name="message_counter">%1$d من %2$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">جاري إرسال الرسالة…</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 -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">الإبلاغ كإزعاج لـ %s</string>
+    <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>
+    <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">١ يوم</string>
+    <string name="mms_validity_period_two_days">2 يوم</string>
+    <string name="mms_validity_period_one_week">١ أسبوع</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>
+    <string name="priority_pref_title">أولوية الإرسال</string>
+    <string name="priority_low">منخفض</string>
+    <string name="priority_normal">عادي</string>
+    <string name="priority_high">مرتفع</string>
+    <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>
+    <string name="swipe_to_delete_conversation_pref_title">تمرير لإجراء حذف</string>
+    <string name="swipe_to_delete_conversation_pref_summary">تمرير إلى اليمين لحذف محادثة</string>
+    <string name="pref_quickmessage">رسالة سريعة ورد</string>
+    <string name="pref_quickmessage_title">عرض الرسالة السريعة</string>
+    <string name="pref_quickmessage_summary">عرض إطار \" رسالة سريعة\" المنبثق تلقائياً للرسائل القصيرة الواردة</string>
+    <string name="pref_close_all_title">إغلاق الكل</string>
+    <string name="pref_close_all_summary">زر الإغلاق يعمل على إغلاق كل الرسائل</string>
+    <string name="message_counter">%1$d من %2$d</string>
+    <string name="button_close">إغلاق</string>
+    <string name="button_view">عرض</string>
+    <string name="button_templates">قوالب</string>
+    <string name="qm_button_full_conversation">محادثة كاملة</string>
+    <string name="type_to_reply_text_enter_to_send">اكتب للرد</string>
+    <string name="toast_sending_message">جاري إرسال الرسالة…</string>
+    <string name="qm_quick_reply">الرد السريع</string>
+    <string name="send">إرسال</string>
+    <string name="compose_message_hint_text">إدخال رسالة</string>
+    <string name="show_emoticons_pref_title">الوصول إلى التعبيرات</string>
+    <string name="show_emoticons_pref_summary">إظهار مفتاح التعبيرات على لوحة المفاتيح</string>
+    <string name="select_phone_account_title">إرسال بواسطة</string>
+    <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="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>
+    <string name="sim_empty">لا توجد رسائل في بطاقة SIM.</string>
+    <string name="menu_send_email">إرسال بريد إلكتروني إلى <xliff:g id="name">%s </xliff:g></string>
+    <string name="menu_call_back">الاتصال بـ <xliff:g id="name">%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"><xliff:g id="used">%1$d</xliff:g> من <xliff:g id="total">%2$d</xliff:g> إدخالات بطاقة SIM مستخدمة</string>
+    <string name="confirm_dialog_title">حذف؟</string>
+    <string name="sim_manage_messages_title">الرسائل النصية على بطاقة SIM</string>
+    <string name="refreshing">تحديث</string>
+    <string name="confirm_delete_selected_messages">سيتم حذف الرسالة المحددة.</string>
+    <string name="delete">حذف</string>
+    <string name="menu_forward">إعادة إرسال</string>
+    <string name="menu_reply">الرد</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">النسخ إلى ذاكرة الجهاز اللوحي</string>
+    <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>
+    <string name="yes">موافق</string>
+    <string name="operation_to_card_memory">نسخ الرسالة إلى بطاقة SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <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>
 </resources>
diff --git a/res/values-as-rIN/arrays.xml b/res/values-as-rIN/arrays.xml
deleted file mode 100644
index f2be096..0000000
--- a/res/values-as-rIN/arrays.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String to match as no subject and filter out as a subject. For example, if the
-         subject string is "no subject", we won't display that. We'll pretend
-         no subject string was delivered. -->
-  <!-- Choices for quick-reply to message notification. Users with an Android
-    Wear device (e.g. smartwatch) can reply to messages either by speaking their
-    response, or choosing one of these predefined options. -->
-</resources>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 8e49536..8a12aa0 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -16,60 +16,29 @@
     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">ষ্ট্ৰিপ ইউনিকোড</string>
-  <string name="pref_unicode_stripping_leave_intact">বৰ্ণবোৰ অক্ষত ৰাখক</string>
-  <string name="pref_unicode_stripping_non_encodable">এনকোড কৰিব নোৱাৰা বৰ্ণবোৰ ষ্ট্ৰিপ কৰক</string>
-  <string name="pref_unicode_stripping_all">সকলো ইউনিকোড বৰ্ণ ষ্ট্ৰিপ কৰক</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- 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">ইনকামিং SMS বাৰ্তাৰ বাবে স্বয়ংক্ৰিয়ভাবে কুইকবাৰ্তা পপ-আপ খোলক</string>
-  <string name="pref_close_all_title">সকলো বন্ধ কৰক</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 -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">%s লৈ স্পাম হিচাপে ৰিপোৰ্ট কৰক</string>
+    <string name="unicode_stripping_pref_title">ষ্ট্ৰিপ ইউনিকোড</string>
+    <string name="pref_unicode_stripping_leave_intact">বৰ্ণবোৰ অক্ষত ৰাখক</string>
+    <string name="pref_unicode_stripping_non_encodable">এনকোড কৰিব নোৱাৰা বৰ্ণবোৰ ষ্ট্ৰিপ কৰক</string>
+    <string name="pref_unicode_stripping_all">সকলো ইউনিকোড বৰ্ণ ষ্ট্ৰিপ কৰক</string>
+    <string name="swipe_to_delete_conversation_pref_title">মচি পেলাবলৈ স্ৱাইপ কৰক</string>
+    <string name="swipe_to_delete_conversation_pref_summary">কথোপকথন মচিবলৈ সোঁ ফাললৈ স্ৱাইপ কৰক</string>
+    <string name="pref_quickmessage">কুইকবাৰ্তা আৰু উত্তৰ</string>
+    <string name="pref_quickmessage_title">কুইকবাৰ্তা প্ৰদৰ্শন কৰক</string>
+    <string name="pref_quickmessage_summary">ইনকামিং SMS বাৰ্তাৰ বাবে স্বয়ংক্ৰিয়ভাবে কুইকবাৰ্তা পপ-আপ খোলক</string>
+    <string name="pref_close_all_title">সকলো বন্ধ কৰক</string>
+    <string name="pref_close_all_summary">ক্লোজ বুটামে সকলো বাৰ্তা বন্ধ কৰে</string>
+    <string name="message_counter">%2$d ৰ %1$d</string>
+    <string name="button_close">বন্ধ</string>
+    <string name="button_view">চাওক</string>
+    <string name="button_templates">টেমপ্লেটসমূহ</string>
+    <string name="qm_button_full_conversation">পূৰ্ণ কথোপকথন</string>
+    <string name="type_to_reply_text_enter_to_send">উত্তৰ দিবলৈ টাইপ কৰক</string>
+    <string name="toast_sending_message">মেচেজ প্ৰেৰণ কৰা হৈ আছে \u2026</string>
+    <string name="qm_quick_reply">দ্ৰুত উত্তৰ</string>
+    <string name="send">প্ৰেৰণ</string>
+    <string name="compose_message_hint_text">বাৰ্তা প্ৰৱেশ কৰক</string>
+    <string name="show_emoticons_pref_title">ইমটিকনৰ অনুমতি</string>
+    <string name="show_emoticons_pref_summary">ইমটিকনৰ কীটো কীবৰ্ডত দেখাওক</string>
+    <string name="select_phone_account_title">ইয়াৰে প্ৰেৰণ কৰক</string>
 </resources>
diff --git a/res/values-as-rIN/strings.xml b/res/values-as-rIN/strings.xml
deleted file mode 100644
index d73a67e..0000000
--- a/res/values-as-rIN/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- The name of the application as it appears under the main Launcher icon and in various activity titles -->
-  <!-- The name of the application as it appears in external share intent dialogs -->
-  <!-- The title when selecting a conversation to share to -->
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <!-- The tab header for the frequently used contacts list -->
-  <!-- The tab header for all contacts list -->
-  <!-- The text on the list item in the contact picker that allows a user to send an SMS directly
-         to a number that he/she typed. eg. "Send to 650-555-1234" -->
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <!-- Abbreviated message to express that something occurred some number of hours in the past (e.g., 5 hours ago). -->
-  <!-- Abbreviated message to express that something occurred some number of days in the past (e.g., 5 days ago). -->
-  <!--
-        Plurals used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <!-- Title of the class-0 message activity. -->
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <!-- Title for SMS storage low notification and dialog. Must match the framework's notification title, i.e. //frameworks/base/core/res/res/values/strings.xml#low_internal_storage_view_title -->
-  <!-- Text for SMS storage low notification and dialog -->
-  <!-- Ticker for SMS storage low notification -->
-  <!-- Title for asking the user to enter their phone number -->
-  <!-- Text for asking the user to enter their phone number -->
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <!-- Free SMS storage actions -->
-  <!-- Free SMS storage action confirm dialog message -->
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <!-- While sending a message display this message. -->
-  <!-- When sending a message failed display this message. -->
-  <!-- When retrying sending for a message. -->
-  <!-- When showing resend action display this message. -->
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <!-- When showing resend action, display this message. -->
-  <!-- Title line for an MMS requiring manual download. -->
-  <!-- Title line for an MMS auto-downloading. -->
-  <!-- Title line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which is selected. -->
-  <!-- Timestamp line to display while downloading a message. -->
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <!-- Display this info line with an MMS notification -->
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for download failed -->
-  <!-- notification line 1 for multiple downloads failed -->
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <!-- Notification content when emergency SMS fails to send -->
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <!-- Content description text for Back button on the action bar -->
-  <!-- Action menu title for showing archived conversations -->
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <!-- An enumeration comma for separating multiple names in notifications. [CHAR LIMIT=2] -->
-  <!-- Separator between parts of a notification in each line of an inboxStyle notification. [CHAR LIMIT=2] -->
-  <!-- Separator between title and content in notification ticker -->
-  <!-- Separator between title and content in notifications -->
-  <!-- Shown in notifications when there's a picture. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <!-- Shown in the Android Wear conversation log as the sender for outgoing messages,
-         when we don't know the user's real name (e.g. no "Me" contact on the phone). -->
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <!-- Accessibility announcement for an incoming message -->
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <!-- Accessibility description for conversation list for group conversations -->
-  <!-- Accessibility description for conversation list for failed messages -->
-  <!-- Accessibility name for a group conversation -->
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <!-- Title for the preferences/settings activity -->
-  <!-- Title for the archived conversations activity -->
-  <!-- Action title: Close -->
-  <!-- Preference category: MMS messaging -->
-  <!-- Preference category: Advanced -->
-  <!-- Preference category: Debug -->
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <!-- Title for the notification sound preference -->
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <!-- Preference summary: Current default SMS app -->
-  <!-- Preference title: MMS phone number -->
-  <!-- Display text for phone number preference when the number is unknown -->
-  <!-- Title for the preference for playing a message send sound -->
-  <!-- Strings for dump sms/mms dialog -->
-  <!-- Title of long press menu on an individual message. -->
-  <!-- Menu item to copy message text -->
-  <!-- Title of long press menu for details about an individual message. -->
-  <!-- Title of long press menu for deleting an individual message. -->
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <!-- Title of "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <!-- Sender to be used if the sender address has been hidden -->
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <!-- Notifies the user when an attachment fails to load -->
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <!-- Title for the "People and Options" activity -->
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <!-- Title for the phone call button in the action bar that lets the user call a participant in an SMS conversation -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <!-- The hint text shown in the message compose input box when photo(s) is attached -->
-  <!-- The hint text shown in the message compose input box when audio recording(s) is attached -->
-  <!-- The hint text shown in the message compose input box when video(s) is attached -->
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <!-- Announcement after the user adds or removes an attachment -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <!-- The format of the subtitle of the help activity. -->
-  <!--  Action menu title to let users view open source license -->
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <!-- Reached MMS message attachment limit -->
-  <!-- Message attachment load failed -->
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- When there's a subject in an mms, the subject + message are shown in a notification -->
-  <!-- Text shown on contact VCard when it's being loaded -->
-  <!-- Text shown on contact VCard when it failed to load -->
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <!-- Title for the activity that shows details of VCards -->
-  <!-- VCard label for displaying birthdays -->
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <!-- Title for the message forwarding dialog -->
-  <!-- Title for the message reply dialog -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <!-- Dialog button text that closes the application. -->
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <!-- A message in conversation list view to indicate that the snipit text and preview is from an unsent draft. -->
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <!-- Indicates that the current message will be sent via MMS -->
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <!-- Title of block confirmation dialog -->
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <!-- The title of the list of blocked contacts -->
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <!-- Accessibility toast shown when a message is sending. -->
-  <!-- Accessibility toast shown when a message is sent. -->
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <!-- Accessibility : content description for numbers -->
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <!-- Text prepended to the subject of a forwarded message -->
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <!-- The notification toast text and action button label shown at bottom of screen, for when a new message comes in while the user
-         is in that conversation, but the message list is not scrolled to the bottom -->
-  <!-- Content description for the message images in a conversation or for the image preview in the conversation list if the lastest message in that conversation contains an image-->
-  <!-- Text for a toast message notifying the user that we can't find an appropriate application to handle their request -->
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Screen title after user selects APNs setting option -->
-  <!-- Edit access point label summary text when no value has been set -->
-  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
-  <!-- Edit access point labels: The actual access point name-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The type of APN -->
-  <!-- Edit access point screen menu option to delete this APN -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <!-- APNs screen menu option to reset default APN settings -->
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <!-- Title for Access Point Names settings -->
-  <!-- Title for Access Point Names settings activity -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <!-- The title for general settings section in the settings activity  -->
-  <!-- The title for advanced settings section in the settings activity  -->
-  <!-- The title for general settings activity  -->
-  <!-- The title for advanced settings activity  -->
-  <!-- The title for sim_specific settings  -->
-  <!-- The group MMS choices in settings -->
-  <!-- SIM number shown in the settings when the number is not known -->
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <!-- Content description for the SIM selector button in the conversation -->
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <!-- Content description for the audio record view -->
-  <!-- Content description for new conversation button in desktop widget -->
-  <!-- Content description for widget title -->
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <!-- Content description for new message button in desktop widget -->
-  <!-- Content description for conversation list button in desktop widget -->
-  <!-- Shown when loading conversations in the widget -->
-  <!-- Shown when loading messages in the widget -->
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <!-- Toast message telling the user that someone was blocked -->
-  <!-- Toast message telling the user that someone was unblocked -->
-  <!-- Title for attachment chooser activity -->
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message load failed -->
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <!-- When converting html to text link urls are inlined.  This specifies how the link should be
-    displayed.  For example, a link "click here" which navigates to "www.google.com" would have
-    text="click here" and url="www.google.com", using the below format to create "click here (www.google.com)" -->
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
-</resources>
diff --git a/res/values-ast-rES/arrays.xml b/res/values-ast-rES/arrays.xml
index 61e1f99..b9dd6a2 100644
--- a/res/values-ast-rES/arrays.xml
+++ b/res/values-ast-rES/arrays.xml
@@ -16,23 +16,21 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String to match as no subject and filter out as a subject. For example, if the
-         subject string is "no subject", we won't display that. We'll pretend
-         no subject string was delivered. -->
-  <!-- Choices for quick-reply to message notification. Users with an Android
-    Wear device (e.g. smartwatch) can reply to messages either by speaking their
-    response, or choosing one of these predefined options. -->
-  <string-array name="notification_reply_choices">
-    <item>Yes</item>
-    <item>No</item>
-    <item>ACEUTAR</item>
-    <item>Hehe</item>
-    <item>Thanks</item>
-    <item>I agree</item>
-    <item>Nice</item>
-    <item>On my way</item>
-    <item>OK, let me get back to you later</item>
-    <item>:)</item>
-    <item>:(</item>
-  </string-array>
+    <string-array name="empty_subject_strings">
+        <item>ensin asuntu</item>
+        <item>Ensin asuntu</item>
+    </string-array>
+    <string-array name="notification_reply_choices">
+        <item>Sí</item>
+        <item>Non</item>
+        <item>ACEUTAR</item>
+        <item>Ḥeḥe</item>
+        <item>Gracies</item>
+        <item>Toi acordies</item>
+        <item>Bien</item>
+        <item>Al mio xeitu</item>
+        <item>Val, déxame contestate más sero</item>
+        <item>:)</item>
+        <item>:(</item>
+    </string-array>
 </resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index a3714ac..88649fb 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -16,84 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Informar como spam a %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Llimpiar unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Nun modificar el mensaxe</string>
-  <string name="pref_unicode_stripping_non_encodable">Sustituyir los caráuteres non sofitaos</string>
-  <string name="pref_unicode_stripping_all">Sustituyir tolos caráuteres</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Periodu de validez</string>
-  <string name="validity_period_slot1_pref_title">Periodu de validez pa SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Periodu de validez pa SIM 2</string>
-  <string name="sms_validity_period_not_set">Nun s\'afitó</string>
-  <string name="sms_validity_period_one_hour">1 hora</string>
-  <string name="sms_validity_period_six_hours">6 hores</string>
-  <string name="sms_validity_period_twelve_hours">12 hores</string>
-  <string name="sms_validity_period_one_day">1 día</string>
-  <string name="mms_validity_period_two_days">2 díes</string>
-  <string name="mms_validity_period_one_week">1 selmana</string>
-  <string name="validity_period_maximum">Máximu</string>
-  <string name="pref_summary_mms_delivery_reports">Solicita un informe d\'entrega pa cada mensaxe qu\'unvies</string>
-  <string name="pref_summary_mms_read_reports">Solicita un informe de llectura pa cada mensaxe qu\'unvies</string>
-  <string name="delivery_reports_mms_pref_title">Informes d\'entrega</string>
-  <string name="status_label">Estáu:\u0020</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_normal">Normal</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Almacenamientu</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mensaxes per conversación</string>
-  <string name="set">Afitar</string>
-  <string name="no">Encaboxar</string>
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_close_all_title">Zarrar too</string>
-  <string name="pref_close_all_summary">El botón Zarrar zarra tolos mensaxes</string>
-  <string name="message_counter">%1$d de %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Zarrar</string>
-  <string name="button_templates">Plantíes</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Rempuesta rápida</string>
-  <string name="send">Unviar</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_summary">Amuesa la tecla de fustaxes nel tecláu</string>
-  <string name="select_phone_account_title">Unviar con</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> mensaxe guardaos na tarxeta SIM.</string>
-  <string name="copy_to_sim_fail">Nun pue guardase\'l mensaxe</string>
-  <string name="copy_to_phone_fail">Nun pue guardase\'l mensaxe</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">Nun hai mensaxes na tarxeta SIM.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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="sim_capacity_title">Capacidá de SIM</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">¿Desaniciar?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Refrescando\u2026</string>
-  <!-- Delete button title -->
-  <string name="delete">Desaniciar</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Copiar a la memoria de la tableta</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="selected_all">Esbillar too</string>
-  <string name="deselected_all">Nun esbillar nada</string>
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <string name="yes">Aceutar</string>
-  <!-- Copy message to sim -->
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_audio_list_item_unselected_content_description">Nun s\'esbilló l\'audiu.</string>
+    <string name="report_as_spam_to">Informar como spam a %s</string>
+    <string name="unicode_stripping_pref_title">Llimpiar unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Nun modificar el mensaxe</string>
+    <string name="pref_unicode_stripping_non_encodable">Sustituyir los caráuteres non sofitaos</string>
+    <string name="pref_unicode_stripping_all">Sustituyir tolos caráuteres</string>
+    <string name="validity_period_pref_title">Periodu de validez</string>
+    <string name="validity_period_slot1_pref_title">Periodu de validez pa SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Periodu de validez pa SIM 2</string>
+    <string name="sms_validity_period_not_set">Nun s\'afitó</string>
+    <string name="sms_validity_period_one_hour">1 hora</string>
+    <string name="sms_validity_period_six_hours">6 hores</string>
+    <string name="sms_validity_period_twelve_hours">12 hores</string>
+    <string name="sms_validity_period_one_day">1 día</string>
+    <string name="mms_validity_period_two_days">2 díes</string>
+    <string name="mms_validity_period_one_week">1 selmana</string>
+    <string name="validity_period_maximum">Máximu</string>
+    <string name="pref_summary_mms_delivery_reports">Solicita un informe d\'entrega pa cada mensaxe qu\'unvies</string>
+    <string name="pref_summary_mms_read_reports">Solicita un informe de llectura pa cada mensaxe qu\'unvies</string>
+    <string name="delivery_reports_mms_pref_title">Informes d\'entrega</string>
+    <string name="read_reports_mms_pref_title">Informes de llectura</string>
+    <string name="status_label">Estáu:\u0020</string>
+    <string name="status_read">Lleíu</string>
+    <string name="priority_pref_title">Prioridá d\'unviu</string>
+    <string name="priority_low">Baxa</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">Alta</string>
+    <string name="sms_storage_pref_title">Almacenamientu</string>
+    <string name="pref_summary_auto_delete">Desanicie mensaxes vieyos namái s\'algame la llende</string>
+    <string name="auto_delete_pref_title">Desaniciar mensaxes vieyos</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mensaxes per conversación</string>
+    <string name="sms_delete_pref_title">Llende de mensaxes de testu</string>
+    <string name="mms_delete_pref_title">Llende de mensaxes multimedia</string>
+    <string name="set">Afitar</string>
+    <string name="no">Encaboxar</string>
+    <string name="pref_messages_to_save">Afitar númberu de mensaxes pa guardar</string>
+    <string name="swipe_to_delete_conversation_pref_title">Eslizar pa desaniciar</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Esliza a la drecha pa desaniciar una conversación</string>
+    <string name="pref_quickmessage">Mensaxe rápidu</string>
+    <string name="pref_quickmessage_title">Amosar mensaxe rápidu</string>
+    <string name="pref_quickmessage_summary">Abrir automáticamente la rempuestá rápida pa los mensaxes SMS entrantes</string>
+    <string name="pref_close_all_title">Zarrar too</string>
+    <string name="pref_close_all_summary">El botón Zarrar zarra tolos mensaxes</string>
+    <string name="message_counter">%1$d de %2$d</string>
+    <string name="button_close">Zarrar</string>
+    <string name="button_view">Ver</string>
+    <string name="button_templates">Plantíes</string>
+    <string name="qm_button_full_conversation">Conversación completa</string>
+    <string name="type_to_reply_text_enter_to_send">Escribir mensaxe</string>
+    <string name="toast_sending_message">Unviando mensaxe\u2026</string>
+    <string name="qm_quick_reply">Rempuesta rápida</string>
+    <string name="send">Unviar</string>
+    <string name="compose_message_hint_text">Introducir mensaxe</string>
+    <string name="show_emoticons_pref_title">Accesu a fustaxes</string>
+    <string name="show_emoticons_pref_summary">Amuesa la tecla de fustaxes nel tecláu</string>
+    <string name="select_phone_account_title">Unviar con</string>
+    <string name="pref_title_manage_sim_messages">Xestionar mensaxes de tarxeta SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Xestionar mensaxes de SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Xestionar mensaxes de SIM 2</string>
+    <string name="copy_to_sim">Copiar mensaxes a tarxeta SIM</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> mensaxe guardaos na tarxeta SIM.</string>
+    <string name="copy_to_sim_fail">Nun pue guardase\'l mensaxe</string>
+    <string name="copy_to_phone_success">Guardóse\'l mensaxe</string>
+    <string name="copy_to_phone_fail">Nun pue guardase\'l mensaxe</string>
+    <string name="sim_empty">Nun hai mensaxes na tarxeta SIM.</string>
+    <string name="menu_send_email">Unviar corréu a <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Llamar a <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Amestar <xliff:g id="CONTACTEMAILORNUMBER">%s</xliff:g> a Xente</string>
+    <string name="sim_capacity_title">Capacidá de SIM</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> entraes de la tarxeta SIM n\'usu</string>
+    <string name="confirm_dialog_title">¿Desaniciar?</string>
+    <string name="sim_manage_messages_title">Mensaxes de testu na tarxeta SIM</string>
+    <string name="refreshing">Refrescando\u2026</string>
+    <string name="confirm_delete_selected_messages">Van desaniciase los mensaxes esbillaos.</string>
+    <string name="delete">Desaniciar</string>
+    <string name="menu_forward">Reunviar</string>
+    <string name="menu_reply">Responder</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Copiar a la memoria de la tableta</string>
+    <string name="sim_copy_to_phone_memory" product="default">Copiar a la memoria\'l teléfonu</string>
+    <string name="selected_all">Esbillar too</string>
+    <string name="deselected_all">Nun esbillar nada</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> esbillaos</string>
+    <string name="yes">Aceutar</string>
+    <string name="operation_to_card_memory">Copiar mensaxe a tarxeta SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Escueyi imáxenes o vídeos d\'esti preséu</string>
+    <string name="mediapicker_audioListChooserDescription">Escueyi ficheros d\'audiu d\'esti preséu</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Nun pue axuntase\'l videu. Perpasóse\'l tamañu máximu del mensaxe.</string>
+    <string name="mediapicker_audio_list_title">Escoyer audiu</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Esbillóse l\'audiu.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Nun s\'esbilló l\'audiu.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> elementos esbillaos</string>
 </resources>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index f2de965..683ae3a 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -16,387 +16,505 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- The name of the application as it appears under the main Launcher icon and in various activity titles -->
-  <!-- The name of the application as it appears in external share intent dialogs -->
-  <!-- The title when selecting a conversation to share to -->
-  <string name="welcome">Afáyate</string>
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <!-- The tab header for the frequently used contacts list -->
-  <!-- The tab header for all contacts list -->
-  <!-- The text on the list item in the contact picker that allows a user to send an SMS directly
-         to a number that he/she typed. eg. "Send to 650-555-1234" -->
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <!-- Abbreviated message to express that something occurred some number of hours in the past (e.g., 5 hours ago). -->
-  <!-- Abbreviated message to express that something occurred some number of days in the past (e.g., 5 days ago). -->
-  <!--
-        Plurals used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <!-- Title of the class-0 message activity. -->
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <!-- Title for SMS storage low notification and dialog. Must match the framework's notification title, i.e. //frameworks/base/core/res/res/values/strings.xml#low_internal_storage_view_title -->
-  <!-- Text for SMS storage low notification and dialog -->
-  <!-- Ticker for SMS storage low notification -->
-  <!-- Title for asking the user to enter their phone number -->
-  <!-- Text for asking the user to enter their phone number -->
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <!-- Free SMS storage actions -->
-  <!-- Free SMS storage action confirm dialog message -->
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <!-- While sending a message display this message. -->
-  <!-- When sending a message failed display this message. -->
-  <!-- When retrying sending for a message. -->
-  <!-- When showing resend action display this message. -->
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <!-- When showing resend action, display this message. -->
-  <!-- Title line for an MMS requiring manual download. -->
-  <!-- Title line for an MMS auto-downloading. -->
-  <!-- Title line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which is selected. -->
-  <!-- Timestamp line to display while downloading a message. -->
-  <string name="message_status_downloading">Baxando&#8230;</string>
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <!-- Display this info line with an MMS notification -->
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <string name="unknown_sender">Remitente desconocíu</string>
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for download failed -->
-  <!-- notification line 1 for multiple downloads failed -->
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <!-- Notification content when emergency SMS fails to send -->
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <!-- Content description text for Back button on the action bar -->
-  <!-- Action menu title for showing archived conversations -->
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <string name="action_download">Baxar</string>
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <!-- An enumeration comma for separating multiple names in notifications. [CHAR LIMIT=2] -->
-  <!-- Separator between parts of a notification in each line of an inboxStyle notification. [CHAR LIMIT=2] -->
-  <!-- Separator between title and content in notification ticker -->
-  <!-- Separator between title and content in notifications -->
-  <!-- Shown in notifications when there's a picture. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <string name="notification_reply_via_sms">Responder per SMS</string>
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <!-- Shown in the Android Wear conversation log as the sender for outgoing messages,
-         when we don't know the user's real name (e.g. no "Me" contact on the phone). -->
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <string name="audio_attachment_content_description">Axuntu d\'audiu</string>
-  <!-- Accessibility announcement for an incoming message -->
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <!-- Accessibility description for conversation list for group conversations -->
-  <!-- Accessibility description for conversation list for failed messages -->
-  <!-- Accessibility name for a group conversation -->
-  <string name="group_conversation_description">Conversación con <xliff:g id="participants">%s</xliff:g></string>
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <string name="camera_switch_to_video_mode">Capturar videu</string>
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <!-- Title for the preferences/settings activity -->
-  <!-- Title for the archived conversations activity -->
-  <!-- Action title: Close -->
-  <!-- Preference category: MMS messaging -->
-  <!-- Preference category: Advanced -->
-  <!-- Preference category: Debug -->
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <!-- Title for the notification sound preference -->
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <!-- Preference summary: Current default SMS app -->
-  <!-- Preference title: MMS phone number -->
-  <!-- Display text for phone number preference when the number is unknown -->
-  <string name="unknown_phone_number_pref_display_value">Desconocíu</string>
-  <!-- Title for the preference for playing a message send sound -->
-  <!-- Strings for dump sms/mms dialog -->
-  <!-- Title of long press menu on an individual message. -->
-  <!-- Menu item to copy message text -->
-  <!-- Title of long press menu for details about an individual message. -->
-  <!-- Title of long press menu for deleting an individual message. -->
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <!-- Title of "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <!-- Sender to be used if the sender address has been hidden -->
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <string name="cant_send_message_while_loading_attachments">Nun pue unviase\'l mensaxe entrín se cargaben los axuntos.</string>
-  <!-- Notifies the user when an attachment fails to load -->
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <string name="action_people_and_options">Xente y opciones</string>
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <!-- Title for the "People and Options" activity -->
-  <string name="people_and_options_activity_title">Xente y opciones</string>
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <string name="general_settings_title">Xeneral</string>
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <!-- Title for the phone call button in the action bar that lets the user call a participant in an SMS conversation -->
-  <string name="action_call">Facer una llamada</string>
-  <!-- The hint text shown in the message compose input box prompting the user to send a message -->
-  <string name="compose_message_view_hint_text">Unviar mensaxe</string>
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <!-- The hint text shown in the message compose input box when photo(s) is attached -->
-  <plurals name="compose_message_view_hint_text_photo">
-    <item quantity="one">Unviar semeya</item>
-    <item quantity="other">Unviar semeyes</item>
-  </plurals>
-  <!-- The hint text shown in the message compose input box when audio recording(s) is attached -->
-  <plurals name="compose_message_view_hint_text_audio">
-    <item quantity="one">Unviar audiu</item>
-    <item quantity="other">Unviar audios</item>
-  </plurals>
-  <!-- The hint text shown in the message compose input box when video(s) is attached -->
-  <plurals name="compose_message_view_hint_text_video">
-    <item quantity="one">Unviar videu</item>
-    <item quantity="other">Unviar vídeos</item>
-  </plurals>
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <!-- Announcement after the user adds or removes an attachment -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <string name="menu_view_in_store">Ver na Google Play Store</string>
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <string name="menu_version_info">Información de versión</string>
-  <!-- The format of the subtitle of the help activity. -->
-  <!--  Action menu title to let users view open source license -->
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <!-- Reached MMS message attachment limit -->
-  <!-- Message attachment load failed -->
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <string name="add_contact_confirmation">Amestar contautu</string>
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- When there's a subject in an mms, the subject + message are shown in a notification -->
-  <string name="notification_subject"><xliff:g id="subject_label">%s</xliff:g><xliff:g id="messageText">%s</xliff:g></string>
-  <!-- Text shown on contact VCard when it's being loaded -->
-  <string name="loading_vcard">Cargando tarxeta de contautu</string>
-  <!-- Text shown on contact VCard when it failed to load -->
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <plurals name="vcard_multiple_display_name">
-    <!-- quantity="one" is not needed by the app, but it keeps the translation pipeline happy. -->
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> contautu</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> contautos</item>
-  </plurals>
-  <!-- Title for the activity that shows details of VCards -->
-  <!-- VCard label for displaying birthdays -->
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <!-- Title for the message forwarding dialog -->
-  <!-- Title for the message reply dialog -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <string name="requires_default_sms_change_button">Camudar</string>
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <string name="requires_sms_permissions_message">Esta aplicación nun tien el permisu\'l dueñu\'l preséu.</string>
-  <!-- Dialog button text that closes the application. -->
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <!-- A message in conversation list view to indicate that the snipit text and preview is from an unsent draft. -->
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <!-- Indicates that the current message will be sent via MMS -->
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <!-- Title of block confirmation dialog -->
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <string name="block_confirmation_message">Siguirás recibiendo mensaxes d\'esti númberu pero yá nun se t\'avisará. Esta conversación archivaráse.</string>
-  <!-- The title of the list of blocked contacts -->
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <!-- Accessibility toast shown when a message is sending. -->
-  <!-- Accessibility toast shown when a message is sent. -->
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <string name="send_message_failure_airplane_mode">Nun puen unviase mensaxes nel mou avión</string>
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <string name="download_message_failure_airplane_mode">Nun puen baxase mensaxes nel mou avión</string>
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <!-- Accessibility : content description for numbers -->
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <!-- Text prepended to the subject of a forwarded message -->
-  <string name="message_fwd">Re: <xliff:g id="subject">%s</xliff:g></string>
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <!-- The notification toast text and action button label shown at bottom of screen, for when a new message comes in while the user
-         is in that conversation, but the message list is not scrolled to the bottom -->
-  <!-- Content description for the message images in a conversation or for the image preview in the conversation list if the lastest message in that conversation contains an image-->
-  <!-- Text for a toast message notifying the user that we can't find an appropriate application to handle their request -->
-  <string name="activity_not_found_message">Nun pudo alcontrase una aplicación afayadiza</string>
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Screen title after user selects APNs setting option -->
-  <!-- Edit access point label summary text when no value has been set -->
-  <string name="apn_not_set">Nun s\'afitó</string>
-  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
-  <!-- Edit access point labels: The actual access point name-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The type of APN -->
-  <!-- Edit access point screen menu option to delete this APN -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-  <string name="menu_discard_apn_change">Escartar</string>
-  <!-- APN error dialog messages: -->
-  <string name="error_apn_name_empty">El campu Nome nun pue tar baleru.</string>
-  <!-- APN error dialog messages: -->
-  <string name="error_apn_empty">L\'APN nun pue tar balera.</string>
-  <!-- APN error dialog messages: -->
-  <string name="error_mcc_not3">El campu MMC ha ser de 3 díxitos.</string>
-  <!-- APN error dialog messages: -->
-  <string name="error_mnc_not23">El campu MMC ha ser de 2 ó 3 díxitos.</string>
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <!-- APNs screen menu option to reset default APN settings -->
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <!-- Title for Access Point Names settings -->
-  <!-- Title for Access Point Names settings activity -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <!-- The title for general settings section in the settings activity  -->
-  <!-- The title for advanced settings section in the settings activity  -->
-  <string name="advanced_settings">Avanzao</string>
-  <!-- The title for general settings activity  -->
-  <!-- The title for advanced settings activity  -->
-  <!-- The title for sim_specific settings  -->
-  <!-- The group MMS choices in settings -->
-  <!-- SIM number shown in the settings when the number is not known -->
-  <string name="sim_settings_unknown_number">Númberu desconocíu</string>
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <!-- Content description for the SIM selector button in the conversation -->
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <!-- Content description for the audio record view -->
-  <!-- Content description for new conversation button in desktop widget -->
-  <!-- Content description for widget title -->
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <!-- Content description for new message button in desktop widget -->
-  <!-- Content description for conversation list button in desktop widget -->
-  <!-- Shown when loading conversations in the widget -->
-  <!-- Shown when loading messages in the widget -->
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <!-- Toast message telling the user that someone was blocked -->
-  <!-- Toast message telling the user that someone was unblocked -->
-  <!-- Title for attachment chooser activity -->
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message load failed -->
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <!-- When converting html to text link urls are inlined.  This specifies how the link should be
-    displayed.  For example, a link "click here" which navigates to "www.google.com" would have
-    text="click here" and url="www.google.com", using the below format to create "click here (www.google.com)" -->
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
+    <string name="app_name">Mensaxes</string>
+    <string name="share_intent_label">Mensaxes</string>
+    <string name="share_intent_activity_label">Esbillar la conversación</string>
+    <string name="action_settings">Axustes</string>
+    <string name="sendButtonContentDescription">Unvia\'l mensaxe</string>
+    <string name="attachMediaButtonContentDescription">Amiesta un axuntu</string>
+    <string name="help_and_feedback_activity_label">Ayuda</string>
+    <string name="welcome">Afáyate</string>
+    <string name="skip">Saltar</string>
+    <string name="next_with_arrow">Siguiente &gt;</string>
+    <string name="next">Siguiente</string>
+    <string name="exit">Colar</string>
+    <string name="settings_with_arrow">Axustes &gt;</string>
+    <string name="settings">Axustes</string>
+    <string name="required_permissions_promo">Mensaxes precisa\'l permisu de SMS, Teléfonu y Contautos.</string>
+    <string name="enable_permission_procedure">Pues camudar los permisos n\'Axustes &gt; Aplicaciones &gt; Mensaxería &gt; Permisos.</string>
+    <string name="enable_permission_procedure_description">Pues camudar los permisos n\'Axustes, Aplicaciones, Mensaxería, Permisos.</string>
+    <string name="contact_picker_frequents_tab_title">Frecuentes</string>
+    <string name="contact_picker_all_contacts_tab_title">Tolos contautos</string>
+    <string name="contact_list_send_to_text">Unviar a <xliff:g id="destination">%s</xliff:g></string>
+    <string name="mediapicker_cameraChooserDescription">Capturar imáxenes o videu</string>
+    <string name="mediapicker_galleryChooserDescription">Escoyer imáxenes o vídeos d\'esti
+        preséu</string>
+    <string name="mediapicker_audioChooserDescription">Grabar audio</string>
+    <string name="mediapicker_gallery_title">Esbillar semeya</string>
+    <string name="mediapicker_gallery_item_selected_content_description">Esbillóse\'l mediu.</string>
+    <string name="mediapicker_gallery_item_unselected_content_description">Nun s\'esbilló\'l mediu.</string>
+    <string name="mediapicker_gallery_title_selection">Esbilláu: <xliff:g id="count">%d</xliff:g></string>
+    <string name="mediapicker_gallery_image_item_description">imaxe <xliff:g id="date">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g></string>
+    <string name="mediapicker_gallery_image_item_description_no_date">imaxe</string>
+    <string name="mediapicker_audio_title">Grabar audio</string>
+    <string name="action_share">Compartir</string>
+    <string name="posted_just_now">"Xusto agora"</string>
+    <string name="posted_now">"Agora"</string>
+    <plurals name="num_minutes_ago">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> min</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> mins</item>
+    </plurals>
+    <plurals name="num_hours_ago">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> hora</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> hores</item>
+    </plurals>
+    <plurals name="num_days_ago">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> día</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> díes</item>
+    </plurals>
+    <plurals name="week_count">
+        <item quantity="one">una selmana</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> selmanes</item>
+    </plurals>
+    <plurals name="month_count">
+        <item quantity="one">un mes</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> meses</item>
+    </plurals>
+    <plurals name="year_count">
+        <item quantity="one">un añu</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> años</item>
+    </plurals>
+    <string name="class_0_message_activity">Mensaxe clas 0</string>
+    <string name="save">Guardar</string>
+    <string name="sms_storage_low_auto_delete_enabled_dialog_text">El preséu tien pocu espaciu d\'almacenamientu. El Centru de Mensaxes va desaniciar automáticamente los mensaxes vieyos pa lliberar espaciu.</string>
+    <string name="sms_storage_low_title">Ta escosando l\'almacenamientu</string>
+    <string name="sms_storage_low_text">Ye dable que\'l Centru de Mensaxes nun unvie nin reciba mensaxes hasta que se llibere más espaciu nel preséu.</string>
+    <string name="sms_storage_low_notification_ticker">Pocu espaciu pa SMS. Seique tengas que desaniciar mensaxes.</string>
+    <string name="enter_phone_number_title">Confirmar númberu de teléfonu</string>
+    <string name="enter_phone_number_text">Esti pasu, que faise namái una vegada, va asegurar que\'l Centru de Mensaxes unvie los mensaxes grupales de mou correutu.</string>
+    <string name="enter_phone_number_hint">Númberu telefónicu</string>
+    <string name="delete_all_media">Desaniciar tolos mensaxes con conteníu multimedia</string>
+    <string name="delete_oldest_messages">Desaniciar mensaxes de más de <xliff:g id="duration">%s</xliff:g></string>
+    <string name="auto_delete_oldest_messages">Desaniciar automáticamente mensaxes de más de <xliff:g id="duration">%s</xliff:g></string>
+    <string name="ignore">Inorar</string>
+    <string name="delete_all_media_confirmation">¿Desaniciar tolos mensaxes multimedia?</string>
+    <string name="delete_oldest_messages_confirmation">¿Desaniciar mensaxes de más de <xliff:g id="duration">%s</xliff:g>?</string>
+    <string name="auto_delete_oldest_messages_confirmation">¿Desaniciar mensaxes de más de <xliff:g id="duration">%s</xliff:g> y activar desaniciu automáticu?</string>
+    <string name="incoming_text_sender_content_description"><xliff:g id="sender">%s</xliff:g> dixo</string>
+    <string name="outgoing_text_sender_content_description">Dixesti</string>
+    <string name="incoming_sender_content_description">Mensaxe de <xliff:g id="sender">%s</xliff:g></string>
+    <string name="outgoing_sender_content_description">Unviesti un mensaxe</string>
+    <string name="message_status_sending">Unviando…</string>
+    <string name="message_status_send_failed">Nun s\'unvió. Toca pa tentalo de nueves.</string>
+    <string name="message_status_send_retrying">Nun s\'unvió. Tentando de neves…</string>
+    <string name="message_status_resend">Reunviar o desaniciar</string>
+    <string name="message_status_send_failed_emergency_number">Por favor, fai una llamada de voz a los servicios d\'emerxencia. Nun pudo unviase\'l mensaxe de testu esta vegada.</string>
+    <string name="message_status_failed">Fallu</string>
+    <string name="message_title_manual_download">Mensaxe MMS nuevu pa baxar</string>
+    <string name="message_title_downloading">Mensaxe nuevu MMS</string>
+    <string name="message_title_download_failed">Nun pudo descargase</string>
+    <string name="message_status_download_failed">Toca pa volver a intentalo</string>
+    <string name="message_status_download">Toca pa descargar</string>
+    <string name="message_status_download_action">Descargar o desaniciar</string>
+    <string name="message_status_downloading">Baxando…</string>
+    <string name="message_status_download_error">El mensaxe venció o nun ta disponible</string>
+    <string name="mms_info">tamañu: <xliff:g id="Messagesize">%1$s</xliff:g>; vencimientu: <xliff:g id="Messageexpire">%2$s</xliff:g></string>
+    <string name="invalid_destination">Nun pue unviase porque\'l destinatariu nun ye válidu.</string>
+    <string name="service_not_activated">Nun s\'activó\'l serviciu na rede</string>
+    <string name="service_network_problem">Nun pudo unviase pola mor d\'un problea de rede</string>
+    <string name="service_message_not_found">El mensaxe caducó o nun ta disponible</string>
+    <string name="no_subject">(Nun hai asuntu)</string>
+    <string name="unknown_sender">Remitente desconocíu</string>
+    <string name="delivered_status_content_description">Entregóse</string>
+    <string name="dl_failure_notification">Nun pudo baxase\'l mensaxe <xliff:g id="subject">%1$s</xliff:g> de <xliff:g id="from">%2$s</xliff:g>.</string>
+    <string name="low_memory">Nun pudo completase la operación de la base de datos pola mor de memoria baxa</string>
+    <string name="notification_send_failures_line1_singular">Nun s\'unvió\'l mensaxe</string>
+    <string name="notification_send_failures_line1_plural">Nun s\'unviaron dellos mensaxes en Mensaxería</string>
+    <plurals name="notification_send_failures">
+        <item quantity="one"><xliff:g id="messages">%d</xliff:g> mensaxes nuna conversación</item>
+        <item quantity="other"><xliff:g id="messages">%d</xliff:g> mensaxes en <xliff:g id="conversations">%d</xliff:g> conversaciones</item>
+    </plurals>
+    <string name="notification_download_failures_line1_singular">Nun se baxo\'l mensaxe</string>
+    <string name="notification_download_failures_line1_plural">Nun se baxaron dellos mensaxes en Mensaxería</string>
+    <plurals name="notification_download_failures">
+        <item quantity="one"><xliff:g id="messages">%d</xliff:g> mensaxes nuna conversación</item>
+        <item quantity="other"><xliff:g id="messages">%d</xliff:g> mensaxes en <xliff:g id="conversations">%d</xliff:g> conversaciones</item>
+    </plurals>
+    <string name="notification_emergency_send_failure_line1">Nun s\'unvió\'l mensaxe a <xliff:g id="number">%1$s</xliff:g></string>
+    <string name="notification_emergency_send_failure_line2">        Llama a los servicios d\'emerxencia, por favor. Nesti momentu nun
+        pudo entregase\'l mensaxe a <xliff:g id="number">%1$s</xliff:g>.
+    </string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Mensaxe nuevu</item>
+        <item quantity="other"><xliff:g id="messages">%d</xliff:g> mensaxes nuevos</item>
+    </plurals>
+    <string name="start_conversation">Aniciar</string>
+    <string name="camera_error_opening">Cámara non disponible</string>
+    <string name="camera_error_unknown">Cámara non disponible</string>
+    <string name="camera_error_video_init_fail">Captura de videu non disponible</string>
+    <string name="camera_error_storage_fail">Nun pue guardase\'l conteníu multimedia</string>
+    <string name="camera_error_failure_taking_picture">Nun puen facese semeyes</string>
+    <string name="back">Atrás</string>
+    <string name="action_menu_show_archived">Archivóse</string>
+    <string name="action_delete">Desaniciar</string>
+    <string name="action_archive">Archivu</string>
+    <string name="action_unarchive">Desaniciar del archivu</string>
+    <string name="action_notification_off">Desactivar avisos</string>
+    <string name="action_notification_on">Activar avisos</string>
+    <string name="action_add_contact">Amestar contautu</string>
+    <string name="action_download">Baxar</string>
+    <string name="action_send">Unviar</string>
+    <string name="action_delete_message">Desaniciar</string>
+    <string name="delete_message_confirmation_dialog_title">¿Desaniciar esti mensaxe?</string>
+    <string name="delete_message_confirmation_dialog_text">Esta operación nun pue desfacese.</string>
+    <string name="delete_message_confirmation_button">Desaniciar</string>
+    <plurals name="delete_conversations_confirmation_dialog_title">
+        <item quantity="one">¿Desaniciar esta conversación?</item>
+        <item quantity="other">¿Desaniciar estes conversaciones?</item>
+    </plurals>
+    <string name="delete_conversation_confirmation_button">Desaniciar</string>
+    <string name="delete_conversation_decline_button">Encaboxar</string>
+    <string name="recipient_hint">Pa</string>
+    <string name="action_multiselect">Esbillar delles imáxenes</string>
+    <string name="action_confirm_multiselect">Confirmar esbilla</string>
+    <string name="attachment_more_items">+<xliff:g id="count">%d</xliff:g></string>
+    <string name="audio_recording_start_failed">Nun pue grabase audiu. Vuelvi tentalo.</string>
+    <string name="audio_recording_replay_failed">Nun pue reproducise audiu. Vuelvi tentalo.</string>
+    <string name="audio_recording_error"> Nun pudo guardase l\'audiu. Volvi tentalo.</string>
+    <string name="audio_picker_hint_text">Caltener primío</string>
+    <string name="enumeration_comma">,\u0020</string>
+    <string name="notification_separator">\u0020\u0020</string>
+    <string name="notification_ticker_separator">:\u0020</string>
+    <string name="notification_space_separator">\u0020\u0020</string>
+    <string name="notification_picture">Imaxe</string>
+    <string name="notification_audio">Clip d\'audiu</string>
+    <string name="notification_video">Videu</string>
+    <string name="notification_vcard">Tarxeta de contautu</string>
+    <string name="notification_download_mms">Descargar</string>
+    <string name="notification_reply_via_sms">Responder per SMS</string>
+    <string name="notification_reply_via_mms">Responder per MMS</string>
+    <string name="notification_reply_prompt">Responder</string>
+    <plurals name="wearable_participant_count">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> participante</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> participantes</item>
+    </plurals>
+    <string name="unknown_self_participant">Yo</string>
+    <string name="blocked_toast_message">Contautu bloquiáu y archiváu</string>
+    <string name="unblocked_toast_message">Contautu desbloquiáu y ensin archivar</string>
+    <string name="archived_toast_message"><xliff:g id="count">%d</xliff:g> archivaes</string>
+    <string name="unarchived_toast_message"><xliff:g id="count">%d</xliff:g> non archivaes</string>
+    <string name="notification_off_toast_message">Desactiváronse los avisos</string>
+    <string name="notification_on_toast_message">Activáronse los avisos</string>
+    <string name="toast_after_setting_default_sms_app_for_message_send">Too afitao. Calca de nueves Unviar.</string>
+    <string name="toast_after_setting_default_sms_app">La mensaxería afitóse correcho como l\'app de SMS predeterminada.</string>
+    <plurals name="attachment_preview_close_content_description">
+        <item quantity="one">Desaniciar axuntu</item>
+        <item quantity="other">Desaniciar axuntu</item>
+    </plurals>
+    <string name="audio_attachment_content_description">Axuntu d\'audiu</string>
+    <string name="audio_play_content_description">Reproducir axuntu d\'audio</string>
+    <string name="audio_pause_content_description">Pausa</string>
+    <string name="incoming_message_announcement">Mensaxe de <xliff:g id="sender">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>.</string>
+    <string name="one_on_one_incoming_failed_message_prefix">Falló\'l mensaxe de <xliff:g id="sender">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Hora: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="one_on_one_incoming_successful_message_prefix">Mensaxe de <xliff:g id="sender">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Hora: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="one_on_one_outgoing_draft_message_prefix">Nun se mandó\'l mensaxe a <xliff:g id="contact">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Hora: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="one_on_one_outgoing_sending_message_prefix">Mandando\'l mensaxe a <xliff:g id="contact">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Hora: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="one_on_one_outgoing_failed_message_prefix">Falló\'l mensaxe a <xliff:g id="contact">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Hora: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="one_on_one_outgoing_successful_message_prefix">Mensaxe a <xliff:g id="contact">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Hora: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="group_incoming_failed_message_prefix">Falló\'l mensaxe de <xliff:g id="sender">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Hora: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="group_incoming_successful_message_prefix">Mensaxe de <xliff:g id="sender">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Hora: <xliff:g id="time">%s</xliff:g>. <xliff:g id="groupInfo">%s</xliff:g>.</string>
+    <string name="group_outgoing_draft_message_prefix">Mensaxe ensin unviar a <xliff:g id="group">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Hora: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="group_outgoing_sending_message_prefix">Mandando mensaxe a <xliff:g id="group">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Hora: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="group_outgoing_failed_message_prefix">Falló\'l mensaxe a <xliff:g id="group">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Hora: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="group_outgoing_successful_message_prefix">Mensaxe a <xliff:g id="group">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Hora: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="failed_message_content_description">Fallu al unviar el mensaxe. Calca pa retentar.</string>
+    <string name="group_conversation_description">Conversación con <xliff:g id="participants">%s</xliff:g></string>
+    <string name="delete_subject_content_description">Desaniciar asuntu</string>
+    <string name="camera_switch_to_video_mode">Capturar videu</string>
+    <string name="camera_switch_to_still_mode">Capturar una imaxe fixa</string>
+    <string name="camera_take_picture">Facer semeya</string>
+    <string name="camera_start_recording">Entamar a grabar</string>
+    <string name="camera_switch_full_screen">Cambia a la cámara a pantalla completa</string>
+    <string name="camera_switch_camera_facing">Cambiar entre cámara frontal y trasera</string>
+    <string name="camera_stop_recording">Parar la grabación y unviar el videu</string>
+    <string name="camera_cancel_recording">Parar la grabación del videu</string>
+    <string name="photo_view_activity_title">Unviando semeyes</string>
+    <plurals name="photos_saved_to_album">
+        <item quantity="one"><xliff:g id="quantity">%d</xliff:g> semeya guardada en "<xliff:g id="albumName">%s</xliff:g>\" album</item>
+        <item quantity="other"><xliff:g id="quantity">%d</xliff:g> semeya guardada en "<xliff:g id="albumName">%s</xliff:g>\" album</item>
+    </plurals>
+    <plurals name="videos_saved_to_album">
+        <item quantity="one"><xliff:g id="quantity">%d</xliff:g> videu guardáu en "<xliff:g id="albumName">%s</xliff:g>\" album</item>
+        <item quantity="other"><xliff:g id="quantity">%d</xliff:g> videu guardáu en "<xliff:g id="albumName">%s</xliff:g>\" album</item>
+    </plurals>
+    <plurals name="attachments_saved_to_album">
+        <item quantity="one"><xliff:g id="quantity">%d</xliff:g> axuntu guardáu en "<xliff:g id="albumName">%s</xliff:g>\" album</item>
+        <item quantity="other"><xliff:g id="quantity">%d</xliff:g> axuntu guardáu en "<xliff:g id="albumName">%s</xliff:g>\" album</item>
+    </plurals>
+    <plurals name="attachments_saved_to_downloads">
+        <item quantity="one"><xliff:g id="quantity">%d</xliff:g> axuntu guardáu en \"Descargues\"</item>
+        <item quantity="other"><xliff:g id="quantity">%d</xliff:g> axuntu guardáu en \"Descargues\"</item>
+    </plurals>
+    <plurals name="attachments_saved">
+        <item quantity="one"><xliff:g id="quantity">%d</xliff:g> axuntu guardáu</item>
+        <item quantity="other"><xliff:g id="quantity">%d</xliff:g> axuntu guardáu</item>
+    </plurals>
+    <plurals name="attachment_save_error">
+        <item quantity="one">Nun pudo guardase <xliff:g id="quantity">%d</xliff:g> axuntu</item>
+        <item quantity="other">Nun pudieron guardase <xliff:g id="quantity">%d</xliff:g> axuntos</item>
+    </plurals>
+    <string name="attachment_file_description">Guardáu MMS axuntu</string>
+    <string name="settings_activity_title">Axustes</string>
+    <string name="archived_activity_title">Archivada</string>
+    <string name="action_close">Zarrar</string>
+    <string name="mms_messaging_category_pref_title">MMS</string>
+    <string name="advanced_category_pref_title">Avanzao</string>
+    <string name="debug_category_pref_title">Depurar</string>
+    <string name="notifications_enabled_pref_title">Avisos</string>
+    <string name="notification_sound_pref_title">Soníu</string>
+    <string name="silent_ringtone">Silenciu</string>
+    <string name="notification_vibrate_pref_title">Vibrar</string>
+    <string name="blocked_pref_title">Bloquiáu</string>
+    <string name="delivery_reports_pref_title">Informes d\'entrega de SMS</string>
+    <string name="delivery_reports_pref_summary">Solicitar un informe d\'entrega al unviar un SMS</string>
+    <string name="auto_retrieve_mms_pref_title">Recuperación automática</string>
+    <string name="auto_retrieve_mms_pref_summary">Recuperar mensaxes MMS automáticamente</string>
+    <string name="auto_retrieve_mms_when_roaming_pref_title">Recuperación automática en roaming</string>
+    <string name="auto_retrieve_mms_when_roaming_pref_summary">Recuperar MMS automáticamente en roaming</string>
+    <string name="group_mms_pref_title">Mensaxes grupales</string>
+    <string name="group_mms_pref_summary">Usa MMS pa unviar un mesmu mensaxe a dellos destinatarios</string>
+    <string name="sms_disabled_pref_title">App de SMS predeterminada</string>
+    <string name="sms_enabled_pref_title">App de SMS predeterminada</string>
+    <string name="default_sms_app"><xliff:g id="app_name">%s</xliff:g></string>
+    <string name="mms_phone_number_pref_title">El to númberu de teléfonu</string>
+    <string name="unknown_phone_number_pref_display_value">Desconocíu</string>
+    <string name="send_sound_pref_title">Soníos de mensaxe saliente</string>
+    <string name="dump_sms_pref_title">Volcar SMS</string>
+    <string name="dump_sms_pref_summary">Volcar datos ensin procesar de SMS nel ficheru d\'almacenamientu esternu</string>
+    <string name="dump_mms_pref_title">Volcar MMS</string>
+    <string name="dump_mms_pref_summary">Volcar datos ensin procesar de MMS recibíos nun ficheru d\'almacenamientu esternu</string>
+    <string name="wireless_alerts_title">Alertes inalámbriques</string>
+    <string name="message_context_menu_title">Opciones de mensaxe</string>
+    <string name="message_context_menu_copy_text">Copiar el testu</string>
+    <string name="message_context_menu_view_details">Ver detalles</string>
+    <string name="message_context_menu_delete_message">Desaniciar</string>
+    <string name="message_context_menu_forward_message">Reunviar</string>
+    <string name="message_details_title">Detalles del mensaxe</string>
+    <string name="message_type_label">Tipu:\u0020</string>
+    <string name="text_message">Mensaxe de testu</string>
+    <string name="multimedia_message">Mensaxe multimedia</string>
+    <string name="from_label">De:\u0020</string>
+    <string name="to_address_label">Pa:\u0020</string>
+    <string name="sent_label">Unviáu:\u0020</string>
+    <string name="received_label">Recibíu:\u0020</string>
+    <string name="subject_label">Asuntu:\u0020</string>
+    <string name="message_size_label">Tamañu:\u0020</string>
+    <string name="priority_label">Prioridá:\u0020</string>
+    <string name="sim_label">SIM:\u0020</string>
+    <string name="priority_high">Alta</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_low">Baxa</string>
+    <string name="sim_slot_identifier">SIM <xliff:g id="sim_slot_number">%s</xliff:g></string>
+    <string name="hidden_sender_address">Direición de remitente tapecida</string>
+    <string name="cant_send_message_while_loading_attachments">Nun pue unviase\'l mensaxe entrín se cargaben los axuntos.</string>
+    <string name="fail_to_load_attachment">Nun pue cargase l\'axuntu. Vuelvi intentalo.</string>
+    <string name="cant_send_message_without_active_subscription">La rede nun ta llista. Vuelvi intentalo.</string>
+    <string name="chips_text_delete_button_content_description">Desaniciar testu</string>
+    <string name="numeric_text_keyboard_toggle_button_content_description">Camudar ente ingresar testu y númberos</string>
+    <string name="add_more_participants_button_content_description">Amestar más participantes</string>
+    <string name="confrim_participants_button_content_description">Confirmar participantes</string>
+    <string name="start_new_conversation">Entamar una conversación nueva</string>
+    <string name="gallery_checkbox_content_description">Escoyer esti elementu</string>
+    <string name="video_thumbnail_view_play_button_content_description">Ver un videu</string>
+    <string name="action_people_and_options">Xente y opciones</string>
+    <string name="action_debug_options">Depurar</string>
+    <string name="people_and_options_activity_title">Xente y opciones</string>
+    <string name="general_settings_title">Xeneral</string>
+    <string name="participant_list_title">Xente nesta conversación</string>
+    <string name="action_call">Facer una llamada</string>
+    <string name="compose_message_view_hint_text">Unviar mensaxe</string>
+    <string name="compose_message_view_hint_text_multi_sim">Manar mensaxe &lt;br/&gt;&lt;small&gt;oddi wrth<xliff:g id="sim_name">%s</xliff:g>&lt;/small&gt;</string>
+    <plurals name="compose_message_view_hint_text_photo">
+        <item quantity="one">Unviar semeya</item>
+        <item quantity="other">Unviar semeyes</item>
+    </plurals>
+    <plurals name="compose_message_view_hint_text_audio">
+        <item quantity="one">Unviar audiu</item>
+        <item quantity="other">Unviar audios</item>
+    </plurals>
+    <plurals name="compose_message_view_hint_text_video">
+        <item quantity="one">Unviar videu</item>
+        <item quantity="other">Unviar vídeos</item>
+    </plurals>
+    <plurals name="compose_message_view_hint_text_vcard">
+        <item quantity="one">Unviar tarxeta de contautu</item>
+        <item quantity="other">Unviar tarxeta de contautu</item>
+    </plurals>
+    <plurals name="compose_message_view_hint_text_attachments">
+        <item quantity="one">Unviar axuntu</item>
+        <item quantity="other">Unviar axuntu</item>
+    </plurals>
+    <plurals name="attachment_changed_accessibility_announcement">
+        <item quantity="one">Un axuntu preparáu pa unviar</item>
+        <item quantity="other">Un axuntu preparáu pa unviar</item>
+    </plurals>
+    <string name="menu_send_feedback">Unviar feedback</string>
+    <string name="menu_view_in_store">Ver na Google Play Store</string>
+    <string name="menu_version_info">Información de versión</string>
+    <string name="subtitle_format_for_version_number">Versión %1$s</string>
+    <string name="menu_license">Llicencies de códigu abiertu</string>
+    <string name="notifications_enabled_conversation_pref_title">Avisos</string>
+    <string name="mms_attachment_limit_reached">Algamóse la llende d\'axuntos</string>
+    <string name="mms_attachment_load_failed">Fallu al cargar l\'axuntu.</string>
+    <string name="add_contact_confirmation_dialog_title">¿Amestar a Contautos?</string>
+    <string name="add_contact_confirmation">Amestar contautu</string>
+    <string name="compose_message_view_subject_hint_text">Asuntu</string>
+    <string name="conversation_message_view_subject_text">Asuntu:\u0020</string>
+    <string name="notification_subject"><xliff:g id="subject_label">%s</xliff:g><xliff:g id="messageText">%s</xliff:g></string>
+    <string name="loading_vcard">Cargando tarxeta de contautu</string>
+    <string name="failed_loading_vcard">Nun pudo cargase la tarxeta\'l contautu</string>
+    <string name="vcard_tap_hint">Ver tarxeta de contautu</string>
+    <plurals name="vcard_multiple_display_name">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> contautu</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> contautos</item>
+    </plurals>
+    <string name="vcard_detail_activity_title">Tarxetes de contautos</string>
+    <string name="vcard_detail_birthday_label">Aniversariu</string>
+    <string name="vcard_detail_notes_label">Notes</string>
+    <string name="forward_message_activity_title">Reunviar mensaxe</string>
+    <string name="reply_activity_title">Responder</string>
+    <string name="plus_one">+1</string>
+    <string name="plus_n">+%d</string>
+    <string name="sms_disabled">SMS inhabilitaos</string>
+    <string name="requires_default_sms_app_to_send">Pa unviar mensaxes, afita Mensaxes como l\'aplicación SMS por defeutu</string>
+    <string name="requires_default_sms_app">Afitar Mensaxes como l\'aplicación de SMS por defeutu</string>
+    <string name="requires_default_sms_change_button">Camudar</string>
+    <string name="recommend_set_default_sms_app">Pa recibir mensaxes, afita Mensaxes como l\'aplicación SMS por defeutu</string>
+    <string name="no_preferred_sim_selected">Nun hai SIM escoyida como preferida pa unviar mensaxes SMS</string>
+    <string name="requires_sms_permissions_message">Esta aplicación nun tien el permisu\'l dueñu\'l preséu.</string>
+    <string name="requires_sms_permissions_close_button">ACEUTAR</string>
+    <string name="too_many_participants">Milenta participantes nuna conversación</string>
+    <plurals name="add_invalid_contact_error">
+        <item quantity="one">Contautu non válidu</item>
+        <item quantity="other">Contautos non válidos</item>
+    </plurals>
+    <string name="camera_media_failure">Nun pudo cargase la imaxe de la cámara</string>
+    <string name="conversation_list_item_view_sent_from_you_prefix">Tú:\u0020</string>
+    <string name="conversation_list_item_view_sent_from_other_prefix"><xliff:g id="firstNameOfSender">%s</xliff:g>:\u0020</string>
+    <string name="conversation_list_item_view_draft_message">Borrador</string>
+    <string name="conversation_list_empty_text">Namái qu\'anicies una conversación nueva, verásla llistada equí</string>
+    <string name="archived_conversation_list_empty_text">Equí apaecerán les conversaciones archivaes</string>
+    <string name="conversation_list_first_sync_text">Cargando conversaciones…</string>
+    <string name="conversation_list_snippet_picture">Imaxe</string>
+    <string name="conversation_list_snippet_audio_clip">Clip d\'audiu</string>
+    <string name="conversation_list_snippet_video">Videu</string>
+    <string name="conversation_list_snippet_vcard">Tarxeta de contautu</string>
+    <string name="mms_text">MMS</string>
+    <string name="snack_bar_undo">Desfacer</string>
+    <string name="snack_bar_retry">Reintentar</string>
+    <string name="contact_list_empty_text">Pon el nome d\'un contautu o un númberu de teléfonu pa entamar un mensaxe nuevu</string>
+    <string name="action_block">Bloquiar</string>
+    <string name="block_contact_title">Bloquiar <xliff:g id="destination">%s</xliff:g></string>
+    <string name="unblock_contact_title">Desbloquiar <xliff:g id="destination">%s</xliff:g></string>
+    <string name="block_confirmation_title">¿Bloquiar <xliff:g id="destination">%s</xliff:g>?</string>
+    <string name="block_confirmation_message">Siguirás recibiendo mensaxes d\'esti númberu pero yá nun se t\'avisará. Esta conversación archivaráse.</string>
+    <string name="blocked_contacts_title">Contautos bloquiaos</string>
+    <string name="tap_to_unblock_message">DESBLOQUIAR</string>
+    <string name="view_blocked_contacts_title">Contautos bloquiaos</string>
+    <string name="pick_image_from_document_library_content_description">Escueyi una imaxe de la biblioteca de documentos</string>
+    <string name="sending_message">Unviando mensaxe</string>
+    <string name="send_message_success">Unvióse\'l mensaxe</string>
+    <string name="send_message_failure_no_data">El móvil ta apagáu. Revisa la to configuración.</string>
+    <string name="send_message_failure_airplane_mode">Nun puen unviase mensaxes nel mou avión</string>
+    <string name="send_message_failure">Nun pudo unviase\'l mensaxe</string>
+    <string name="download_message_success">Mensaxe baxáu</string>
+    <string name="download_message_failure_no_data">El móvil ta apagáu. Revisa la to configuración.</string>
+    <string name="download_message_failure_airplane_mode">Nun puen baxase mensaxes nel mou avión</string>
+    <string name="download_message_failure">Nun pudo baxase\'l mensaxe</string>
+    <string name="content_description_for_number_zero">Cero</string>
+    <string name="content_description_for_number_one">Uno</string>
+    <string name="content_description_for_number_two">Dos</string>
+    <string name="content_description_for_number_three">Tres</string>
+    <string name="content_description_for_number_four">Cuatro</string>
+    <string name="content_description_for_number_five">Cinco</string>
+    <string name="content_description_for_number_six">Seis</string>
+    <string name="content_description_for_number_seven">Siete</string>
+    <string name="content_description_for_number_eight">Ocho</string>
+    <string name="content_description_for_number_nine">Nueve</string>
+    <string name="carrier_send_error">Nun pue unviase\'l mensaxe con <xliff:g id="carrierName">%1$s</xliff:g>, fallu <xliff:g id="errorCode">%2$d</xliff:g></string>
+    <string name="carrier_send_error_unknown_carrier">Nun se puede mandar el mensaxe con un operador desconocíu, fallu <xliff:g id="errorCode">%1$d</xliff:g></string>
+    <string name="message_fwd">Re: <xliff:g id="subject">%s</xliff:g></string>
+    <string name="mms_failure_outgoing_service">Mensaxe ensin unviar: serviciu ensin activar na rede</string>
+    <string name="mms_failure_outgoing_address">Mensaxe ensin unviar: direición de destín inválida</string>
+    <string name="mms_failure_outgoing_corrupt">Nun s\'unvió\'l mensaxe: mensaxe non válidu</string>
+    <string name="mms_failure_outgoing_content">Nun s\'unvió\'l mensaxe: conteníu non sofitáu</string>
+    <string name="mms_failure_outgoing_unsupported">Nun s\'unvió\'l mensaxe: mensaxe non sofitáu</string>
+    <string name="mms_failure_outgoing_too_large">Nun s\'unvió\'l mensaxe: perllargu</string>
+    <string name="in_conversation_notify_new_message_text">Mensaxe nuevu</string>
+    <string name="in_conversation_notify_new_message_action">Ver</string>
+    <string name="message_image_content_description">Imaxe</string>
+    <string name="activity_not_found_message">Nun pudo alcontrase una aplicación afayadiza</string>
+    <string name="chips_delete_content_description">Desaniciar el destinatariu</string>
+    <string name="share_new_message">Mensaxe nuevu</string>
+    <string name="share_cancel">Encaboxar</string>
+    <string name="apn_edit">Editar puntu d\'accesu</string>
+    <string name="apn_not_set">Nun s\'afitó</string>
+    <string name="apn_name">Nome</string>
+    <string name="apn_apn">APN</string>
+    <string name="apn_mmsc">MMSC</string>
+    <string name="apn_mms_proxy">Proxy MMS</string>
+    <string name="apn_mms_port">Puertu MMS</string>
+    <string name="apn_mcc">MCC</string>
+    <string name="apn_mnc">MNC</string>
+    <string name="apn_type">Triba d\'APN</string>
+    <string name="menu_delete_apn">Desaniciar APN</string>
+    <string name="menu_new_apn">APN nueva</string>
+    <string name="menu_save_apn">Guardar</string>
+    <string name="menu_discard_apn_change">Escartar</string>
+    <string name="error_apn_name_empty">El campu Nome nun pue tar baleru.</string>
+    <string name="error_apn_empty">L\'APN nun pue tar balera.</string>
+    <string name="error_mcc_not3">El campu MMC ha ser de 3 díxitos.</string>
+    <string name="error_mnc_not23">El campu MMC ha ser de 2 ó 3 díxitos.</string>
+    <string name="restore_default_apn">Restaurando la configuración de APN predeterminada.</string>
+    <string name="menu_restore_default_apn">Reafitar valores predeterminaos</string>
+    <string name="restore_default_apn_completed">Reafitóse la configuración predeterminada de APN.</string>
+    <string name="untitled_apn">Ensin títulu</string>
+    <string name="sms_apns_title">Nomes de puntu d\'accesu</string>
+    <string name="apn_settings">APNs</string>
+    <string name="menu_new">APN Nuevu</string>
+    <string name="apn_settings_not_available">Los axustes del nome del puntu d\'accesu nun tán disponibles pa esti usuariu</string>
+    <string name="copy_to_clipboard_dialog_title">¿Copiar al cartafueyu?</string>
+    <string name="copy_to_clipboard">Copiar</string>
+    <string name="incoming_sim_name_text">a <xliff:g id="sim_name">%s</xliff:g></string>
+    <string name="general_settings">Xeneral</string>
+    <string name="advanced_settings">Avanzao</string>
+    <string name="general_settings_activity_title">Axustes xenerales</string>
+    <string name="advanced_settings_activity_title">Axustes avanzaos</string>
+    <string name="sim_specific_settings">SIM «<xliff:g id="sim_name">%s</xliff:g>»</string>
+    <string name="disable_group_mms">Unviar mensaxes SMS individuales a tolos destinatarios. Solo te van retrucar a ti</string>
+    <string name="enable_group_mms">Unviar un solu MMS a tolos destinatarios</string>
+    <string name="sim_settings_unknown_number">Númberu desconocíu</string>
+    <string name="secondary_user_new_message_title">Mensaxe nuevu</string>
+    <string name="secondary_user_new_message_ticker">Mensaxe nuevu.</string>
+    <string name="sim_selector_button_content_description">Seleutor de SIM</string>
+    <string name="sim_selector_button_content_description_with_selection"><xliff:g id="sim">%1$s</xliff:g> esbilláu selector SIM</string>
+    <string name="send_button_long_click_description_no_sim_selector">Editar asuntu</string>
+    <string name="send_button_long_click_description_with_sim_selector">Esbillar SIM o editar asuntu</string>
+    <string name="audio_record_view_content_description">Caltén primío pa grabar audiu</string>
+    <string name="widget_new_conversation_content_description">Entamar una conversación nueva</string>
+    <string name="widget_title_content_description">Mensaxería</string>
+    <string name="widget_conversation_list_name">Llistáu de mensaxes</string>
+    <string name="widget_conversation_name">Mensaxería</string>
+    <string name="widget_new_message_content_description">Mensaxe nuevu</string>
+    <string name="widget_conversation_list_content_description">Llista de conversaciones</string>
+    <string name="loading_conversations">Cargando conversaciones</string>
+    <string name="loading_messages">Cargando mensaxes</string>
+    <string name="view_more_conversations">Ver más conversaciones</string>
+    <string name="view_more_messages">Ver más mensaxes</string>
+    <string name="conversation_deleted">Conversación desaniciada</string>
+    <string name="tap_to_configure">Conversación desaniciada. Toca p\'amosar otra conversación de Centru de Mensaxes</string>
+    <string name="update_destination_blocked">Bloquiáu</string>
+    <string name="update_destination_unblocked">Desbloquiáu</string>
+    <string name="db_full">Hai pocu espaciu d\'almacenamientu. Dellos datos pueden perdese.</string>
+    <string name="attachment_chooser_activity_title">Escoyer axuntos</string>
+    <string name="action_confirm_selection">Confirmar esbilla</string>
+    <string name="attachment_chooser_selection"><xliff:g id="count">%d</xliff:g> esbilláu</string>
+    <string name="attachment_limit_reached_dialog_message_when_composing">Desanicia ún o más axuntos y vuelvi tentalo, por favor.</string>
+    <string name="attachment_limit_reached_dialog_message_when_sending">Pues tentar d\'unviar el to mensaxe pero quiciabes nun s\'entregue a nun ser que desanicies ún o más axuntos.</string>
+    <string name="video_attachment_limit_exceeded_when_sending">Namái pues unviar un videu per mensaxe. Desanicia vídeos adicionales y volvi tentalo, por favor.</string>
+    <string name="attachment_load_failed_dialog_message">Mensaxería falló al cargar l\'axuntu.</string>
+    <string name="attachment_limit_reached_send_anyway">Unviar de toes toes</string>
+    <string name="conversation_creation_failure">Nun pudo aniciase la conversación</string>
+    <string name="link_display_format"><xliff:g id="text">%1$s</xliff:g> (<xliff:g id="url">%2$s</xliff:g>)</string>
+    <string name="selected_sim_content_message"><xliff:g id="selected_sim">%s</xliff:g> esbilláu</string>
 </resources>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 9974a4a..4c54f25 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -16,48 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <string name="pref_unicode_stripping_non_encodable">Kodlaşdırıla bilməyən simvolları əvəz et</string>
-  <string name="pref_unicode_stripping_all">Bütün unikod simvollarını əvəz et</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">CəldMesaj və Cavab</string>
-  <string name="pref_quickmessage_title">CəldMesajı göstər</string>
-  <string name="pref_quickmessage_summary">Gələn SMS mesajları üçün CəldMesaj açılan pəncərəsini avtomatik göstər</string>
-  <string name="pref_close_all_title">Hamısını bağla</string>
-  <string name="pref_close_all_summary">Bağla düyməsi bütün mesajları bağlayar</string>
-  <string name="message_counter">%1$d / %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Bağlı</string>
-  <string name="button_view">Göstər</string>
-  <string name="button_templates">Şablonlar</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Cavablamaq üçün yazın</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Mesaj göndərilir\u2026</string>
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">%s şəxsinə spam olaraq bildirin</string>
+    <string name="unicode_stripping_pref_title">Unikodu idarə et</string>
+    <string name="pref_unicode_stripping_leave_intact">Simvolları olduğu kimi saxla</string>
+    <string name="pref_unicode_stripping_non_encodable">Kodlaşdırıla bilməyən simvolları əvəz et</string>
+    <string name="pref_unicode_stripping_all">Bütün unikod simvollarını əvəz et</string>
+    <string name="validity_period_pref_title">Etibarlılıq müddəti</string>
+    <string name="validity_period_slot1_pref_title">SİM 1-in etibarlılıq periodu</string>
+    <string name="validity_period_slot2_pref_title">SIM 2 üçün etibarlılıq müddəti</string>
+    <string name="sms_validity_period_not_set">Tənzimlənməyib</string>
+    <string name="sms_validity_period_one_hour">1 saat</string>
+    <string name="sms_validity_period_six_hours">6 saat</string>
+    <string name="sms_validity_period_twelve_hours">12 saat</string>
+    <string name="sms_validity_period_one_day">1 gün</string>
+    <string name="mms_validity_period_two_days">2 gün</string>
+    <string name="mms_validity_period_one_week">1 həftə</string>
+    <string name="validity_period_maximum">Maksimum</string>
+    <string name="pref_summary_mms_delivery_reports">Göndərdiyiniz hər mesaj üçün çatdırılma hesabatını sorğulayın</string>
+    <string name="pref_summary_mms_read_reports">Göndərdiyiniz hər mesaj üçün oxunma hesabatını sorğulayın</string>
+    <string name="delivery_reports_mms_pref_title">Çatdırılma hesabatları</string>
+    <string name="read_reports_mms_pref_title">Oxunma hesabatları</string>
+    <string name="status_label">Vəziyyət:\u0020</string>
+    <string name="status_read">Oxu</string>
+    <string name="priority_pref_title">Göndərmə üstünlüyü</string>
+    <string name="priority_low">Aşağı</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">Yüksək</string>
+    <string name="sms_storage_pref_title">Anbar</string>
+    <string name="pref_summary_auto_delete">Limitə çatanda köhnə mesajları sil</string>
+    <string name="auto_delete_pref_title">Köhnə mesajları sil</string>
+    <string name="pref_summary_delete_limit">Hər söhbətdə <xliff:g id="count">%1$s</xliff:g> mesaj</string>
+    <string name="sms_delete_pref_title">Mətn mesaj limiti</string>
+    <string name="mms_delete_pref_title">Multimedia mesaj limiti</string>
+    <string name="set">Tənzimlə</string>
+    <string name="no">İmtina</string>
+    <string name="pref_messages_to_save">Saxlanılacaq mesaj sayını tənzimlə</string>
+    <string name="swipe_to_delete_conversation_pref_title">Silmək üçün sürüşdür</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Yazışmanı silmək üçün sağa sürüşdür</string>
+    <string name="pref_quickmessage">CəldMesaj və Cavab</string>
+    <string name="pref_quickmessage_title">CəldMesajı göstər</string>
+    <string name="pref_quickmessage_summary">Gələn SMS mesajları üçün CəldMesaj açılan pəncərəsini avtomatik göstər</string>
+    <string name="pref_close_all_title">Hamısını bağla</string>
+    <string name="pref_close_all_summary">Bağla düyməsi bütün mesajları bağlayar</string>
+    <string name="message_counter">%1$d / %2$d</string>
+    <string name="button_close">Bağlı</string>
+    <string name="button_view">Göstər</string>
+    <string name="button_templates">Şablonlar</string>
+    <string name="qm_button_full_conversation">Tam söhbət</string>
+    <string name="type_to_reply_text_enter_to_send">Cavablamaq üçün yazın</string>
+    <string name="toast_sending_message">Mesaj göndərilir\u2026</string>
+    <string name="qm_quick_reply">Cəld cavab</string>
+    <string name="send">Göndər</string>
+    <string name="compose_message_hint_text">Mesaj daxil edin</string>
+    <string name="show_emoticons_pref_title">Emoji müraciəti</string>
+    <string name="show_emoticons_pref_summary">Klaviaturada emoji düyməsini göstər</string>
+    <string name="select_phone_account_title">Bununla göndər</string>
+    <string name="pref_title_manage_sim_messages">SIM kart mesajlarını idarə et</string>
+    <string name="pref_title_manage_sim_messages_slot1">SIM 1 mesajlarını idarə et</string>
+    <string name="pref_title_manage_sim_messages_slot2">SIM 2 mesajlarını idarə et</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> mesaj SIM kartda saxlanıldı.</string>
+    <string name="copy_to_sim_fail">Mesajı saxlanıla bilmədi</string>
+    <string name="copy_to_phone_success">Mesaj saxlanıldı</string>
+    <string name="copy_to_phone_fail">Mesajı saxlanıla bilmədi</string>
+    <string name="sim_empty">SIM kartda mesaj yoxdur.</string>
+    <string name="menu_send_email"><xliff:g id="name">%s</xliff:g> e-poçt göndər</string>
+    <string name="menu_call_back"><xliff:g id="name">%s</xliff:g> zəng et</string>
+    <string name="menu_add_address_to_contacts"><xliff:g id="contactEmailOrNumber">%s</xliff:g> Şəxslərə əlavə et</string>
+    <string name="sim_capacity_title">SIM tutumu</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d </xliff:g>-<xliff:g id="total">%2$d </xliff:g> SIM kart girişləri istifadə edilir</string>
+    <string name="confirm_dialog_title">Silinsin?</string>
+    <string name="sim_manage_messages_title">SIM kartdakı mətn mesajları</string>
+    <string name="refreshing">Yenilənir\u2026</string>
+    <string name="confirm_delete_selected_messages">Seçilən mesaj silinəcək.</string>
+    <string name="delete">Sil</string>
+    <string name="menu_forward">Yönləndir</string>
+    <string name="menu_reply">Cavabla</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Planşetin yaddaşına kopyala</string>
+    <string name="sim_copy_to_phone_memory" product="default">Telefonun yaddaşına kopyala</string>
+    <string name="selected_all">Hamısını seç</string>
+    <string name="deselected_all">Heç birini seçmə</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> seçildi</string>
+    <string name="yes">Oldu</string>
+    <string name="operation_to_card_memory">Mesajı SIM karta kopyala</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Təsvirləri və ya videoları bu cihazdan seç</string>
+    <string name="mediapicker_audioListChooserDescription">Səs fayllarını bu cihazdan seç</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Video əlavə edilə bilmir. Maksimum mesaj həcmini keçdi.</string>
+    <string name="mediapicker_audio_list_title">Səs seç</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Səs seçildi.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Səs seçilmədi.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> seçildi</string>
 </resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index aa00f62..ac74aaa 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -16,12 +16,6 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String to match as no subject and filter out as a subject. For example, if the
-         subject string is "no subject", we won't display that. We'll pretend
-         no subject string was delivered. -->
-  <!-- Choices for quick-reply to message notification. Users with an Android
-    Wear device (e.g. smartwatch) can reply to messages either by speaking their
-    response, or choosing one of these predefined options. -->
   <string-array name="notification_reply_choices">
     <item>Так</item>
     <item>Не</item>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index e27ed8d..9ed578f 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -16,89 +16,58 @@
     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">Змяніць юнікод</string>
-  <string name="pref_unicode_stripping_leave_intact">Пакінуць сімвалы без зменаў</string>
-  <string name="pref_unicode_stripping_non_encodable">Замяняць некадаваныя знакі</string>
-  <string name="pref_unicode_stripping_all">Замяняць усе знакі юнікода</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Тэрмін дзеяння</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="status_label">Статус:\u0020</string>
-  <string name="status_read">Прачытана</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_low">Нізкі</string>
-  <string name="priority_normal">Звычайны</string>
-  <string name="priority_high">Высокі</string>
-  <!-- Storage specific Settings -->
-  <string name="no">Скасаваць</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Прагарнi, каб выдалiць</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Прагарнi направа, каб выдалiць размову</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Усплывальныя паведамленні</string>
-  <string name="pref_quickmessage_title">Хуткі адказ</string>
-  <string name="pref_quickmessage_summary">Аўтаматычна адчыняць акенца хуткага адказу для новых паведамленняў</string>
-  <string name="pref_close_all_title">Зачыніць усё</string>
-  <string name="pref_close_all_summary">Кнопка \"Зачыніць\" зачыняе ўсе паведамленні</string>
-  <string name="message_counter">%1$d з %2$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_phone_success">Паведамленне захавана</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 -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Выдаліць?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- 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>
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <string name="yes">Добра</string>
-  <!-- Copy message to sim -->
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">Паведаміць пра спам %s</string>
+    <string name="unicode_stripping_pref_title">Змяніць юнікод</string>
+    <string name="pref_unicode_stripping_leave_intact">Пакінуць сімвалы без зменаў</string>
+    <string name="pref_unicode_stripping_non_encodable">Замяняць некадаваныя знакі</string>
+    <string name="pref_unicode_stripping_all">Замяняць усе знакі юнікода</string>
+    <string name="validity_period_pref_title">Тэрмін дзеяння</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="status_label">Статус:\u0020</string>
+    <string name="status_read">Прачытана</string>
+    <string name="priority_low">Нізкі</string>
+    <string name="priority_normal">Звычайны</string>
+    <string name="priority_high">Высокі</string>
+    <string name="no">Скасаваць</string>
+    <string name="swipe_to_delete_conversation_pref_title">Прагарнi, каб выдалiць</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Прагарнi направа, каб выдалiць размову</string>
+    <string name="pref_quickmessage">Усплывальныя паведамленні</string>
+    <string name="pref_quickmessage_title">Хуткі адказ</string>
+    <string name="pref_quickmessage_summary">Аўтаматычна адчыняць акенца хуткага адказу для новых паведамленняў</string>
+    <string name="pref_close_all_title">Зачыніць усё</string>
+    <string name="pref_close_all_summary">Кнопка \"Зачыніць\" зачыняе ўсе паведамленні</string>
+    <string name="message_counter">%1$d з %2$d</string>
+    <string name="button_close">Зачыніць</string>
+    <string name="button_view">Паглядзець</string>
+    <string name="button_templates">Шаблёны</string>
+    <string name="qm_button_full_conversation">Гутарка</string>
+    <string name="type_to_reply_text_enter_to_send">Увядзі тэкст для адказу</string>
+    <string name="toast_sending_message">Адпраўка паведамлення\u2026</string>
+    <string name="qm_quick_reply">Хуткі адказ</string>
+    <string name="send">Даслаць</string>
+    <string name="compose_message_hint_text">Тэкст паведамлення</string>
+    <string name="show_emoticons_pref_title">Доступ да смайлаў</string>
+    <string name="show_emoticons_pref_summary">Паказаць смайлы на клавіятуры</string>
+    <string name="select_phone_account_title">Даслаць з дапамогай</string>
+    <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_phone_success">Паведамленне захавана</string>
+    <string name="sim_empty">Адсутнічаюць паведамленні на SIM-картцы.</string>
+    <string name="confirm_dialog_title">Выдаліць?</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Капіяваць ў памяць планшэту</string>
+    <string name="sim_copy_to_phone_memory" product="default">Капіяваць ў памяць тэлефону</string>
+    <string name="selected_all">Вылучыць усё</string>
+    <string name="deselected_all">Скасаваць усё</string>
+    <string name="yes">Добра</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 0757805..4eb0d18 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -16,11 +16,8 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- The name of the application as it appears under the main Launcher icon and in various activity titles -->
   <string name="app_name">Паведамленьні</string>
-  <!-- The name of the application as it appears in external share intent dialogs -->
   <string name="share_intent_label">Паведамленьні</string>
-  <!-- The title when selecting a conversation to share to -->
   <string name="action_settings">Налады</string>
   <string name="sendButtonContentDescription">Даслаць паведамленьне</string>
   <string name="help_and_feedback_activity_label">Дапамога</string>
@@ -29,341 +26,13 @@
   <string name="next">Наступны</string>
   <string name="exit">Выйсьце</string>
   <string name="settings">Налады</string>
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <!-- The tab header for the frequently used contacts list -->
-  <!-- The tab header for all contacts list -->
-  <!-- The text on the list item in the contact picker that allows a user to send an SMS directly
-         to a number that he/she typed. eg. "Send to 650-555-1234" -->
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <!-- Abbreviated message to express that something occurred some number of hours in the past (e.g., 5 hours ago). -->
-  <!-- Abbreviated message to express that something occurred some number of days in the past (e.g., 5 days ago). -->
-  <!--
-        Plurals used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <!-- Title of the class-0 message activity. -->
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <!-- Title for SMS storage low notification and dialog. Must match the framework's notification title, i.e. //frameworks/base/core/res/res/values/strings.xml#low_internal_storage_view_title -->
-  <!-- Text for SMS storage low notification and dialog -->
-  <!-- Ticker for SMS storage low notification -->
-  <!-- Title for asking the user to enter their phone number -->
-  <!-- Text for asking the user to enter their phone number -->
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <!-- Free SMS storage actions -->
-  <!-- Free SMS storage action confirm dialog message -->
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <!-- While sending a message display this message. -->
-  <!-- When sending a message failed display this message. -->
-  <!-- When retrying sending for a message. -->
-  <!-- When showing resend action display this message. -->
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <!-- When showing resend action, display this message. -->
-  <!-- Title line for an MMS requiring manual download. -->
-  <!-- Title line for an MMS auto-downloading. -->
-  <!-- Title line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which is selected. -->
-  <!-- Timestamp line to display while downloading a message. -->
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <!-- Display this info line with an MMS notification -->
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for download failed -->
-  <!-- notification line 1 for multiple downloads failed -->
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <!-- Notification content when emergency SMS fails to send -->
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <!-- Content description text for Back button on the action bar -->
-  <!-- Action menu title for showing archived conversations -->
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <!-- An enumeration comma for separating multiple names in notifications. [CHAR LIMIT=2] -->
-  <!-- Separator between parts of a notification in each line of an inboxStyle notification. [CHAR LIMIT=2] -->
-  <!-- Separator between title and content in notification ticker -->
-  <!-- Separator between title and content in notifications -->
-  <!-- Shown in notifications when there's a picture. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <!-- Shown in the Android Wear conversation log as the sender for outgoing messages,
-         when we don't know the user's real name (e.g. no "Me" contact on the phone). -->
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <!-- Accessibility announcement for an incoming message -->
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <!-- Accessibility description for conversation list for group conversations -->
-  <!-- Accessibility description for conversation list for failed messages -->
-  <!-- Accessibility name for a group conversation -->
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <!-- Title for the preferences/settings activity -->
   <string name="settings_activity_title">Налады</string>
-  <!-- Title for the archived conversations activity -->
-  <!-- Action title: Close -->
-  <!-- Preference category: MMS messaging -->
-  <!-- Preference category: Advanced -->
   <string name="advanced_category_pref_title">Падрабязьней</string>
-  <!-- Preference category: Debug -->
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <!-- Title for the notification sound preference -->
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <!-- Preference summary: Current default SMS app -->
-  <!-- Preference title: MMS phone number -->
-  <!-- Display text for phone number preference when the number is unknown -->
-  <!-- Title for the preference for playing a message send sound -->
-  <!-- Strings for dump sms/mms dialog -->
-  <!-- Title of long press menu on an individual message. -->
-  <!-- Menu item to copy message text -->
-  <!-- Title of long press menu for details about an individual message. -->
-  <!-- Title of long press menu for deleting an individual message. -->
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <!-- Title of "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <!-- Sender to be used if the sender address has been hidden -->
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <!-- Notifies the user when an attachment fails to load -->
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <!-- Title for the "People and Options" activity -->
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <!-- Title for the phone call button in the action bar that lets the user call a participant in an SMS conversation -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <!-- The hint text shown in the message compose input box when photo(s) is attached -->
-  <!-- The hint text shown in the message compose input box when audio recording(s) is attached -->
-  <!-- The hint text shown in the message compose input box when video(s) is attached -->
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <!-- Announcement after the user adds or removes an attachment -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <!-- The format of the subtitle of the help activity. -->
-  <!--  Action menu title to let users view open source license -->
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <!-- Reached MMS message attachment limit -->
-  <!-- Message attachment load failed -->
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- When there's a subject in an mms, the subject + message are shown in a notification -->
-  <!-- Text shown on contact VCard when it's being loaded -->
-  <!-- Text shown on contact VCard when it failed to load -->
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <!-- Title for the activity that shows details of VCards -->
-  <!-- VCard label for displaying birthdays -->
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <!-- Title for the message forwarding dialog -->
-  <!-- Title for the message reply dialog -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <!-- Dialog button text that closes the application. -->
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <!-- A message in conversation list view to indicate that the snipit text and preview is from an unsent draft. -->
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <!-- Indicates that the current message will be sent via MMS -->
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <!-- Title of block confirmation dialog -->
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <!-- The title of the list of blocked contacts -->
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <!-- Accessibility toast shown when a message is sending. -->
-  <!-- Accessibility toast shown when a message is sent. -->
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <!-- Accessibility : content description for numbers -->
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <!-- Text prepended to the subject of a forwarded message -->
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <!-- The notification toast text and action button label shown at bottom of screen, for when a new message comes in while the user
-         is in that conversation, but the message list is not scrolled to the bottom -->
-  <!-- Content description for the message images in a conversation or for the image preview in the conversation list if the lastest message in that conversation contains an image-->
-  <!-- Text for a toast message notifying the user that we can't find an appropriate application to handle their request -->
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Screen title after user selects APNs setting option -->
-  <!-- Edit access point label summary text when no value has been set -->
-  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
   <string name="apn_name">Назва</string>
-  <!-- Edit access point labels: The actual access point name-->
   <string name="apn_apn">APN</string>
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The type of APN -->
-  <!-- Edit access point screen menu option to delete this APN -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <string name="menu_discard_apn_change">Адхіліць</string>
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <!-- APNs screen menu option to reset default APN settings -->
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <!-- Title for Access Point Names settings -->
   <string name="sms_apns_title">Кропка доступу сотавай сувязі</string>
-  <!-- Title for Access Point Names settings activity -->
   <string name="apn_settings">APN</string>
-  <!-- APNs screen menu option to create a brand spanking new APN -->
   <string name="menu_new">Стварыць APN</string>
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <!-- The title for general settings section in the settings activity  -->
-  <!-- The title for advanced settings section in the settings activity  -->
   <string name="advanced_settings">Падрабязьней</string>
-  <!-- The title for general settings activity  -->
-  <!-- The title for advanced settings activity  -->
-  <!-- The title for sim_specific settings  -->
-  <!-- The group MMS choices in settings -->
-  <!-- SIM number shown in the settings when the number is not known -->
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <!-- Content description for the SIM selector button in the conversation -->
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <!-- Content description for the audio record view -->
-  <!-- Content description for new conversation button in desktop widget -->
-  <!-- Content description for widget title -->
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <!-- Content description for new message button in desktop widget -->
-  <!-- Content description for conversation list button in desktop widget -->
-  <!-- Shown when loading conversations in the widget -->
-  <!-- Shown when loading messages in the widget -->
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <!-- Toast message telling the user that someone was blocked -->
-  <!-- Toast message telling the user that someone was unblocked -->
-  <!-- Title for attachment chooser activity -->
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message load failed -->
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <!-- When converting html to text link urls are inlined.  This specifies how the link should be
-    displayed.  For example, a link "click here" which navigates to "www.google.com" would have
-    text="click here" and url="www.google.com", using the below format to create "click here (www.google.com)" -->
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
 </resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 8f02dfd..1a769ca 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -16,127 +16,96 @@
     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">Замени уникод</string>
-  <string name="pref_unicode_stripping_leave_intact">Не заменяй символите</string>
-  <string name="pref_unicode_stripping_non_encodable">Замени не кодираните символи</string>
-  <string name="pref_unicode_stripping_all">Замени всички уникод символи</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Период на валидност</string>
-  <string name="validity_period_slot1_pref_title">Период на валидност за СИМ карта 1</string>
-  <string name="validity_period_slot2_pref_title">Период на валидност за СИМ карта 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">Лимит на SMS-съобщения</string>
-  <string name="mms_delete_pref_title">Лимит на MMS-съобщения</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_close_all_title">Затвори всички</string>
-  <string name="pref_close_all_summary">Бутона \"Затвори\" затваря всички съобщения</string>
-  <string name="message_counter">%1$d от %2$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">Управляване на съобщения от СИМ карта</string>
-  <string name="pref_title_manage_sim_messages_slot1">Управление на съобщенията СИМ карта 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Управление на съобщенията СИМ карта 2</string>
-  <string name="copy_to_sim">Копирай съобщението в SIM картата</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d </xliff:g> от <xliff:g id="total">%2$d </xliff:g> съобщения записани в СИМ картата.</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="name">%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">Капацитет на СИМ картата</string>
-  <string name="sim_capacity">Използвани <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>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">SMS съобщения на СИМ картата</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">СИМ карта 1</string>
-  <string name="slot2">СИМ карта 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>
+    <string name="report_as_spam_to">Докладвай за спам на %s</string>
+    <string name="unicode_stripping_pref_title">Замени уникод</string>
+    <string name="pref_unicode_stripping_leave_intact">Не заменяй символите</string>
+    <string name="pref_unicode_stripping_non_encodable">Замени не кодираните символи</string>
+    <string name="pref_unicode_stripping_all">Замени всички уникод символи</string>
+    <string name="validity_period_pref_title">Период на валидност</string>
+    <string name="validity_period_slot1_pref_title">Период на валидност за СИМ карта 1</string>
+    <string name="validity_period_slot2_pref_title">Период на валидност за СИМ карта 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>
+    <string name="priority_pref_title">Приоритет при изпращане</string>
+    <string name="priority_low">Нисък</string>
+    <string name="priority_normal">Нормален</string>
+    <string name="priority_high">Висок</string>
+    <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">Лимит на SMS-съобщения</string>
+    <string name="mms_delete_pref_title">Лимит на MMS-съобщения</string>
+    <string name="set">Приложи</string>
+    <string name="no">Отмени</string>
+    <string name="pref_messages_to_save">Брой съобщения за запис</string>
+    <string name="swipe_to_delete_conversation_pref_title">Бързо изтриване</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Плъзнете от ляво надясно за да изтриете кореспонденцията</string>
+    <string name="pref_quickmessage">Изскачащи съобщения</string>
+    <string name="pref_quickmessage_title">Бързи съобщения</string>
+    <string name="pref_quickmessage_summary">Автоматично отваряне на прозорец за бърз отговор за нови съобщения</string>
+    <string name="pref_close_all_title">Затвори всички</string>
+    <string name="pref_close_all_summary">Бутона \"Затвори\" затваря всички съобщения</string>
+    <string name="message_counter">%1$d от %2$d</string>
+    <string name="button_close">Затвори</string>
+    <string name="button_view">Преглед</string>
+    <string name="button_templates">Шаблони</string>
+    <string name="qm_button_full_conversation">Пълен диалог</string>
+    <string name="type_to_reply_text_enter_to_send">Напишете отговор</string>
+    <string name="toast_sending_message">Изпращане на съобщението\u2026</string>
+    <string name="qm_quick_reply">Бърз отговор</string>
+    <string name="send">Изпрати</string>
+    <string name="compose_message_hint_text">Напишете съобщение</string>
+    <string name="show_emoticons_pref_title">Достъп до емотикони</string>
+    <string name="show_emoticons_pref_summary">Показва клавиш с емотикони на клавиатурата</string>
+    <string name="select_phone_account_title">Изпрати с</string>
+    <string name="pref_title_manage_sim_messages">Управляване на съобщения от СИМ карта</string>
+    <string name="pref_title_manage_sim_messages_slot1">Управление на съобщенията СИМ карта 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Управление на съобщенията СИМ карта 2</string>
+    <string name="copy_to_sim">Копирай съобщението в SIM картата</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d </xliff:g> от <xliff:g id="total">%2$d </xliff:g> съобщения записани в СИМ картата.</string>
+    <string name="copy_to_sim_fail">Не може да запише това съобщение</string>
+    <string name="copy_to_phone_success">Съобщението е записано</string>
+    <string name="copy_to_phone_fail">Не може да запише това съобщение</string>
+    <string name="sim_empty">Няма съобщения на SIM картата.</string>
+    <string name="menu_send_email">Изпрати имейл до <xliff:g id="name">%s </xliff:g></string>
+    <string name="menu_call_back">Обади се на <xliff:g id="name">%s </xliff:g></string>
+    <string name="menu_add_address_to_contacts">Добави <xliff:g id="contactEmailOrNumber">%s </xliff:g> за контакти</string>
+    <string name="sim_capacity_title">Капацитет на СИМ картата</string>
+    <string name="sim_capacity">Използвани <xliff:g id="used">%1$d</xliff:g> от <xliff:g id="total">%2$d</xliff:g>възможни записа на СИМ картата</string>
+    <string name="confirm_dialog_title">Изтриване?</string>
+    <string name="sim_manage_messages_title">SMS съобщения на СИМ картата</string>
+    <string name="refreshing">Зареждане\u2026</string>
+    <string name="confirm_delete_selected_messages">Избраните съобщения ще бъдат изтрити.</string>
+    <string name="delete">Изтриване</string>
+    <string name="menu_forward">Препрати</string>
+    <string name="menu_reply">Отговор</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Копиране в паметта на таблета</string>
+    <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>
+    <string name="yes">Добре</string>
+    <string name="operation_to_card_memory">Копирай съобщението в SIM картата</string>
+    <string name="slot1">СИМ карта 1</string>
+    <string name="slot2">СИМ карта 2</string>
+    <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>
 </resources>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index b0ec296..81e6973 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -16,38 +16,7 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">বন্ধ করুন</string>
-  <string name="button_view">দেখুন</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">উত্তর দিতে লিখুন</string>
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="button_close">বন্ধ করুন</string>
+    <string name="button_view">দেখুন</string>
+    <string name="type_to_reply_text_enter_to_send">উত্তর দিতে লিখুন</string>
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index a3e4569..fc99953 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Informa com a correu brossa a %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Esquinça unicode</string>
-  <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>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Període de validesa</string>
-  <string name="validity_period_slot1_pref_title">Període de validesa de la SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Període de validesa de la SIM 2</string>
-  <string name="sms_validity_period_not_set">No establert</string>
-  <string name="sms_validity_period_one_hour">1 hora</string>
-  <string name="sms_validity_period_six_hours">6 hores</string>
-  <string name="sms_validity_period_twelve_hours">12 hores</string>
-  <string name="sms_validity_period_one_day">1 dia</string>
-  <string name="mms_validity_period_two_days">2 dies</string>
-  <string name="mms_validity_period_one_week">1 setmana</string>
-  <string name="validity_period_maximum">Màxim</string>
-  <string name="pref_summary_mms_delivery_reports">Demana un informe de lliurament en cada missatge que enviïs</string>
-  <string name="pref_summary_mms_read_reports">Demana un informe de lectura en cada missatge que enviïs</string>
-  <string name="delivery_reports_mms_pref_title">Informes de lliurament</string>
-  <string name="read_reports_mms_pref_title">Informes de lectura</string>
-  <string name="status_label">Estat:\u0020</string>
-  <string name="status_read">Llegit</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Prioritat d\'enviament</string>
-  <string name="priority_low">Baixa</string>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">Alta</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Emmagatzematge</string>
-  <string name="pref_summary_auto_delete">Esborra els missatges antics quan s\'assoleixin els límits</string>
-  <string name="auto_delete_pref_title">Esborra els missatges antics</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> missatges per conversa</string>
-  <string name="sms_delete_pref_title">Límit de missatges de text</string>
-  <string name="mms_delete_pref_title">Límit de missatges multimèdia</string>
-  <string name="set">Estableix</string>
-  <string name="no">Cancel·la</string>
-  <string name="pref_messages_to_save">Estableix el nombre de missatges a desar</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Llisca per esborrar</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Llisca cap a la dreta per esborrar una conversa</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">MissatgeRàpid i respondre</string>
-  <string name="pref_quickmessage_title">Mostra MissatgeRàpid</string>
-  <string name="pref_quickmessage_summary">Obre automàticament la finestra emergent MissatgeRàpid pels missatges SMS entrants</string>
-  <string name="pref_close_all_title">Tanca-ho tot</string>
-  <string name="pref_close_all_summary">El botó tanca, tanca tots els missatges</string>
-  <string name="message_counter">%1$d de %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Tanca</string>
-  <string name="button_view">Veure</string>
-  <string name="button_templates">Plantilles</string>
-  <string name="qm_button_full_conversation">Conversa sencera</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Escriu per respondre</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">S\'està enviant el missatge\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Resposta ràpida</string>
-  <string name="send">Envia</string>
-  <string name="compose_message_hint_text">Introdueix el missatge</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Accés a les emoticones</string>
-  <string name="show_emoticons_pref_summary">Mostra la tecla de les emoticones al teclat</string>
-  <string name="select_phone_account_title">Envia amb</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Gestiona els missatges de la targeta SIM</string>
-  <string name="pref_title_manage_sim_messages_slot1">Gestiona els missatges de la SIM 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Gestiona els missatges de la SIM 2</string>
-  <string name="copy_to_sim">Copia el missatge a la targeta SIM</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> missatges desats a la targeta SIM.</string>
-  <string name="copy_to_sim_fail">No s\'ha pogut desar el missatge</string>
-  <string name="copy_to_phone_success">Missatge desat</string>
-  <string name="copy_to_phone_fail">No s\'ha pogut desar el missatge</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">No hi ha missatges SMS a la targeta.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Envia un correu electrònic a <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">Truca a <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">Afegeix <xliff:g id="contactEmailOrNumber">%s</xliff:g> a la Gent</string>
-  <string name="sim_capacity_title">Capacitat de la SIM</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> entrades de la targeta SIM utilitzades</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Esborrar?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Missatges de text a la targeta SIM</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">S\'està refrescant\u2026</string>
-  <string name="confirm_delete_selected_messages">El missatge seleccionat serà esborrat.</string>
-  <!-- Delete button title -->
-  <string name="delete">Esborra</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Reenvia</string>
-  <string name="menu_reply">Respon</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 a la memòria de la tauleta</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 a la memòria del telèfon</string>
-  <string name="selected_all">Selecciona-ho tot</string>
-  <string name="deselected_all">Deselecciona-ho tot</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> seleccionat</string>
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <string name="yes">D\'ACORD</string>
-  <!-- Copy message to sim -->
-  <string name="operation_to_card_memory">Copia el missatge a la targeta 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">Tria les imatges o vídeos d\'aquest dispositiu</string>
-  <string name="mediapicker_audioListChooserDescription">Tria els arxius de so d\'aquest dispositiu</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">No es pot adjuntar el vídeo. La mida màxima del missatge s\'ha superat.</string>
-  <string name="mediapicker_audio_list_title">Tria el so</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">El so s\'ha seleccionat.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">El so s\'ha des-seleccionat.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> seleccionat</string>
+    <string name="report_as_spam_to">Informa com a correu brossa a %s</string>
+    <string name="unicode_stripping_pref_title">Esquinça unicode</string>
+    <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="validity_period_pref_title">Període de validesa</string>
+    <string name="validity_period_slot1_pref_title">Període de validesa de la SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Període de validesa de la SIM 2</string>
+    <string name="sms_validity_period_not_set">No establert</string>
+    <string name="sms_validity_period_one_hour">1 hora</string>
+    <string name="sms_validity_period_six_hours">6 hores</string>
+    <string name="sms_validity_period_twelve_hours">12 hores</string>
+    <string name="sms_validity_period_one_day">1 dia</string>
+    <string name="mms_validity_period_two_days">2 dies</string>
+    <string name="mms_validity_period_one_week">1 setmana</string>
+    <string name="validity_period_maximum">Màxim</string>
+    <string name="pref_summary_mms_delivery_reports">Demana un informe de lliurament en cada missatge que enviïs</string>
+    <string name="pref_summary_mms_read_reports">Demana un informe de lectura en cada missatge que enviïs</string>
+    <string name="delivery_reports_mms_pref_title">Informes de lliurament</string>
+    <string name="read_reports_mms_pref_title">Informes de lectura</string>
+    <string name="status_label">Estat:\u0020</string>
+    <string name="status_read">Llegit</string>
+    <string name="priority_pref_title">Prioritat d\'enviament</string>
+    <string name="priority_low">Baixa</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">Alta</string>
+    <string name="sms_storage_pref_title">Emmagatzematge</string>
+    <string name="pref_summary_auto_delete">Esborra els missatges antics quan s\'assoleixin els límits</string>
+    <string name="auto_delete_pref_title">Esborra els missatges antics</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> missatges per conversa</string>
+    <string name="sms_delete_pref_title">Límit de missatges de text</string>
+    <string name="mms_delete_pref_title">Límit de missatges multimèdia</string>
+    <string name="set">Estableix</string>
+    <string name="no">Cancel·la</string>
+    <string name="pref_messages_to_save">Estableix el nombre de missatges a desar</string>
+    <string name="swipe_to_delete_conversation_pref_title">Llisca per esborrar</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Llisca cap a la dreta per esborrar una conversa</string>
+    <string name="pref_quickmessage">MissatgeRàpid i respondre</string>
+    <string name="pref_quickmessage_title">Mostra MissatgeRàpid</string>
+    <string name="pref_quickmessage_summary">Obre automàticament la finestra emergent MissatgeRàpid pels missatges SMS entrants</string>
+    <string name="pref_close_all_title">Tanca-ho tot</string>
+    <string name="pref_close_all_summary">El botó tanca, tanca tots els missatges</string>
+    <string name="message_counter">%1$d de %2$d</string>
+    <string name="button_close">Tanca</string>
+    <string name="button_view">Veure</string>
+    <string name="button_templates">Plantilles</string>
+    <string name="qm_button_full_conversation">Conversa sencera</string>
+    <string name="type_to_reply_text_enter_to_send">Escriu per respondre</string>
+    <string name="toast_sending_message">S\'està enviant el missatge\u2026</string>
+    <string name="qm_quick_reply">Resposta ràpida</string>
+    <string name="send">Envia</string>
+    <string name="compose_message_hint_text">Introdueix el missatge</string>
+    <string name="show_emoticons_pref_title">Accés a les emoticones</string>
+    <string name="show_emoticons_pref_summary">Mostra la tecla de les emoticones al teclat</string>
+    <string name="select_phone_account_title">Envia amb</string>
+    <string name="pref_title_manage_sim_messages">Gestiona els missatges de la targeta SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Gestiona els missatges de la SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Gestiona els missatges de la SIM 2</string>
+    <string name="copy_to_sim">Copia el missatge a la targeta SIM</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> missatges desats a la targeta SIM.</string>
+    <string name="copy_to_sim_fail">No s\'ha pogut desar el missatge</string>
+    <string name="copy_to_phone_success">Missatge desat</string>
+    <string name="copy_to_phone_fail">No s\'ha pogut desar el missatge</string>
+    <string name="sim_empty">No hi ha missatges SMS a la targeta.</string>
+    <string name="menu_send_email">Envia un correu electrònic a <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Truca a <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Afegeix <xliff:g id="contactEmailOrNumber">%s</xliff:g> a la Gent</string>
+    <string name="sim_capacity_title">Capacitat de la SIM</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> entrades de la targeta SIM utilitzades</string>
+    <string name="confirm_dialog_title">Esborrar?</string>
+    <string name="sim_manage_messages_title">Missatges de text a la targeta SIM</string>
+    <string name="refreshing">S\'està refrescant\u2026</string>
+    <string name="confirm_delete_selected_messages">El missatge seleccionat serà esborrat.</string>
+    <string name="delete">Esborra</string>
+    <string name="menu_forward">Reenvia</string>
+    <string name="menu_reply">Respon</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Copia a la memòria de la tauleta</string>
+    <string name="sim_copy_to_phone_memory" product="default">Copia a la memòria del telèfon</string>
+    <string name="selected_all">Selecciona-ho tot</string>
+    <string name="deselected_all">Deselecciona-ho tot</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> seleccionat</string>
+    <string name="yes">D\'ACORD</string>
+    <string name="operation_to_card_memory">Copia el missatge a la targeta SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Tria les imatges o vídeos d\'aquest dispositiu</string>
+    <string name="mediapicker_audioListChooserDescription">Tria els arxius de so d\'aquest dispositiu</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">No es pot adjuntar el vídeo. La mida màxima del missatge s\'ha superat.</string>
+    <string name="mediapicker_audio_list_title">Tria el so</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">El so s\'ha seleccionat.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">El so s\'ha des-seleccionat.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> seleccionat</string>
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index c855ddb..76202fc 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Označit jako spam %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Odstranit znaky Unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Ponechat původní znaky</string>
-  <string name="pref_unicode_stripping_non_encodable">Oříznout nekódovatelné znaky</string>
-  <string name="pref_unicode_stripping_all">Oříznout všechny 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 pro SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Doba platnosti pro SIM 2</string>
-  <string name="sms_validity_period_not_set">Nenastaveno</string>
-  <string name="sms_validity_period_one_hour">1 hodina</string>
-  <string name="sms_validity_period_six_hours">6 hodin</string>
-  <string name="sms_validity_period_twelve_hours">12 hodin</string>
-  <string name="sms_validity_period_one_day">1 den</string>
-  <string name="mms_validity_period_two_days">2 dny</string>
-  <string name="mms_validity_period_one_week">1 týden</string>
-  <string name="validity_period_maximum">Maximální</string>
-  <string name="pref_summary_mms_delivery_reports">Pro každou zprávu vyžádat doručenku</string>
-  <string name="pref_summary_mms_read_reports">Pro každou zprávu vyžádat potvrzení o přečtení</string>
-  <string name="delivery_reports_mms_pref_title">Doručenky</string>
-  <string name="read_reports_mms_pref_title">Potvrzení o přečtení</string>
-  <string name="status_label">Stav:\u0020</string>
-  <string name="status_read">Přečteno</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Priorita odeslání</string>
-  <string name="priority_low">Nízká</string>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">Vysoká</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Úložiště</string>
-  <string name="pref_summary_auto_delete">Odstranit staré zprávy při dosažení limitů</string>
-  <string name="auto_delete_pref_title">Odstranit staré zprávy</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> zpráv v konverzaci</string>
-  <string name="sms_delete_pref_title">Limit textových zpráv</string>
-  <string name="mms_delete_pref_title">Limit multimediálních zpráv</string>
-  <string name="set">Nastavit</string>
-  <string name="no">Zrušit</string>
-  <string name="pref_messages_to_save">Nastavit počet uložených zpráv</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Odsunutím smazat</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Odsunutím vpravo smazat konverzaci</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Rychlá zpráva a odpověď</string>
-  <string name="pref_quickmessage_title">Zobrazit rychlé zprávy</string>
-  <string name="pref_quickmessage_summary">Automaticky otevřít rychlou zprávu pro příchozí SMS zprávy</string>
-  <string name="pref_close_all_title">Zavřít vše</string>
-  <string name="pref_close_all_summary">Tlačítko \u201aZavřít\u2018 zavře všechny zprávy</string>
-  <string name="message_counter">%1$d z %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Zavřít</string>
-  <string name="button_view">Zobrazit</string>
-  <string name="button_templates">Šablony</string>
-  <string name="qm_button_full_conversation">Celá konverzace</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Zde napište odpověď</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Odesílání zprávy\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Rychlá odpověď</string>
-  <string name="send">Odeslat</string>
-  <string name="compose_message_hint_text">Zadejte zprávu</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Zobrazení smajlíků</string>
-  <string name="show_emoticons_pref_summary">Zobrazit na klávesnici klávesu pro zobrazení smajlíků</string>
-  <string name="select_phone_account_title">Odeslat pomocí</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Spravovat zprávy na kartě SIM</string>
-  <string name="pref_title_manage_sim_messages_slot1">Spravovat zprávy SIM 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Spravovat zprávy SIM 2</string>
-  <string name="copy_to_sim">Kopírovat zprávu na SIM kartu</string>
-  <string name="copy_to_sim_success">Uloženo zpráv na SIM kartu: <xliff:g id="count">%1$d</xliff:g> z <xliff:g id="total">%2$d</xliff:g>.</string>
-  <string name="copy_to_sim_fail">Zprávu nelze uložit</string>
-  <string name="copy_to_phone_success">Zpráva uložena</string>
-  <string name="copy_to_phone_fail">Zprávu nelze uložit</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">Žádné zprávy na SIM kartě.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Poslat 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">Volat <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">Přidat <xliff:g id="contactEmailOrNumber">%s</xliff:g> do kontaktů</string>
-  <string name="sim_capacity_title">Kapacita SIM karty</string>
-  <string name="sim_capacity">Využívá se <xliff:g id="used">%1$d</xliff:g> z <xliff:g id="total">%2$d</xliff:g> položek SIM karty</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Smazat?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Textové zprávy na SIM kartě</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Obnovení\u2026</string>
-  <string name="confirm_delete_selected_messages">Vybrané zprávy budou odstraněny.</string>
-  <!-- Delete button title -->
-  <string name="delete">Smazat</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Vpřed</string>
-  <string name="menu_reply">Odpovědět</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írovat do paměti 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írovat do paměti telefonu</string>
-  <string name="selected_all">Vybrat vše</string>
-  <string name="deselected_all">Zrušit výběr všech</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írovat zprávu na SIM kartu</string>
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Vybrat obrázky nebo videa z tohoto zařízení</string>
-  <string name="mediapicker_audioListChooserDescription">Vybrat audio soubory z tohoto zařízení</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Nelze připojit video. Překročena maximální velikost zprávy.</string>
-  <string name="mediapicker_audio_list_title">Zvolte audio</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Zvuk je vybrán.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Nevybrán žádný zvuk.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> vybrán</string>
+    <string name="report_as_spam_to">Označit jako spam %s</string>
+    <string name="unicode_stripping_pref_title">Odstranit znaky Unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Ponechat původní znaky</string>
+    <string name="pref_unicode_stripping_non_encodable">Oříznout nekódovatelné znaky</string>
+    <string name="pref_unicode_stripping_all">Oříznout všechny znaky unicode</string>
+    <string name="validity_period_pref_title">Doba platnosti</string>
+    <string name="validity_period_slot1_pref_title">Doba platnosti pro SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Doba platnosti pro SIM 2</string>
+    <string name="sms_validity_period_not_set">Nenastaveno</string>
+    <string name="sms_validity_period_one_hour">1 hodina</string>
+    <string name="sms_validity_period_six_hours">6 hodin</string>
+    <string name="sms_validity_period_twelve_hours">12 hodin</string>
+    <string name="sms_validity_period_one_day">1 den</string>
+    <string name="mms_validity_period_two_days">2 dny</string>
+    <string name="mms_validity_period_one_week">1 týden</string>
+    <string name="validity_period_maximum">Maximální</string>
+    <string name="pref_summary_mms_delivery_reports">Pro každou zprávu vyžádat doručenku</string>
+    <string name="pref_summary_mms_read_reports">Pro každou zprávu vyžádat potvrzení o přečtení</string>
+    <string name="delivery_reports_mms_pref_title">Doručenky</string>
+    <string name="read_reports_mms_pref_title">Potvrzení o přečtení</string>
+    <string name="status_label">Stav:\u0020</string>
+    <string name="status_read">Přečteno</string>
+    <string name="priority_pref_title">Priorita odeslání</string>
+    <string name="priority_low">Nízká</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">Vysoká</string>
+    <string name="sms_storage_pref_title">Úložiště</string>
+    <string name="pref_summary_auto_delete">Odstranit staré zprávy při dosažení limitů</string>
+    <string name="auto_delete_pref_title">Odstranit staré zprávy</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> zpráv v konverzaci</string>
+    <string name="sms_delete_pref_title">Limit textových zpráv</string>
+    <string name="mms_delete_pref_title">Limit multimediálních zpráv</string>
+    <string name="set">Nastavit</string>
+    <string name="no">Zrušit</string>
+    <string name="pref_messages_to_save">Nastavit počet uložených zpráv</string>
+    <string name="swipe_to_delete_conversation_pref_title">Odsunutím smazat</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Odsunutím vpravo smazat konverzaci</string>
+    <string name="pref_quickmessage">Rychlá zpráva a odpověď</string>
+    <string name="pref_quickmessage_title">Zobrazit rychlé zprávy</string>
+    <string name="pref_quickmessage_summary">Automaticky otevřít rychlou zprávu pro příchozí SMS zprávy</string>
+    <string name="pref_close_all_title">Zavřít vše</string>
+    <string name="pref_close_all_summary">Tlačítko \u201aZavřít\u2018 zavře všechny zprávy</string>
+    <string name="message_counter">%1$d z %2$d</string>
+    <string name="button_close">Zavřít</string>
+    <string name="button_view">Zobrazit</string>
+    <string name="button_templates">Šablony</string>
+    <string name="qm_button_full_conversation">Celá konverzace</string>
+    <string name="type_to_reply_text_enter_to_send">Zde napište odpověď</string>
+    <string name="toast_sending_message">Odesílání zprávy\u2026</string>
+    <string name="qm_quick_reply">Rychlá odpověď</string>
+    <string name="send">Odeslat</string>
+    <string name="compose_message_hint_text">Zadejte zprávu</string>
+    <string name="show_emoticons_pref_title">Zobrazení smajlíků</string>
+    <string name="show_emoticons_pref_summary">Zobrazit na klávesnici klávesu pro zobrazení smajlíků</string>
+    <string name="select_phone_account_title">Odeslat pomocí</string>
+    <string name="pref_title_manage_sim_messages">Spravovat zprávy na kartě SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Spravovat zprávy SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Spravovat zprávy SIM 2</string>
+    <string name="copy_to_sim">Kopírovat zprávu na SIM kartu</string>
+    <string name="copy_to_sim_success">Uloženo zpráv na SIM kartu: <xliff:g id="count">%1$d</xliff:g> z <xliff:g id="total">%2$d</xliff:g>.</string>
+    <string name="copy_to_sim_fail">Zprávu nelze uložit</string>
+    <string name="copy_to_phone_success">Zpráva uložena</string>
+    <string name="copy_to_phone_fail">Zprávu nelze uložit</string>
+    <string name="sim_empty">Žádné zprávy na SIM kartě.</string>
+    <string name="menu_send_email">Poslat e-mail na <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Volat <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Přidat <xliff:g id="contactEmailOrNumber">%s</xliff:g> do kontaktů</string>
+    <string name="sim_capacity_title">Kapacita SIM karty</string>
+    <string name="sim_capacity">Využívá se <xliff:g id="used">%1$d</xliff:g> z <xliff:g id="total">%2$d</xliff:g> položek SIM karty</string>
+    <string name="confirm_dialog_title">Smazat?</string>
+    <string name="sim_manage_messages_title">Textové zprávy na SIM kartě</string>
+    <string name="refreshing">Obnovení\u2026</string>
+    <string name="confirm_delete_selected_messages">Vybrané zprávy budou odstraněny.</string>
+    <string name="delete">Smazat</string>
+    <string name="menu_forward">Vpřed</string>
+    <string name="menu_reply">Odpovědět</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Kopírovat do paměti tabletu</string>
+    <string name="sim_copy_to_phone_memory" product="default">Kopírovat do paměti telefonu</string>
+    <string name="selected_all">Vybrat vše</string>
+    <string name="deselected_all">Zrušit výběr všech</string>
+    <string name="selected_count">Počet vybraných: <xliff:g id="COUNT">%d</xliff:g></string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Kopírovat zprávu na SIM kartu</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Vybrat obrázky nebo videa z tohoto zařízení</string>
+    <string name="mediapicker_audioListChooserDescription">Vybrat audio soubory z tohoto zařízení</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Nelze připojit video. Překročena maximální velikost zprávy.</string>
+    <string name="mediapicker_audio_list_title">Zvolte audio</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Zvuk je vybrán.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Nevybrán žádný zvuk.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> vybrán</string>
 </resources>
diff --git a/res/values-cy/arrays.xml b/res/values-cy/arrays.xml
index f2be096..1b3733d 100644
--- a/res/values-cy/arrays.xml
+++ b/res/values-cy/arrays.xml
@@ -16,10 +16,21 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String to match as no subject and filter out as a subject. For example, if the
-         subject string is "no subject", we won't display that. We'll pretend
-         no subject string was delivered. -->
-  <!-- Choices for quick-reply to message notification. Users with an Android
-    Wear device (e.g. smartwatch) can reply to messages either by speaking their
-    response, or choosing one of these predefined options. -->
+    <string-array name="empty_subject_strings">
+        <item>dim pwnc</item>
+        <item>dimpwnc</item>
+    </string-array>
+    <string-array name="notification_reply_choices">
+        <item>Ie</item>
+        <item>Na</item>
+        <item>Iawn</item>
+        <item>Haha</item>
+        <item>Diolch</item>
+        <item>Cytuno</item>
+        <item>Da iawn</item>
+        <item>Dw i ar y ffordd</item>
+        <item>Iawn. Ddo\'i nôl atat ti\'n hwyrach.</item>
+        <item>:)</item>
+        <item>:(</item>
+    </string-array>
 </resources>
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index d7cf535..80d5e40 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -16,35 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">Adrodd fel sbam i %s</string>
+    <string name="unicode_stripping_pref_title">Stripio unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Cadw nodau yn gyflawn</string>
+    <string name="pref_unicode_stripping_non_encodable">Stripio nodau na fedrir eu hamgodio</string>
+    <string name="pref_unicode_stripping_all">Stripio holl nodau unicode</string>
+    <string name="validity_period_pref_title">Cyfnod dilysrwydd</string>
+    <string name="validity_period_slot1_pref_title">Cyfnod dilysrwydd ar gyfer SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Cyfnod dilysrwydd ar gyfer SIM 2</string>
+    <string name="sms_validity_period_not_set">Heb ei osod</string>
+    <string name="sms_validity_period_one_hour">1 awr</string>
+    <string name="sms_validity_period_six_hours">6 awr</string>
+    <string name="sms_validity_period_twelve_hours">12 awr</string>
+    <string name="sms_validity_period_one_day">1 diwrnod</string>
+    <string name="mms_validity_period_two_days">2 ddiwrnod</string>
+    <string name="mms_validity_period_one_week">1 wythnos</string>
+    <string name="validity_period_maximum">Hiraf</string>
+    <string name="pref_summary_mms_delivery_reports">Gofyn am adroddiad ar gyfer pob neges wyt ti\'n ei anfon i gadarnhau ei bod wedi cyrraedd</string>
+    <string name="pref_summary_mms_read_reports">Gofyn am adroddiad ar gyfer pob neges wyt ti\'n ei anfon i gadarnhau ei bod wedi\'i darllen</string>
+    <string name="delivery_reports_mms_pref_title">Adroddiadau cyrraedd</string>
+    <string name="read_reports_mms_pref_title">Darllen adroddiadau</string>
+    <string name="status_label">Statws:\u0020</string>
+    <string name="status_read">Darllen</string>
+    <string name="priority_pref_title">Blaenoriaeth anfon</string>
+    <string name="priority_low">Isel</string>
+    <string name="priority_normal">Arferol</string>
+    <string name="priority_high">Uchel</string>
+    <string name="sms_storage_pref_title">Storfa</string>
+    <string name="pref_summary_auto_delete">Dileu hen negeseuon wrth gyrraedd terfynau</string>
+    <string name="auto_delete_pref_title">Dileu hen negeseuon</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> neges y sgwrs</string>
+    <string name="sms_delete_pref_title">Cyfyngiad negeseuon testun</string>
+    <string name="mms_delete_pref_title">Cyfyngiad negeseuon amlgyfrwng</string>
+    <string name="set">Gosod</string>
+    <string name="no">Diddymu</string>
+    <string name="pref_messages_to_save">Gosoda\'r nifer o negeseuon i\'w cadw</string>
+    <string name="swipe_to_delete_conversation_pref_title">Llusgo i ddileu</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Llusgo sgwrs i\'r dde yn ei dileu</string>
+    <string name="pref_quickmessage">NegesCyflym ac Ateb</string>
+    <string name="pref_quickmessage_title">Dangos NegesCyflym</string>
+    <string name="pref_quickmessage_summary">Dangos y dewis NegesCyflym yn awtomatig wrth dderbyn pob neges SMS</string>
+    <string name="pref_close_all_title">Cau\'r cwbl</string>
+    <string name="pref_close_all_summary">Botwm cau yn cau pob neges</string>
+    <string name="message_counter">%1$d o %2$d</string>
+    <string name="button_close">Cau</string>
+    <string name="button_view">Gweld</string>
+    <string name="button_templates">Templedi</string>
+    <string name="qm_button_full_conversation">Sgwrs llawn</string>
+    <string name="type_to_reply_text_enter_to_send">Teipia i ateb</string>
+    <string name="toast_sending_message">Yn anfon neges\u2026</string>
+    <string name="qm_quick_reply">Ateb cyflym</string>
+    <string name="send">Anfon</string>
+    <string name="compose_message_hint_text">Rho neges</string>
+    <string name="show_emoticons_pref_title">Mynediad at wenogluniau</string>
+    <string name="show_emoticons_pref_summary">Dangos y fysell gwenogluniau ar y bysellfwrdd</string>
+    <string name="select_phone_account_title">Anfon gyda</string>
+    <string name="pref_title_manage_sim_messages">Rheoli negeseuon y cerdyn SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Rheoli negeseuon SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Rheoli negeseuon SIM 2</string>
+    <string name="copy_to_sim">Copïo’r neges i gerdyn SIM</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> o <xliff:g id="total">%2$d</xliff:g> neges wedi\'u cadw i\'r cerdyn SIM.</string>
+    <string name="copy_to_sim_fail">Methu â chadw\'r neges</string>
+    <string name="copy_to_phone_success">Cadwyd y neges</string>
+    <string name="copy_to_phone_fail">Methu â chadw\'r neges</string>
+    <string name="sim_empty">Does dim negeseuon ar y cerdyn SIM.</string>
+    <string name="menu_send_email">Anfon e-bost at <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Galw <xliff:g id="name">%s </xliff:g></string>
+    <string name="menu_add_address_to_contacts">Ychwanegu <xliff:g id="contactEmailOrNumber">%s</xliff:g> at Bobol</string>
+    <string name="sim_capacity_title">Capasiti\'r SIM</string>
+    <string name="sim_capacity">Mae <xliff:g id="used">%1$d</xliff:g> o <xliff:g id="total">%2$d</xliff:g> cofnod SIM wedi eu defnyddio</string>
+    <string name="confirm_dialog_title">Dileu?</string>
+    <string name="sim_manage_messages_title">Negeseuon destun ar gerdyn SIM</string>
+    <string name="refreshing">Yn ail-lwytho\u2026</string>
+    <string name="confirm_delete_selected_messages">Caiff y neges a ddewiswyd ei dileu.</string>
+    <string name="delete">Dileu</string>
+    <string name="menu_forward">Ymlaen</string>
+    <string name="menu_reply">Ateb</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Copïo i gof y llechen</string>
+    <string name="sim_copy_to_phone_memory" product="default">Copïo i gof y ffôn</string>
+    <string name="selected_all">Dewis y cwbl</string>
+    <string name="deselected_all">Dewis dim</string>
+    <string name="selected_count">Dewiswyd <xliff:g id="COUNT">%d</xliff:g></string>
+    <string name="yes">Iawn</string>
+    <string name="operation_to_card_memory">Copïo’r neges i gerdyn SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Dewis delweddau neu fideos o\'r ddyfais hon</string>
+    <string name="mediapicker_audioListChooserDescription">Dewis ffeiliau sain o\'r ddyfais hon</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Methu ag atodi\'r fideo oherwydd cyfyngiad maint negeseuon.</string>
+    <string name="mediapicker_audio_list_title">Dewis sain</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Mae\'r sain wedi\'i dewis.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Dyw\'r sain heb ei dewis.</string>
+    <string name="mediapicker_audio_list_title_selection">Dewiswyd <xliff:g id="count">%d</xliff:g></string>
 </resources>
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index d73a67e..fe104c4 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -16,335 +16,606 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- The name of the application as it appears under the main Launcher icon and in various activity titles -->
-  <!-- The name of the application as it appears in external share intent dialogs -->
-  <!-- The title when selecting a conversation to share to -->
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <!-- The tab header for the frequently used contacts list -->
-  <!-- The tab header for all contacts list -->
-  <!-- The text on the list item in the contact picker that allows a user to send an SMS directly
-         to a number that he/she typed. eg. "Send to 650-555-1234" -->
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <!-- Abbreviated message to express that something occurred some number of hours in the past (e.g., 5 hours ago). -->
-  <!-- Abbreviated message to express that something occurred some number of days in the past (e.g., 5 days ago). -->
-  <!--
-        Plurals used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <!-- Title of the class-0 message activity. -->
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <!-- Title for SMS storage low notification and dialog. Must match the framework's notification title, i.e. //frameworks/base/core/res/res/values/strings.xml#low_internal_storage_view_title -->
-  <!-- Text for SMS storage low notification and dialog -->
-  <!-- Ticker for SMS storage low notification -->
-  <!-- Title for asking the user to enter their phone number -->
-  <!-- Text for asking the user to enter their phone number -->
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <!-- Free SMS storage actions -->
-  <!-- Free SMS storage action confirm dialog message -->
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <!-- While sending a message display this message. -->
-  <!-- When sending a message failed display this message. -->
-  <!-- When retrying sending for a message. -->
-  <!-- When showing resend action display this message. -->
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <!-- When showing resend action, display this message. -->
-  <!-- Title line for an MMS requiring manual download. -->
-  <!-- Title line for an MMS auto-downloading. -->
-  <!-- Title line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which is selected. -->
-  <!-- Timestamp line to display while downloading a message. -->
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <!-- Display this info line with an MMS notification -->
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for download failed -->
-  <!-- notification line 1 for multiple downloads failed -->
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <!-- Notification content when emergency SMS fails to send -->
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <!-- Content description text for Back button on the action bar -->
-  <!-- Action menu title for showing archived conversations -->
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <!-- An enumeration comma for separating multiple names in notifications. [CHAR LIMIT=2] -->
-  <!-- Separator between parts of a notification in each line of an inboxStyle notification. [CHAR LIMIT=2] -->
-  <!-- Separator between title and content in notification ticker -->
-  <!-- Separator between title and content in notifications -->
-  <!-- Shown in notifications when there's a picture. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <!-- Shown in the Android Wear conversation log as the sender for outgoing messages,
-         when we don't know the user's real name (e.g. no "Me" contact on the phone). -->
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <!-- Accessibility announcement for an incoming message -->
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <!-- Accessibility description for conversation list for group conversations -->
-  <!-- Accessibility description for conversation list for failed messages -->
-  <!-- Accessibility name for a group conversation -->
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <!-- Title for the preferences/settings activity -->
-  <!-- Title for the archived conversations activity -->
-  <!-- Action title: Close -->
-  <!-- Preference category: MMS messaging -->
-  <!-- Preference category: Advanced -->
-  <!-- Preference category: Debug -->
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <!-- Title for the notification sound preference -->
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <!-- Preference summary: Current default SMS app -->
-  <!-- Preference title: MMS phone number -->
-  <!-- Display text for phone number preference when the number is unknown -->
-  <!-- Title for the preference for playing a message send sound -->
-  <!-- Strings for dump sms/mms dialog -->
-  <!-- Title of long press menu on an individual message. -->
-  <!-- Menu item to copy message text -->
-  <!-- Title of long press menu for details about an individual message. -->
-  <!-- Title of long press menu for deleting an individual message. -->
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <!-- Title of "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <!-- Sender to be used if the sender address has been hidden -->
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <!-- Notifies the user when an attachment fails to load -->
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <!-- Title for the "People and Options" activity -->
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <!-- Title for the phone call button in the action bar that lets the user call a participant in an SMS conversation -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <!-- The hint text shown in the message compose input box when photo(s) is attached -->
-  <!-- The hint text shown in the message compose input box when audio recording(s) is attached -->
-  <!-- The hint text shown in the message compose input box when video(s) is attached -->
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <!-- Announcement after the user adds or removes an attachment -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <!-- The format of the subtitle of the help activity. -->
-  <!--  Action menu title to let users view open source license -->
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <!-- Reached MMS message attachment limit -->
-  <!-- Message attachment load failed -->
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- When there's a subject in an mms, the subject + message are shown in a notification -->
-  <!-- Text shown on contact VCard when it's being loaded -->
-  <!-- Text shown on contact VCard when it failed to load -->
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <!-- Title for the activity that shows details of VCards -->
-  <!-- VCard label for displaying birthdays -->
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <!-- Title for the message forwarding dialog -->
-  <!-- Title for the message reply dialog -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <!-- Dialog button text that closes the application. -->
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <!-- A message in conversation list view to indicate that the snipit text and preview is from an unsent draft. -->
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <!-- Indicates that the current message will be sent via MMS -->
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <!-- Title of block confirmation dialog -->
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <!-- The title of the list of blocked contacts -->
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <!-- Accessibility toast shown when a message is sending. -->
-  <!-- Accessibility toast shown when a message is sent. -->
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <!-- Accessibility : content description for numbers -->
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <!-- Text prepended to the subject of a forwarded message -->
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <!-- The notification toast text and action button label shown at bottom of screen, for when a new message comes in while the user
-         is in that conversation, but the message list is not scrolled to the bottom -->
-  <!-- Content description for the message images in a conversation or for the image preview in the conversation list if the lastest message in that conversation contains an image-->
-  <!-- Text for a toast message notifying the user that we can't find an appropriate application to handle their request -->
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Screen title after user selects APNs setting option -->
-  <!-- Edit access point label summary text when no value has been set -->
-  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
-  <!-- Edit access point labels: The actual access point name-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The type of APN -->
-  <!-- Edit access point screen menu option to delete this APN -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <!-- APNs screen menu option to reset default APN settings -->
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <!-- Title for Access Point Names settings -->
-  <!-- Title for Access Point Names settings activity -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <!-- The title for general settings section in the settings activity  -->
-  <!-- The title for advanced settings section in the settings activity  -->
-  <!-- The title for general settings activity  -->
-  <!-- The title for advanced settings activity  -->
-  <!-- The title for sim_specific settings  -->
-  <!-- The group MMS choices in settings -->
-  <!-- SIM number shown in the settings when the number is not known -->
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <!-- Content description for the SIM selector button in the conversation -->
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <!-- Content description for the audio record view -->
-  <!-- Content description for new conversation button in desktop widget -->
-  <!-- Content description for widget title -->
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <!-- Content description for new message button in desktop widget -->
-  <!-- Content description for conversation list button in desktop widget -->
-  <!-- Shown when loading conversations in the widget -->
-  <!-- Shown when loading messages in the widget -->
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <!-- Toast message telling the user that someone was blocked -->
-  <!-- Toast message telling the user that someone was unblocked -->
-  <!-- Title for attachment chooser activity -->
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message load failed -->
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <!-- When converting html to text link urls are inlined.  This specifies how the link should be
-    displayed.  For example, a link "click here" which navigates to "www.google.com" would have
-    text="click here" and url="www.google.com", using the below format to create "click here (www.google.com)" -->
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
+    <string name="app_name">Negesu</string>
+    <string name="share_intent_label">Negesu</string>
+    <string name="share_intent_activity_label">Dewis sgwrs</string>
+    <string name="action_settings">Gosodiadau</string>
+    <string name="sendButtonContentDescription">Anfon Neges</string>
+    <string name="attachMediaButtonContentDescription">Ychwanegu atodiad</string>
+    <string name="help_and_feedback_activity_label">Cymorth</string>
+    <string name="welcome">Croeso</string>
+    <string name="skip">Neidio</string>
+    <string name="next_with_arrow">Nesaf &gt;</string>
+    <string name="next">Nesaf</string>
+    <string name="exit">Cau</string>
+    <string name="settings_with_arrow">Gosodiadau &gt;</string>
+    <string name="settings">Gosodiadau</string>
+    <string name="required_permissions_promo">Mae ar Negesu angen caniatâd SMS, Ffôn a Cysylltiadau.</string>
+    <string name="enable_permission_procedure">Mae\'n bosib newid caniatâd yn Gosodiadau &gt; Apiau &gt; Negesu &gt; Caniatâd.</string>
+    <string name="enable_permission_procedure_description">Mae\'n bosib newid caniatâd yn Gosodiadau, Apiau, Negesu, Caniatâd.</string>
+    <string name="contact_picker_frequents_tab_title">Cysylltir yn aml</string>
+    <string name="contact_picker_all_contacts_tab_title">Pob cyswllt</string>
+    <string name="contact_list_send_to_text">Anfon at <xliff:g id="destination">%s</xliff:g></string>
+    <string name="mediapicker_cameraChooserDescription">Cipio lluniau neu fideo</string>
+    <string name="mediapicker_galleryChooserDescription">Dewisa ddelweddau neu fideos o\'r ddyfais hon</string>
+    <string name="mediapicker_audioChooserDescription">Recordio sain</string>
+    <string name="mediapicker_gallery_title">Dewis llun</string>
+    <string name="mediapicker_gallery_item_selected_content_description">Dewiswyd y cyfrwng.</string>
+    <string name="mediapicker_gallery_item_unselected_content_description">Dad-ddewiswyd y cyfrwng.</string>
+    <string name="mediapicker_gallery_title_selection"><xliff:g id="count">%d</xliff:g> wedi\'u dewis</string>
+    <string name="mediapicker_gallery_image_item_description">delwedd <xliff:g id="date">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g></string>
+    <string name="mediapicker_gallery_image_item_description_no_date">delwedd</string>
+    <string name="mediapicker_audio_title">Recordio sain</string>
+    <string name="action_share">Rhannu</string>
+    <string name="posted_just_now">"Jyst nawr"</string>
+    <string name="posted_now">"Nawr"</string>
+    <plurals name="num_minutes_ago">
+        <item quantity="zero"><xliff:g id="count">%d</xliff:g> mun</item>
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> mun</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> fun</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> mun</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> mun</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> mun</item>
+    </plurals>
+    <plurals name="num_hours_ago">
+        <item quantity="zero"><xliff:g id="count">%d</xliff:g> oriau</item>
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> awr</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> awr</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> awr</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> awr</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> awr</item>
+    </plurals>
+    <plurals name="num_days_ago">
+        <item quantity="zero"><xliff:g id="count">%d</xliff:g> diwrnodau</item>
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> diwrnod</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> ddiwrnod</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> diwrnod</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> diwrnod</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> diwrnod</item>
+    </plurals>
+    <plurals name="week_count">
+        <item quantity="zero"><xliff:g id="count">%d</xliff:g> wythnosau</item>
+        <item quantity="one">wythnos</item>
+        <item quantity="two">pythefnos</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> wythnos</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> wythnos</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> wythnos</item>
+    </plurals>
+    <plurals name="month_count">
+        <item quantity="zero"><xliff:g id="count">%d</xliff:g> misoedd</item>
+        <item quantity="one">mis</item>
+        <item quantity="two">deufis</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> mis</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> mis</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> mis</item>
+    </plurals>
+    <plurals name="year_count">
+        <item quantity="zero"><xliff:g id="count">%d</xliff:g> blynyddoedd</item>
+        <item quantity="one">blwyddyn</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> flwyddyn</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> blwyddyn</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> blwyddyn</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> blwyddyn</item>
+    </plurals>
+    <string name="class_0_message_activity">Neges dosbarth 0</string>
+    <string name="save">Cadw</string>
+    <string name="sms_storage_low_auto_delete_enabled_dialog_text">Does dim llawer o le yn weddill ar y ddyfais. Bydd negeseuon hyn yn cael eu dileu yn awtomatig i ryddhau lle.</string>
+    <string name="sms_storage_low_title">Yn rhedeg yn brin o le storio</string>
+    <string name="sms_storage_low_text">Mae\'n bosib na fydd Negesu yn anfon na derbyn negeseuon hyd nes bod mwy o le ar gael ar dy ddyfais.</string>
+    <string name="sms_storage_low_notification_ticker">Nid oes lawer o le i storio SMS. Mae\'n bosib bydd rhaid dileu negeseuon.</string>
+    <string name="enter_phone_number_title">Cadarnha dy rif ffôn</string>
+    <string name="enter_phone_number_text">Bydd y cam un tro yma yn sicrhau bod Negesu yn anfon dy negeseuon grwpiau yn gywir.</string>
+    <string name="enter_phone_number_hint">Rhif ffôn</string>
+    <string name="delete_all_media">Dileu pob neges sydd â chyfrwng</string>
+    <string name="delete_oldest_messages">Dileu negeseuon sy\'n hyn na <xliff:g id="duration">%s</xliff:g></string>
+    <string name="auto_delete_oldest_messages">Awto-dileu negeseuon sy\'n hyn na <xliff:g id="duration">%s</xliff:g></string>
+    <string name="ignore">Anwybyddu</string>
+    <string name="delete_all_media_confirmation">Dileu pob neges gyda chyfrwng?</string>
+    <string name="delete_oldest_messages_confirmation">Dileu negeseuon sy\'n hyn na <xliff:g id="duration">%s</xliff:g>?</string>
+    <string name="auto_delete_oldest_messages_confirmation">Dileu negeseuon yn hyn na <xliff:g id="duration">%s</xliff:g> a rhoi awto-dileu ar waith?</string>
+    <string name="incoming_text_sender_content_description">Dywedodd <xliff:g id="sender">%s</xliff:g></string>
+    <string name="outgoing_text_sender_content_description">Dywedaist</string>
+    <string name="incoming_sender_content_description">Neges oddi wrth <xliff:g id="sender">%s</xliff:g></string>
+    <string name="outgoing_sender_content_description">Anfonaist neges</string>
+    <string name="message_status_sending">Yn anfon…</string>
+    <string name="message_status_send_failed">Heb ei anfon. Cyffyrdda i geisio eto.</string>
+    <string name="message_status_send_retrying">Heb ei anfon. Yn ceisio eto…</string>
+    <string name="message_status_resend">Ail-anfon neu ddileu</string>
+    <string name="message_status_send_failed_emergency_number">Gwna alwad llais i\'r gwasanaethau brys. Dyw dy neges destun heb ei anfon ar hyn o bryd.</string>
+    <string name="message_status_failed">Wedi methu</string>
+    <string name="message_title_manual_download">Neges MMS newydd i\'w lawrlwytho</string>
+    <string name="message_title_downloading">Neges MMS newydd</string>
+    <string name="message_title_download_failed">Methwyd â lawrlwytho</string>
+    <string name="message_status_download_failed">Cyffyrdda i geisio eto</string>
+    <string name="message_status_download">Cyffwrdd i lawrlwytho</string>
+    <string name="message_status_download_action">Lawrlwytho neu ddileu</string>
+    <string name="message_status_downloading">Yn lawrlwytho…</string>
+    <string name="message_status_download_error">Neges wedi dod i ben neu ddim ar gael</string>
+    <string name="mms_info">maint: <xliff:g id="messageSize">%1$s</xliff:g>, dod i ben: <xliff:g id="messageExpire">%2$s</xliff:g></string>
+    <string name="invalid_destination">Methu ag anfon. Derbynnydd annilys.</string>
+    <string name="service_not_activated">Gwasanaeth heb ei actifadu ar y rhwydwaith</string>
+    <string name="service_network_problem">Methwyd ag anfon o achos problem rhwydwaith</string>
+    <string name="service_message_not_found">Neges wedi dod i ben neu ddim ar gael</string>
+    <string name="no_subject">(Dim pwnc)</string>
+    <string name="unknown_sender">Anfonwr anhysbys</string>
+    <string name="delivered_status_content_description">Wedi\'i derbyn</string>
+    <string name="dl_failure_notification">Methwyd â lawrlwytho\'r neges <xliff:g id="subject">%1$s</xliff:g> oddi wrth <xliff:g id="from">%2$s</xliff:g>.</string>
+    <string name="low_memory">Methwyd â chwblhau weithred y gronfa ddata gan nad oed digon o gof</string>
+    <string name="notification_send_failures_line1_singular">Neges heb ei anfon</string>
+    <string name="notification_send_failures_line1_plural">Dyw rhai negeseuon heb eu hanfon yn Negeseua</string>
+    <plurals name="notification_send_failures">
+        <item quantity="zero"><xliff:g id="messages">%d</xliff:g> neges mewn <xliff:g id="conversations">%d</xliff:g> sgwrs</item>
+        <item quantity="one"><xliff:g id="messages">%d</xliff:g> neges mewn un sgwrs</item>
+        <item quantity="two"><xliff:g id="messages">%d</xliff:g> neges mewn <xliff:g id="conversations">%d</xliff:g> sgwrs</item>
+        <item quantity="few"><xliff:g id="messages">%d</xliff:g> neges mewn <xliff:g id="conversations">%d</xliff:g> sgwrs</item>
+        <item quantity="many"><xliff:g id="messages">%d</xliff:g> neges mewn <xliff:g id="conversations">%d</xliff:g> sgwrs</item>
+        <item quantity="other"><xliff:g id="messages">%d</xliff:g> neges mewn <xliff:g id="conversations">%d</xliff:g> sgwrs</item>
+    </plurals>
+    <string name="notification_download_failures_line1_singular">Neges heb ei lawrlwytho</string>
+    <string name="notification_download_failures_line1_plural">Rhai negeseuon heb lawrlwytho yn Negesu</string>
+    <plurals name="notification_download_failures">
+        <item quantity="zero"><xliff:g id="messages">%d</xliff:g> neges mewn <xliff:g id="conversations">%d</xliff:g> sgyrsiau</item>
+        <item quantity="one"><xliff:g id="messages">%d</xliff:g> neges mewn un sgwrs</item>
+        <item quantity="two"><xliff:g id="messages">%d</xliff:g> neges mewn <xliff:g id="conversations">%d</xliff:g> sgwrs</item>
+        <item quantity="few"><xliff:g id="messages">%d</xliff:g> neges mewn <xliff:g id="conversations">%d</xliff:g> sgwrs</item>
+        <item quantity="many"><xliff:g id="messages">%d</xliff:g> neges mewn <xliff:g id="conversations">%d</xliff:g> sgwrs</item>
+        <item quantity="other"><xliff:g id="messages">%d</xliff:g> neges mewn <xliff:g id="conversations">%d</xliff:g> sgwrs</item>
+    </plurals>
+    <string name="notification_emergency_send_failure_line1">Neges at <xliff:g id="number">%1$s</xliff:g> heb ei anfon</string>
+    <string name="notification_emergency_send_failure_line2">Gwna alwad llais i\'r gwasanaethau brys. Dyw dy neges destun at <xliff:g id="number">%1$s</xliff:g> heb ei anfon ar hyn o bryd.    </string>
+    <plurals name="notification_new_messages">
+        <item quantity="zero"><xliff:g id="messages">%d</xliff:g> negeseuon newydd</item>
+        <item quantity="one">Neges newydd</item>
+        <item quantity="two"><xliff:g id="messages">%d</xliff:g> neges newydd</item>
+        <item quantity="few"><xliff:g id="messages">%d</xliff:g> neges newydd</item>
+        <item quantity="many"><xliff:g id="messages">%d</xliff:g> neges newydd</item>
+        <item quantity="other"><xliff:g id="messages">%d</xliff:g> neges newydd</item>
+    </plurals>
+    <string name="start_conversation">Dechrau</string>
+    <string name="camera_error_opening">Camera ddim ar gael</string>
+    <string name="camera_error_unknown">Camera ddim ar gael</string>
+    <string name="camera_error_video_init_fail">Cipio fideo dim ar gael</string>
+    <string name="camera_error_storage_fail">Methu â chadw\'r cyfrwng</string>
+    <string name="camera_error_failure_taking_picture">Methu â chymryd llun</string>
+    <string name="back">Nôl</string>
+    <string name="action_menu_show_archived">Wedi\'u harchifo</string>
+    <string name="action_delete">Dileu</string>
+    <string name="action_archive">Archifo</string>
+    <string name="action_unarchive">Tynnu o\'r archif</string>
+    <string name="action_notification_off">Troi hysbysiadau i ffwrdd</string>
+    <string name="action_notification_on">Troi hysbysiadau ymlaen</string>
+    <string name="action_add_contact">Ychwanegu cyswllt</string>
+    <string name="action_download">Lawrlwytho</string>
+    <string name="action_send">Anfon</string>
+    <string name="action_delete_message">Dileu</string>
+    <string name="delete_message_confirmation_dialog_title">Dileu\'r neges hon?</string>
+    <string name="delete_message_confirmation_dialog_text">Nid yw\'n bosib dadwneud y weithred hon.</string>
+    <string name="delete_message_confirmation_button">Dileu</string>
+    <plurals name="delete_conversations_confirmation_dialog_title">
+        <item quantity="zero">Dileu\'r sgyrsiau hyn?</item>
+        <item quantity="one">Dileu\'r sgwrs hon?</item>
+        <item quantity="two">Dileu\'r sgyrsiau hyn?</item>
+        <item quantity="few">Dileu\'r sgyrsiau hyn?</item>
+        <item quantity="many">Dileu\'r sgyrsiau hyn?</item>
+        <item quantity="other">Dileu\'r sgyrsiau hyn?</item>
+    </plurals>
+    <string name="delete_conversation_confirmation_button">Dileu</string>
+    <string name="delete_conversation_decline_button">Diddymu</string>
+    <string name="recipient_hint">At</string>
+    <string name="action_multiselect">Dewis mwy nag un ddelwedd</string>
+    <string name="action_confirm_multiselect">Cadarnhau\'r dewis</string>
+    <string name="attachment_more_items">+<xliff:g id="count">%d</xliff:g></string>
+    <string name="audio_recording_start_failed">Methu â recordio sain. Ceisia eto.</string>
+    <string name="audio_recording_replay_failed">Methu â chwarae sain. Ceisia eto.</string>
+    <string name="audio_recording_error">Methwyd â chadw sain. Ceisia eto.</string>
+    <string name="audio_picker_hint_text">Cyffwrdd a dal</string>
+    <string name="enumeration_comma">,\u0020</string>
+    <string name="notification_separator">\u0020\u0020</string>
+    <string name="notification_ticker_separator">:\u0020</string>
+    <string name="notification_space_separator">\u0020\u0020</string>
+    <string name="notification_picture">Llun</string>
+    <string name="notification_audio">Clip sain</string>
+    <string name="notification_video">Fideo</string>
+    <string name="notification_vcard">Cerdyn cyswllt</string>
+    <string name="notification_download_mms">Lawrlwytho</string>
+    <string name="notification_reply_via_sms">Ateb trwy SMS</string>
+    <string name="notification_reply_via_mms">Ateb trwy MMS</string>
+    <string name="notification_reply_prompt">Ateb</string>
+    <plurals name="wearable_participant_count">
+        <item quantity="zero"><xliff:g id="count">%d</xliff:g> cyfranogwyr</item>
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> cyfranogwr</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> gyfranogwr</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> chyfranogwr</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> chyfranogwr</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> cyfranogwr</item>
+    </plurals>
+    <string name="unknown_self_participant">Fi</string>
+    <string name="blocked_toast_message">Cyswllt wedi\'i rwystro a\'i archifo</string>
+    <string name="unblocked_toast_message">Cyswllt wedi\'i dadrwystro a\'i dynnu o\'r archif</string>
+    <string name="archived_toast_message"><xliff:g id="count">%d</xliff:g> wedi\'u harchifo</string>
+    <string name="unarchived_toast_message"><xliff:g id="count">%d</xliff:g> wedi\'u dad-archifo</string>
+    <string name="notification_off_toast_message">Hysbysiadau i ffwrdd</string>
+    <string name="notification_on_toast_message">Hysbysiadau ymlaen</string>
+    <string name="toast_after_setting_default_sms_app_for_message_send">Yn barod. Cyffyrdda Anfon unwaith eto.</string>
+    <string name="toast_after_setting_default_sms_app">Gosodwyd Negesu fel yr ap rhagosodedig ar gyfer SMS.</string>
+    <plurals name="attachment_preview_close_content_description">
+        <item quantity="zero">Gwaredu atodiadau</item>
+        <item quantity="one">Gwaredu atodiad</item>
+        <item quantity="two">Gwaredu atodiadau</item>
+        <item quantity="few">Gwaredu atodiadau</item>
+        <item quantity="many">Gwaredu atodiadau</item>
+        <item quantity="other">Gwaredu atodiadau</item>
+    </plurals>
+    <string name="audio_attachment_content_description">Atodiad sain</string>
+    <string name="audio_play_content_description">Chwarae atodiad sain</string>
+    <string name="audio_pause_content_description">Saib</string>
+    <string name="incoming_message_announcement">Neges oddi wrth <xliff:g id="sender">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>.</string>
+    <string name="one_on_one_incoming_failed_message_prefix">Neges wedi methu oddi wrth <xliff:g id="sender">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Amser: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="one_on_one_incoming_successful_message_prefix">Neges oddi wrth <xliff:g id="sender">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Amser: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="one_on_one_outgoing_draft_message_prefix">Neges heb ei anfon at <xliff:g id="contact">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Amser: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="one_on_one_outgoing_sending_message_prefix">Yn anfon neges at <xliff:g id="contact">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Amser: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="one_on_one_outgoing_failed_message_prefix">Neges wedi methu at <xliff:g id="contact">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Amser: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="one_on_one_outgoing_successful_message_prefix">Neges at <xliff:g id="contact">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Amser: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="group_incoming_failed_message_prefix">Neges wedi methu oddi wrth <xliff:g id="sender">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Amser: <xliff:g id="time">%s</xliff:g>. <xliff:g id="groupInfo">%s</xliff:g>.</string>
+    <string name="group_incoming_successful_message_prefix">Neges oddi wrth <xliff:g id="sender">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Amser: <xliff:g id="time">%s</xliff:g>. <xliff:g id="groupInfo">%s</xliff:g>.</string>
+    <string name="group_outgoing_draft_message_prefix">Neges heb ei anfon at <xliff:g id="group">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Amser: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="group_outgoing_sending_message_prefix">Yn anfon neges at <xliff:g id="group">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Amser: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="group_outgoing_failed_message_prefix">Neges wedi methu at <xliff:g id="group">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Amser: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="group_outgoing_successful_message_prefix">Neges at <xliff:g id="group">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>. Amser: <xliff:g id="time">%s</xliff:g>.</string>
+    <string name="failed_message_content_description">Methodd y neges. Tapia i geisio eto.</string>
+    <string name="group_conversation_description">Sgwrs gyda <xliff:g id="participants">%s</xliff:g></string>
+    <string name="delete_subject_content_description">Dileu\'r pwnc</string>
+    <string name="camera_switch_to_video_mode">Cipio fideo</string>
+    <string name="camera_switch_to_still_mode">Cipio llun llonydd</string>
+    <string name="camera_take_picture">Tynnu llun</string>
+    <string name="camera_start_recording">Dechrau recordio fideo</string>
+    <string name="camera_switch_full_screen">Newid i gamera sgrin lawn</string>
+    <string name="camera_switch_camera_facing">Newid rhwng camerâu cefn a blaen</string>
+    <string name="camera_stop_recording">Stopio recordio ac atodi fideo</string>
+    <string name="camera_cancel_recording">Stopio recordio fideo</string>
+    <string name="photo_view_activity_title">Lluniau Negeseua</string>
+    <plurals name="photos_saved_to_album">
+        <item quantity="zero"><xliff:g id="quantity">%d</xliff:g> lluniau wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="one"><xliff:g id="quantity">%d</xliff:g> llun wedi ei gadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="two"><xliff:g id="quantity">%d</xliff:g> lun wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="few"><xliff:g id="quantity">%d</xliff:g> llun wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="many"><xliff:g id="quantity">%d</xliff:g> llun wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="other"><xliff:g id="quantity">%d</xliff:g> llun wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+    </plurals>
+    <plurals name="videos_saved_to_album">
+        <item quantity="zero"><xliff:g id="quantity">%d</xliff:g> fideos wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="one"><xliff:g id="quantity">%d</xliff:g> fideo wedi ei gadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="two"><xliff:g id="quantity">%d</xliff:g> fideo wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="few"><xliff:g id="quantity">%d</xliff:g> fideo wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="many"><xliff:g id="quantity">%d</xliff:g> fideo wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="other"><xliff:g id="quantity">%d</xliff:g> fideo wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+    </plurals>
+    <plurals name="attachments_saved_to_album">
+        <item quantity="zero"><xliff:g id="quantity">%d</xliff:g> atodiadau wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="one"><xliff:g id="quantity">%d</xliff:g> atodiad wedi ei gadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="two"><xliff:g id="quantity">%d</xliff:g> atodiad wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="few"><xliff:g id="quantity">%d</xliff:g> atodiad wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="many"><xliff:g id="quantity">%d</xliff:g> atodiad wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+        <item quantity="other"><xliff:g id="quantity">%d</xliff:g> atodiad wedi eu cadw i\'r casgliad "<xliff:g id="albumName">%s</xliff:g>\"</item>
+    </plurals>
+    <plurals name="attachments_saved_to_downloads">
+        <item quantity="zero"><xliff:g id="quantity">%d</xliff:g> atodiadau wedi eu cadw yn \"Llwythi\"</item>
+        <item quantity="one"><xliff:g id="quantity">%d</xliff:g> atodiad wedi ei gadw yn \"Llwythi\"</item>
+        <item quantity="two"><xliff:g id="quantity">%d</xliff:g> atodiad wedi eu cadw yn \"Llwythi\"</item>
+        <item quantity="few"><xliff:g id="quantity">%d</xliff:g> atodiad wedi eu cadw yn \"Llwythi\"</item>
+        <item quantity="many"><xliff:g id="quantity">%d</xliff:g> atodiad wedi eu cadw yn \"Llwythi\"</item>
+        <item quantity="other"><xliff:g id="quantity">%d</xliff:g> atodiad wedi eu cadw yn \"Llwythi\"</item>
+    </plurals>
+    <plurals name="attachments_saved">
+        <item quantity="zero"><xliff:g id="quantity">%d</xliff:g> atodiadau wedi eu cadw</item>
+        <item quantity="one"><xliff:g id="quantity">%d</xliff:g> atodiad wedi ei gadw</item>
+        <item quantity="two"><xliff:g id="quantity">%d</xliff:g> atodiad wedi eu cadw</item>
+        <item quantity="few"><xliff:g id="quantity">%d</xliff:g> atodiad wedi eu cadw</item>
+        <item quantity="many"><xliff:g id="quantity">%d</xliff:g> atodiad wedi eu cadw</item>
+        <item quantity="other"><xliff:g id="quantity">%d</xliff:g> atodiad wedi eu cadw</item>
+    </plurals>
+    <plurals name="attachment_save_error">
+        <item quantity="zero">Methwyd â chadw <xliff:g id="quantity">%d</xliff:g> atodiadau</item>
+        <item quantity="one">Methwyd â chadw <xliff:g id="quantity">%d</xliff:g> atodiad</item>
+        <item quantity="two">Methwyd â chadw <xliff:g id="quantity">%d</xliff:g> atodiad</item>
+        <item quantity="few">Methwyd â chadw <xliff:g id="quantity">%d</xliff:g> atodiad</item>
+        <item quantity="many">Methwyd â chadw <xliff:g id="quantity">%d</xliff:g> atodiad</item>
+        <item quantity="other">Methwyd â chadw <xliff:g id="quantity">%d</xliff:g> atodiad</item>
+    </plurals>
+    <string name="attachment_file_description">Atodiad MMS wedi\'i gadw</string>
+    <string name="settings_activity_title">Gosodiadau</string>
+    <string name="archived_activity_title">Wedi\'u harchifo</string>
+    <string name="action_close">Cau</string>
+    <string name="mms_messaging_category_pref_title">MMS</string>
+    <string name="advanced_category_pref_title">Uwch</string>
+    <string name="debug_category_pref_title">Dadfygio</string>
+    <string name="notifications_enabled_pref_title">Hysbysiadau</string>
+    <string name="notification_sound_pref_title">Sain</string>
+    <string name="silent_ringtone">Distaw</string>
+    <string name="notification_vibrate_pref_title">Dirgrynu</string>
+    <string name="blocked_pref_title">Wedi\'i rhwystro</string>
+    <string name="delivery_reports_pref_title">Adroddiadau danfon SMS</string>
+    <string name="delivery_reports_pref_summary">Gofyn am adroddiad ar gyfer pob neges SMS wyt ti\'n ei anfon i gadarnhau ei bod wedi cyrraedd</string>
+    <string name="auto_retrieve_mms_pref_title">Cyrchu\'n awtomatig</string>
+    <string name="auto_retrieve_mms_pref_summary">Nôl negeseuon MMS yn awtomatig</string>
+    <string name="auto_retrieve_mms_when_roaming_pref_title">Cyrchu\'n awtomatig wrth grwydro</string>
+    <string name="auto_retrieve_mms_when_roaming_pref_summary">Nôl negeseuon MMS yn awtomatig wrth grwydro tramor</string>
+    <string name="group_mms_pref_title">Negeseua grŵp</string>
+    <string name="group_mms_pref_summary">Defnyddia MMS i anfon yr un neges at nifer o bobol.</string>
+    <string name="sms_disabled_pref_title">Ap SMS rhagosodedig</string>
+    <string name="sms_enabled_pref_title">Ap SMS rhagosodedig</string>
+    <string name="default_sms_app"><xliff:g id="app_name">%s</xliff:g></string>
+    <string name="mms_phone_number_pref_title">Dy rif ffôn</string>
+    <string name="unknown_phone_number_pref_display_value">Anhysybys</string>
+    <string name="send_sound_pref_title">Seiniau negeseuon allan</string>
+    <string name="dump_sms_pref_title">Dympio SMS</string>
+    <string name="dump_sms_pref_summary">Dympio data craidd negeseuon SMS a dderbyniwyd mewn i ffeil storfa allanol</string>
+    <string name="dump_mms_pref_title">Dympio MMS</string>
+    <string name="dump_mms_pref_summary">Dympio data craidd negeseuon MMS a dderbyniwyd mewn i ffeil storfa allanol</string>
+    <string name="wireless_alerts_title">Hysbysiadau di-wifr</string>
+    <string name="message_context_menu_title">Dewisiadau neges</string>
+    <string name="message_context_menu_copy_text">Copïo\'r testun</string>
+    <string name="message_context_menu_view_details">Gweld manylion</string>
+    <string name="message_context_menu_delete_message">Dileu</string>
+    <string name="message_context_menu_forward_message">Anfon ymlaen</string>
+    <string name="message_details_title">Manylion y neges</string>
+    <string name="message_type_label">Math:\u0020</string>
+    <string name="text_message">Neges destun</string>
+    <string name="multimedia_message">Neges amlgyfrwng</string>
+    <string name="from_label">Oddi wrth:\u0020</string>
+    <string name="to_address_label">At:\u0020</string>
+    <string name="sent_label">Anfonwyd:\u0020</string>
+    <string name="received_label">Derbyniwyd:\u0020</string>
+    <string name="subject_label">Pwnc:\u0020</string>
+    <string name="message_size_label">Maint:\u0020</string>
+    <string name="priority_label">Blaenoriaeth:\u0020</string>
+    <string name="sim_label">SIM:\u0020</string>
+    <string name="priority_high">Uchel</string>
+    <string name="priority_normal">Arferol</string>
+    <string name="priority_low">Isel</string>
+    <string name="sim_slot_identifier">SIM <xliff:g id="sim_slot_number">%s</xliff:g></string>
+    <string name="hidden_sender_address">Cyfeiriad anfonwr cudd</string>
+    <string name="cant_send_message_while_loading_attachments">Methu ag anfon neges wrth lwytho atodiadau.</string>
+    <string name="fail_to_load_attachment">Methu â llwytho\'r atodiad. Ceisia eto.</string>
+    <string name="cant_send_message_without_active_subscription">Dyw\'r rhwydwaith ddim yn barod. Ceisia eto.</string>
+    <string name="chips_text_delete_button_content_description">Dileu testun</string>
+    <string name="numeric_text_keyboard_toggle_button_content_description">Newid rhwng mewnbynnu testun a rhifau</string>
+    <string name="add_more_participants_button_content_description">Ychwanegu rhagor o gyfranogwyr</string>
+    <string name="confrim_participants_button_content_description">Cadarnhau cyfranogwyr</string>
+    <string name="start_new_conversation">Dechrau sgwrs newydd</string>
+    <string name="gallery_checkbox_content_description">Dewis yr eitem hon</string>
+    <string name="video_thumbnail_view_play_button_content_description">Chwarae fideo</string>
+    <string name="action_people_and_options">Pobol a dewisiadau</string>
+    <string name="action_debug_options">Dadfygio</string>
+    <string name="people_and_options_activity_title">Pobol a dewisiadau</string>
+    <string name="general_settings_title">Cyffredinol</string>
+    <string name="participant_list_title">Pobl yn y sgwrs hon</string>
+    <string name="action_call">Gwneud galwad</string>
+    <string name="compose_message_view_hint_text">Anfon neges</string>
+    <string name="compose_message_view_hint_text_multi_sim">Anfon neges &lt;br/&gt;&lt;small&gt;oddi wrth<xliff:g id="sim_name">%s</xliff:g>&lt;/small&gt;</string>
+    <plurals name="compose_message_view_hint_text_photo">
+        <item quantity="zero">Anfon lluniau</item>
+        <item quantity="one">Anfon llun</item>
+        <item quantity="two">Anfon lluniau</item>
+        <item quantity="few">Anfon lluniau</item>
+        <item quantity="many">Anfon lluniau</item>
+        <item quantity="other">Anfon lluniau</item>
+    </plurals>
+    <plurals name="compose_message_view_hint_text_audio">
+        <item quantity="zero">Anfon sain</item>
+        <item quantity="one">Anfon sain</item>
+        <item quantity="two">Anfon sain</item>
+        <item quantity="few">Anfon sain</item>
+        <item quantity="many">Anfon sain</item>
+        <item quantity="other">Anfon sain</item>
+    </plurals>
+    <plurals name="compose_message_view_hint_text_video">
+        <item quantity="zero">Anfon fideos</item>
+        <item quantity="one">Anfon fideo</item>
+        <item quantity="two">Anfon fideos</item>
+        <item quantity="few">Anfon fideos</item>
+        <item quantity="many">Anfon fideos</item>
+        <item quantity="other">Anfon fideos</item>
+    </plurals>
+    <plurals name="compose_message_view_hint_text_vcard">
+        <item quantity="zero">Anfon cardiau cyswllt</item>
+        <item quantity="one">Anfon cerdyn cyswllt</item>
+        <item quantity="two">Anfon cardiau cyswllt</item>
+        <item quantity="few">Anfon cardiau cyswllt</item>
+        <item quantity="many">Anfon cardiau cyswllt</item>
+        <item quantity="other">Anfon cardiau cyswllt</item>
+    </plurals>
+    <plurals name="compose_message_view_hint_text_attachments">
+        <item quantity="zero">Anfon atodiadau</item>
+        <item quantity="one">Anfon atodiad</item>
+        <item quantity="two">Anfon atodiadau</item>
+        <item quantity="few">Anfon atodiadau</item>
+        <item quantity="many">Anfon atodiadau</item>
+        <item quantity="other">Anfon atodiadau</item>
+    </plurals>
+    <plurals name="attachment_changed_accessibility_announcement">
+        <item quantity="zero"><xliff:g id="attachment_count">%d</xliff:g> atodiadau yn barod i\'w hanfon</item>
+        <item quantity="one">Un atodiad yn barod i\'w anfon</item>
+        <item quantity="two"><xliff:g id="attachment_count">%d</xliff:g> atodiad yn barod i\'w hanfon</item>
+        <item quantity="few"><xliff:g id="attachment_count">%d</xliff:g> atodiad yn barod i\'w hanfon</item>
+        <item quantity="many"><xliff:g id="attachment_count">%d</xliff:g> atodiad yn barod i\'w hanfon</item>
+        <item quantity="other"><xliff:g id="attachment_count">%d</xliff:g> atodiad yn barod i\'w hanfon</item>
+    </plurals>
+    <string name="menu_send_feedback">Anfon adborth</string>
+    <string name="menu_view_in_store">Gweld yn Google Play Store</string>
+    <string name="menu_version_info">Gwybodaeth am y fersiwn</string>
+    <string name="subtitle_format_for_version_number">Fersiwn %1$s</string>
+    <string name="menu_license">Trwyddedau cod agored</string>
+    <string name="notifications_enabled_conversation_pref_title">Hysbysiadau</string>
+    <string name="mms_attachment_limit_reached">Wedi cyrraedd mwyafswm atodiadau</string>
+    <string name="mms_attachment_load_failed">Methwyd â llwytho atodiad.</string>
+    <string name="add_contact_confirmation_dialog_title">Ychwanegu at Gysylltiadau?</string>
+    <string name="add_contact_confirmation">Ychwanegu Cyswllt</string>
+    <string name="compose_message_view_subject_hint_text">Pwnc</string>
+    <string name="conversation_message_view_subject_text">Pwnc:\u0020</string>
+    <string name="notification_subject"><xliff:g id="subject_label">%s</xliff:g><xliff:g id="messageText">%s</xliff:g></string>
+    <string name="loading_vcard">Yn llwytho cerdyn cyswllt</string>
+    <string name="failed_loading_vcard">Methwyd â llwytho cerdyn cyswllt</string>
+    <string name="vcard_tap_hint">Gweld cerdyn cyswllt</string>
+    <plurals name="vcard_multiple_display_name">
+        <item quantity="zero"><xliff:g id="count">%d</xliff:g> cysylltiadau</item>
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> cyswllt</item>
+        <item quantity="two"><xliff:g id="count">%d</xliff:g> gyswllt</item>
+        <item quantity="few"><xliff:g id="count">%d</xliff:g> chyswllt</item>
+        <item quantity="many"><xliff:g id="count">%d</xliff:g> chyswllt</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> cyswllt</item>
+    </plurals>
+    <string name="vcard_detail_activity_title">Cardiau cysylltiadau</string>
+    <string name="vcard_detail_birthday_label">Pen-blwydd</string>
+    <string name="vcard_detail_notes_label">Nodiadau</string>
+    <string name="forward_message_activity_title">Anfon y neges ymlaen</string>
+    <string name="reply_activity_title">Ateb</string>
+    <string name="plus_one">+1</string>
+    <string name="plus_n">+%d</string>
+    <string name="sms_disabled">SMS wedi\'i analluogi</string>
+    <string name="requires_default_sms_app_to_send">I anfon y neges, gosoda Negesu fel yr ap SMS rhagosodedig.</string>
+    <string name="requires_default_sms_app">Gosod Negesu fel yr ap SMS rhagosodedig</string>
+    <string name="requires_default_sms_change_button">Newid</string>
+    <string name="recommend_set_default_sms_app">I dderbyn negeseuon, gosoda Negesu fel yr ap SMS rhagosodedig</string>
+    <string name="no_preferred_sim_selected">Nid oes SIM wedi\'i ddewis i\'w ffafrio ar gyfer anfon negeseuon SMS.</string>
+    <string name="requires_sms_permissions_message">Nid yw perchennog y ddyfais yn caniatáu\'r ap hwn.</string>
+    <string name="requires_sms_permissions_close_button">Iawn</string>
+    <string name="too_many_participants">Gormod o gyfranogwyr mewn sgwrs</string>
+    <plurals name="add_invalid_contact_error">
+        <item quantity="zero">Cysylltiadau annilys</item>
+        <item quantity="one">Cyswllt annilys</item>
+        <item quantity="two">Cysylltiadau annilys</item>
+        <item quantity="few">Cysylltiadau annilys</item>
+        <item quantity="many">Cysylltiadau annilys</item>
+        <item quantity="other">Cysylltiadau annilys</item>
+    </plurals>
+    <string name="camera_media_failure">Methwyd â llwytho delwedd camera</string>
+    <string name="conversation_list_item_view_sent_from_you_prefix">Ti:\u0020</string>
+    <string name="conversation_list_item_view_sent_from_other_prefix"><xliff:g id="firstNameOfSender">%s</xliff:g>:\u0020</string>
+    <string name="conversation_list_item_view_draft_message">Drafft</string>
+    <string name="conversation_list_empty_text">Pan fyddi\'n dechrau sgwrs newydd, mi fydd yn ymddangos mewn rhestr yma</string>
+    <string name="archived_conversation_list_empty_text">Mae sgyrsiau wedi\'u harchifo yn ymddangos yma</string>
+    <string name="conversation_list_first_sync_text">Yn llwytho sgyrsiau…</string>
+    <string name="conversation_list_snippet_picture">Llun</string>
+    <string name="conversation_list_snippet_audio_clip">Clip sain</string>
+    <string name="conversation_list_snippet_video">Fideo</string>
+    <string name="conversation_list_snippet_vcard">Cerdyn cyswllt</string>
+    <string name="mms_text">MMS</string>
+    <string name="snack_bar_undo">Dadwneud</string>
+    <string name="snack_bar_retry">Ail-geisio</string>
+    <string name="contact_list_empty_text">Rho enw neu rif ffôn cyswllt i ddechrau neges newydd.</string>
+    <string name="action_block">Rhwystro</string>
+    <string name="block_contact_title">Rhwystro <xliff:g id="destination">%s</xliff:g></string>
+    <string name="unblock_contact_title">Dadrwystro <xliff:g id="destination">%s</xliff:g></string>
+    <string name="block_confirmation_title">Rhwystro <xliff:g id="destination">%s</xliff:g>?</string>
+    <string name="block_confirmation_message">Mi fyddi\'n parhau i dderbyn negeseuon oddi wrth y rhif hwn ond ni fyddi di bellach yn cael dy hysbysu. Caiff y sgwrs hon ei harchifo.</string>
+    <string name="blocked_contacts_title">Cysylltiadau a rhwystrwyd</string>
+    <string name="tap_to_unblock_message">DADRWYSTRO</string>
+    <string name="view_blocked_contacts_title">Cysylltiadau a rhwystrwyd</string>
+    <string name="pick_image_from_document_library_content_description">Dewis delwedd o\'r llyfrgell dogfennau</string>
+    <string name="sending_message">Anfon neges</string>
+    <string name="send_message_success">Anfonwyd y neges</string>
+    <string name="send_message_failure_no_data">Rhwydwaith symudol wedi\'i ddiffodd. Gwiria dy osodiadau.</string>
+    <string name="send_message_failure_airplane_mode">Nid yw\'n bosib anfon negeseuon ym Modd Awyren</string>
+    <string name="send_message_failure">Methwyd ag anfon y neges</string>
+    <string name="download_message_success">Neges wedi\'i lawrlwytho</string>
+    <string name="download_message_failure_no_data">Rhwydwaith symudol wedi\'i ddiffodd. Gwiria dy osodiadau.</string>
+    <string name="download_message_failure_airplane_mode">Nid yw\'n bosib lawrlwytho negeseuon ym Modd Awyren</string>
+    <string name="download_message_failure">Methwyd â lawrlwytho\'r neges</string>
+    <string name="content_description_for_number_zero">Sero</string>
+    <string name="content_description_for_number_one">Un</string>
+    <string name="content_description_for_number_two">Dau</string>
+    <string name="content_description_for_number_three">Tri</string>
+    <string name="content_description_for_number_four">Pedwar</string>
+    <string name="content_description_for_number_five">Pump</string>
+    <string name="content_description_for_number_six">Chwech</string>
+    <string name="content_description_for_number_seven">Saith</string>
+    <string name="content_description_for_number_eight">Wyth</string>
+    <string name="content_description_for_number_nine">Naw</string>
+    <string name="carrier_send_error">Methu ag anfon neges gyda <xliff:g id="carrierName">%1$s</xliff:g>. Gwall <xliff:g id="errorCode">%2$d</xliff:g></string>
+    <string name="carrier_send_error_unknown_carrier">Methu ag anfon neges gyda gwasanaeth anhysbys. Gwall <xliff:g id="errorCode">%1$d</xliff:g></string>
+    <string name="message_fwd">Yml: <xliff:g id="subject">%s</xliff:g></string>
+    <string name="mms_failure_outgoing_service">Ni anfonwyd y neges: gwasanaeth heb ei actifadu ar y rhwydwaith</string>
+    <string name="mms_failure_outgoing_address">Neges heb ei anfon: cyfeiriad annilys</string>
+    <string name="mms_failure_outgoing_corrupt">Neges heb ei anfon: neges annilys</string>
+    <string name="mms_failure_outgoing_content">Neges heb ei anfon: cynnwys anghydnaws</string>
+    <string name="mms_failure_outgoing_unsupported">Neges heb ei anfon: neges anghydnaws</string>
+    <string name="mms_failure_outgoing_too_large">Neges heb ei anfon: rhy fawr</string>
+    <string name="in_conversation_notify_new_message_text">Neges newydd</string>
+    <string name="in_conversation_notify_new_message_action">Gweld</string>
+    <string name="message_image_content_description">Delwedd</string>
+    <string name="activity_not_found_message">Methwyd â chanfod ap priodol</string>
+    <string name="chips_delete_content_description">Tynnu\'r cyfranogwr</string>
+    <string name="share_new_message">Neges newydd</string>
+    <string name="share_cancel">Diddymu</string>
+    <string name="apn_edit">Golygu pwynt mynediad</string>
+    <string name="apn_not_set">Heb ei osod</string>
+    <string name="apn_name">Enw</string>
+    <string name="apn_apn">Enw Pwynt Mynediad (APN)</string>
+    <string name="apn_mmsc">MMSC</string>
+    <string name="apn_mms_proxy">Procsi MMS</string>
+    <string name="apn_mms_port">Porth MMS</string>
+    <string name="apn_mcc">MCC</string>
+    <string name="apn_mnc">MNC</string>
+    <string name="apn_type">Math APN</string>
+    <string name="menu_delete_apn">Dileu APN</string>
+    <string name="menu_new_apn">APN newydd</string>
+    <string name="menu_save_apn">Cadw</string>
+    <string name="menu_discard_apn_change">Gwaredu</string>
+    <string name="error_apn_name_empty">Rhaid rhoi rhywbeth yn y maes Enw.</string>
+    <string name="error_apn_empty">Ni all yr APN fod yn wag.</string>
+    <string name="error_mcc_not3">Rhaid i\'r maes MCC fod yn 3 digid.</string>
+    <string name="error_mnc_not23">Rhaid i\'r maes MNC fod yn 2 neu 3 digid.</string>
+    <string name="restore_default_apn">Yn adfer rhagosodiadau APN.</string>
+    <string name="menu_restore_default_apn">Ailosod i\'r rhagosodiad</string>
+    <string name="restore_default_apn_completed">Cwblhawyd ailosod rhagosodiadau APN.</string>
+    <string name="untitled_apn">Heb deitl</string>
+    <string name="sms_apns_title">Enwau Pwyntiau Mynediad (APN)</string>
+    <string name="apn_settings">APNau</string>
+    <string name="menu_new">APN newydd</string>
+    <string name="apn_settings_not_available">Dyw gosodiadau Enwau Pwyntiau Mynediad (APN) ddim ar gael ar gyfer y defnyddiwr hwn.</string>
+    <string name="copy_to_clipboard_dialog_title">Copïo i\'r clipfwrdd?</string>
+    <string name="copy_to_clipboard">Copïo</string>
+    <string name="incoming_sim_name_text">at <xliff:g id="sim_name">%s</xliff:g></string>
+    <string name="general_settings">Cyffredinol</string>
+    <string name="advanced_settings">Uwch</string>
+    <string name="general_settings_activity_title">Gosodiadau cyffredin</string>
+    <string name="advanced_settings_activity_title">Gosodiadau uwch</string>
+    <string name="sim_specific_settings">\"<xliff:g id="sim_name">%s</xliff:g>\" SIM</string>
+    <string name="disable_group_mms">Anfon negeseuon SMS i bawb yn unigol. Bydd unrhyw atebion atat ti yn unig.</string>
+    <string name="enable_group_mms">Anfon yr un MMS i bob derbynnydd</string>
+    <string name="sim_settings_unknown_number">Rhif anhysbys</string>
+    <string name="secondary_user_new_message_title">Neges newydd</string>
+    <string name="secondary_user_new_message_ticker">Neges newydd.</string>
+    <string name="sim_selector_button_content_description">Dewisydd SIM</string>
+    <string name="sim_selector_button_content_description_with_selection">Dewisydd SIM, <xliff:g id="sim">%1$s</xliff:g> wedi\'i dewis</string>
+    <string name="send_button_long_click_description_no_sim_selector">Golygu pwnc</string>
+    <string name="send_button_long_click_description_with_sim_selector">Dewis SIM neu olygu pwnc</string>
+    <string name="audio_record_view_content_description">Cyffyrdda a dal i recordio sain</string>
+    <string name="widget_new_conversation_content_description">Dechrau sgwrs newydd</string>
+    <string name="widget_title_content_description">Negeseua</string>
+    <string name="widget_conversation_list_name">Rhestr Negeseuon</string>
+    <string name="widget_conversation_name">Negeseua</string>
+    <string name="widget_new_message_content_description">Neges newydd</string>
+    <string name="widget_conversation_list_content_description">Rhestr sgyrsiau</string>
+    <string name="loading_conversations">Yn llwytho sgyrsiau</string>
+    <string name="loading_messages">Yn llwytho negeseuon</string>
+    <string name="view_more_conversations">Gweld rhagor o sgyrsiau</string>
+    <string name="view_more_messages">Gweld rhagor o negeseuon</string>
+    <string name="conversation_deleted">Dilëwyd y sgwrs</string>
+    <string name="tap_to_configure">Mae\'r sgwrs wedi ei dileu. Tapia i ddangos sgwrs negeseuon arall.</string>
+    <string name="update_destination_blocked">Wedi\'i rhwystro</string>
+    <string name="update_destination_unblocked">Wedi\'i dad-rwystro</string>
+    <string name="db_full">Nid oes lawer o le i storio SMS. Mae\'n bosib caiff rhywfaint o ddata ei golli.</string>
+    <string name="attachment_chooser_activity_title">Dewis atodiadau</string>
+    <string name="action_confirm_selection">Cadarnhau dewis</string>
+    <string name="attachment_chooser_selection"><xliff:g id="count">%d</xliff:g> wedi\'u dewis</string>
+    <string name="attachment_limit_reached_dialog_message_when_composing">Tynna un neu ragor o atodiadau a rhoi cynnig arall arni.</string>
+    <string name="attachment_limit_reached_dialog_message_when_sending">Mae croeso iti geisio anfon dy neges, ond mae\'n bosib na fydd yn cael ei derbyn oni bai dy fod yn tynnu un neu ragor o atodiadau.</string>
+    <string name="video_attachment_limit_exceeded_when_sending">Dyw ond yn bosib anfon un fideo gyda phob neges. Tynna fideos ychwanegol a rhoi cynnig arall arni.</string>
+    <string name="attachment_load_failed_dialog_message">Methodd Negeseua â llwytho\'r atodiad.</string>
+    <string name="attachment_limit_reached_send_anyway">Anfon beth bynnag</string>
+    <string name="conversation_creation_failure">Methwyd â dechrau sgwrs</string>
+    <string name="link_display_format"><xliff:g id="text">%1$s</xliff:g> (<xliff:g id="url">%2$s</xliff:g>)</string>
+    <string name="selected_sim_content_message"><xliff:g id="selected_sim">%s</xliff:g> wedi\'i ddewis</string>
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 3680c8c..0bcbfbe 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Rapporter som spam til %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Fjern Unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Lad tegn være uberørte</string>
-  <string name="pref_unicode_stripping_non_encodable">Fjern ikke-kodbare tegn</string>
-  <string name="pref_unicode_stripping_all">Fjern alle Unicode-tegn</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Gyldighedsperiode</string>
-  <string name="validity_period_slot1_pref_title">Gyldighedsperiode for SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Gyldighedsperiode for SIM 2</string>
-  <string name="sms_validity_period_not_set">Ikke angivet</string>
-  <string name="sms_validity_period_one_hour">1 time</string>
-  <string name="sms_validity_period_six_hours">6 timer</string>
-  <string name="sms_validity_period_twelve_hours">12 timer</string>
-  <string name="sms_validity_period_one_day">1 dag</string>
-  <string name="mms_validity_period_two_days">2 dage</string>
-  <string name="mms_validity_period_one_week">1 uge</string>
-  <string name="validity_period_maximum">Maksimum</string>
-  <string name="pref_summary_mms_delivery_reports">Anmod om en leveringsrapport for hver besked du sender</string>
-  <string name="pref_summary_mms_read_reports">Anmod om en læst rapport for hver besked du har sendt</string>
-  <string name="delivery_reports_mms_pref_title">Leveringsrapporter</string>
-  <string name="read_reports_mms_pref_title">Læs rapporter</string>
-  <string name="status_label">Status:\u0020</string>
-  <string name="status_read">Læs</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Afsendelsesprioritet</string>
-  <string name="priority_low">Lav</string>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">Høj</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Lager</string>
-  <string name="pref_summary_auto_delete">Slet gamle beskeder når grænsen er nået</string>
-  <string name="auto_delete_pref_title">Slet gamle beskeder</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> beskeder pr. samtale</string>
-  <string name="sms_delete_pref_title">SMS-grænse</string>
-  <string name="mms_delete_pref_title">MMS-grænse</string>
-  <string name="set">Angiv</string>
-  <string name="no">Annullér</string>
-  <string name="pref_messages_to_save">Antal beskeder der skal gemmes</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Stryg for at slette</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Stryg til højre for at slette en samtale</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">HurtigBesked og Svar</string>
-  <string name="pref_quickmessage_title">Slå HurtigBesked til</string>
-  <string name="pref_quickmessage_summary">Åbn HurtigBesked pop-up for indkommende SMS\'er</string>
-  <string name="pref_close_all_title">Luk alle</string>
-  <string name="pref_close_all_summary">Lukknap lukker alle beskeder</string>
-  <string name="message_counter">%1$d af %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Luk</string>
-  <string name="button_view">Vis</string>
-  <string name="button_templates">Skabeloner</string>
-  <string name="qm_button_full_conversation">Fuld samtale</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Skriv for at svare</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Sender besked\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Hurtig svar</string>
-  <string name="send">Send</string>
-  <string name="compose_message_hint_text">Indtast besked</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Adgang til humørikoner</string>
-  <string name="show_emoticons_pref_summary">Vis knappen til humørikoner på tastaturet</string>
-  <string name="select_phone_account_title">Send med</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Administrér SIM-kortbeskeder</string>
-  <string name="pref_title_manage_sim_messages_slot1">Administrér SIM 1 meddelelser</string>
-  <string name="pref_title_manage_sim_messages_slot2">Administrér SIM 2 meddelelser</string>
-  <string name="copy_to_sim">Kopiér besked til SIM-kort</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> af <xliff:g id="total">%2$d</xliff:g> beskeder gemt på SIM-kort.</string>
-  <string name="copy_to_sim_fail">Kunne ikke gemme beskeden</string>
-  <string name="copy_to_phone_success">Beskeden er gemt</string>
-  <string name="copy_to_phone_fail">Kunne ikke gemme beskeden</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">Ingen beskeder på SIM-kortet.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Send e-mail til <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">Ring til <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">Tilføj <xliff:g id="contactEmailOrNumber">%s</xliff:g> til Kontaktpersoner</string>
-  <string name="sim_capacity_title">SIM-kort kapacitet</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> af <xliff:g id="total">%2$d</xliff:g> pladser på SIM-kort er i brug</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Slet?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">SMS-beskeder på SIM-kortet</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Opdaterer\u2026</string>
-  <string name="confirm_delete_selected_messages">Valgte besked vil blive slettet.</string>
-  <!-- Delete button title -->
-  <string name="delete">Slet</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Videresend</string>
-  <string name="menu_reply">Besvar</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Kopiér til tablethukommelse</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Kopiér til telefonhukommelse</string>
-  <string name="selected_all">Vælg alle</string>
-  <string name="deselected_all">Fravælg alle</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> valgt</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">Kopiér besked til SIM-kort</string>
-  <string name="slot1">SIM-kort 1</string>
-  <string name="slot2">SIM-kort 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Vælg billeder eller videoer fra denne enhed</string>
-  <string name="mediapicker_audioListChooserDescription">Vælg lydfiler fra denne enhed</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Kan ikke vedhæfte videoen. Beskedstørrelsen er overskredet.</string>
-  <string name="mediapicker_audio_list_title">Vælg lyd</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Lyden er valgt.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Lyden er valgt fra.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> valgt</string>
+    <string name="report_as_spam_to">Rapportér som uønsket til %s</string>
+    <string name="unicode_stripping_pref_title">Fjern unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Efterlad tegn intakte</string>
+    <string name="pref_unicode_stripping_non_encodable">Skær ikke-kodbare tegn fra</string>
+    <string name="pref_unicode_stripping_all">Skær alle unicode-tegn fra</string>
+    <string name="validity_period_pref_title">Gyldighedsperiode</string>
+    <string name="validity_period_slot1_pref_title">Gyldighedsperiode for SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Gyldighedsperiode for SIM 2</string>
+    <string name="sms_validity_period_not_set">Ikke angivet</string>
+    <string name="sms_validity_period_one_hour">1 time</string>
+    <string name="sms_validity_period_six_hours">6 timer</string>
+    <string name="sms_validity_period_twelve_hours">12 timer</string>
+    <string name="sms_validity_period_one_day">1 dag</string>
+    <string name="mms_validity_period_two_days">2 dage</string>
+    <string name="mms_validity_period_one_week">1 uge</string>
+    <string name="validity_period_maximum">Maksimum</string>
+    <string name="pref_summary_mms_delivery_reports">Anmod om en leveringsrapport til hver meddelelse du sender</string>
+    <string name="pref_summary_mms_read_reports">Anmod om en læst-rapport til hver meddelelse du sender</string>
+    <string name="delivery_reports_mms_pref_title">Leveringsrapporter</string>
+    <string name="read_reports_mms_pref_title">Læst-rapporter</string>
+    <string name="status_label">Status:\u0020</string>
+    <string name="status_read">Læst</string>
+    <string name="priority_pref_title">Forsendelsesprioritet</string>
+    <string name="priority_low">Lav</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">Høj</string>
+    <string name="sms_storage_pref_title">Lagerplads</string>
+    <string name="pref_summary_auto_delete">Slet gamle meddelelser, idet grænser nås</string>
+    <string name="auto_delete_pref_title">Slet gamle meddelelser</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> meddelelser pr. samtale</string>
+    <string name="sms_delete_pref_title">SMS-grænse</string>
+    <string name="mms_delete_pref_title">MMS-grænse</string>
+    <string name="set">Angiv</string>
+    <string name="no">Afbryd</string>
+    <string name="pref_messages_to_save">Angiv antal meddelelser at gemme</string>
+    <string name="swipe_to_delete_conversation_pref_title">Stryg for at slette</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Stryg mod højre, for at slette en samtale</string>
+    <string name="pref_quickmessage">HurtigMeddelelse og Svar</string>
+    <string name="pref_quickmessage_title">Vis HurtigMeddelelse</string>
+    <string name="pref_quickmessage_summary">Åbn automatisk HurtigMeddelelser pop-up\'en for indgående SMS-meddelelser</string>
+    <string name="pref_close_all_title">Luk alle</string>
+    <string name="pref_close_all_summary">Luk-knap lukker alle meddelelser</string>
+    <string name="message_counter">%1$d af %2$d</string>
+    <string name="button_close">Luk</string>
+    <string name="button_view">Vis</string>
+    <string name="button_templates">Skabeloner</string>
+    <string name="qm_button_full_conversation">Fuld samtale</string>
+    <string name="type_to_reply_text_enter_to_send">Tast for at svare</string>
+    <string name="toast_sending_message">Sender meddelelse\u2026</string>
+    <string name="qm_quick_reply">Hurtig-svar</string>
+    <string name="send">Send</string>
+    <string name="compose_message_hint_text">Indtast meddelelse</string>
+    <string name="show_emoticons_pref_title">Humørikoner-adgang</string>
+    <string name="show_emoticons_pref_summary">Vis humørikoner-tasten på tastaturet</string>
+    <string name="select_phone_account_title">Send med</string>
+    <string name="pref_title_manage_sim_messages">Håndtér SIM-kort meddelelser</string>
+    <string name="pref_title_manage_sim_messages_slot1">Håndtér SIM 1 meddelelser</string>
+    <string name="pref_title_manage_sim_messages_slot2">Håndtér SIM 2 meddelelser</string>
+    <string name="copy_to_sim">Kopiér meddelelse til SIM-kort</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> af <xliff:g id="total">%2$d</xliff:g> meddelelser gemt til SIM-kort.</string>
+    <string name="copy_to_sim_fail">Ude af stand til at gemme meddelelse</string>
+    <string name="copy_to_phone_success">Meddelelse gemt</string>
+    <string name="copy_to_phone_fail">Ude af stand til at gemme meddelelse</string>
+    <string name="sim_empty">Ingen meddelelser på SIM-kort.</string>
+    <string name="menu_send_email">Send e-post til <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Ring til <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Føj <xliff:g id="contactEmailOrNumber">%s</xliff:g> til Folk</string>
+    <string name="sim_capacity_title">SIM-kapacitet</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> af <xliff:g id="total">%2$d</xliff:g> SIM-kort poster er brugt</string>
+    <string name="confirm_dialog_title">Slet?</string>
+    <string name="sim_manage_messages_title">SMS-meddelelser på SIM-kort</string>
+    <string name="refreshing">Genopfrisker\u2026</string>
+    <string name="confirm_delete_selected_messages">Valgte meddelelse vil blive slettet.</string>
+    <string name="delete">Slet</string>
+    <string name="menu_forward">Videresend</string>
+    <string name="menu_reply">Besvar</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Kopiér til tablet-hukommelse</string>
+    <string name="sim_copy_to_phone_memory" product="default">Kopiér til telefon-hukommelse</string>
+    <string name="selected_all">Vælg alle</string>
+    <string name="deselected_all">Fravælg alle</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> valgt</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Kopiér meddelelse til SIM-kort</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Vælg billeder, eller videoer fra denne enhed</string>
+    <string name="mediapicker_audioListChooserDescription">Vælg lydfiler fra denne enhed</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Kan ikke vedhæfte video. Maks. meddelelsesstørrelse overskredet.</string>
+    <string name="mediapicker_audio_list_title">Vælg lyd</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Lyden er valgt.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Lyden er fravalgt.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> valgt</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 99c37dd..c511009 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">An %s als Spam melden</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Unicode-Zeichen entfernen</string>
-  <string name="pref_unicode_stripping_leave_intact">Zeichen unberührt lassen</string>
-  <string name="pref_unicode_stripping_non_encodable">Unkodierbare Zeichen entfernen</string>
-  <string name="pref_unicode_stripping_all">Unicode komplett entfernen</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Gültigkeitsdauer</string>
-  <string name="validity_period_slot1_pref_title">Gültigkeitsdauer für SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Gültigkeitsdauer für SIM 2</string>
-  <string name="sms_validity_period_not_set">Nicht festgelegt</string>
-  <string name="sms_validity_period_one_hour">1 Stunde</string>
-  <string name="sms_validity_period_six_hours">6 Stunden</string>
-  <string name="sms_validity_period_twelve_hours">12 Stunden</string>
-  <string name="sms_validity_period_one_day">1 Tag</string>
-  <string name="mms_validity_period_two_days">2 Tage</string>
-  <string name="mms_validity_period_one_week">1 Woche</string>
-  <string name="validity_period_maximum">Maximum</string>
-  <string name="pref_summary_mms_delivery_reports">Eine Zustellbestätigung für jede von Ihnen gesendete Nachricht anfordern</string>
-  <string name="pref_summary_mms_read_reports">Eine Lesebestätigung für jede von Ihnen gesendete Nachricht anfordern</string>
-  <string name="delivery_reports_mms_pref_title">Zustellbestätigungen</string>
-  <string name="read_reports_mms_pref_title">Bestätigungen lesen</string>
-  <string name="status_label">Status:\u0020</string>
-  <string name="status_read">Gelesen</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Sendepriorität</string>
-  <string name="priority_low">Niedrig</string>
-  <string name="priority_normal">Standard</string>
-  <string name="priority_high">Hoch</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Speicher</string>
-  <string name="pref_summary_auto_delete">Alte Nachrichten löschen, wenn Limit erreicht wird</string>
-  <string name="auto_delete_pref_title">Alte Nachrichten löschen</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> Nachrichten pro Konversation</string>
-  <string name="sms_delete_pref_title">SMS Limit</string>
-  <string name="mms_delete_pref_title">MMS-Limit</string>
-  <string name="set">Festlegen</string>
-  <string name="no">Abbrechen</string>
-  <string name="pref_messages_to_save">Anzahl der zu speichernden Nachrichten festlegen</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Zum Löschen wischen</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Nach rechts wischen, um eine Konversation zu löschen</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Schnellnachricht und Antwort</string>
-  <string name="pref_quickmessage_title">Schnellnachricht anzeigen</string>
-  <string name="pref_quickmessage_summary">Pop-Up für eingehende SMS automatisch öffnen</string>
-  <string name="pref_close_all_title">Alle schließen</string>
-  <string name="pref_close_all_summary">Die Schließen-Taste schließt alle Nachrichten</string>
-  <string name="message_counter">%1$d von %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Schließen</string>
-  <string name="button_view">Anzeigen</string>
-  <string name="button_templates">Vorlagen</string>
-  <string name="qm_button_full_conversation">Komplette Konversation</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Nachricht schreiben</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Nachricht wird gesendet\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Schnellantwort</string>
-  <string name="send">Senden</string>
-  <string name="compose_message_hint_text">Nachricht eingeben</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Zugriff auf Emoticons</string>
-  <string name="show_emoticons_pref_summary">Emoticons-Taste auf der Tastatur anzeigen</string>
-  <string name="select_phone_account_title">Senden mit</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Nachrichten auf der SIM-Karte verwalten</string>
-  <string name="pref_title_manage_sim_messages_slot1">Nachrichten auf SIM 1 verwalten</string>
-  <string name="pref_title_manage_sim_messages_slot2">Nachrichten auf SIM 2 verwalten</string>
-  <string name="copy_to_sim">Nachricht auf SIM-Karte kopieren</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> von <xliff:g id="total">%2$d</xliff:g> Nachrichten auf SIM-Karte gespeichert.</string>
-  <string name="copy_to_sim_fail">Nachricht konnte nicht gespeichert werden</string>
-  <string name="copy_to_phone_success">Nachricht gespeichert</string>
-  <string name="copy_to_phone_fail">Nachricht konnte nicht gespeichert werden</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">Keine Nachrichten auf der SIM-Karte.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">E-Mail an <xliff:g id="name">%s</xliff:g> senden</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> anrufen</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> zu Personen hinzufügen</string>
-  <string name="sim_capacity_title">SIM-Speicherkapazität</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> von <xliff:g id="total">%2$d</xliff:g> möglichen Einträgen auf der SIM-Karte werden verwendet</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Löschen?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">SMS-Nachrichten auf der SIM-Karte</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Wird aktualisiert\u2026</string>
-  <string name="confirm_delete_selected_messages">Ausgewählte Nachricht wird gelöscht.</string>
-  <!-- Delete button title -->
-  <string name="delete">Löschen</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Weiterleiten</string>
-  <string name="menu_reply">Antworten</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Nachricht in Tabletspeicher kopieren</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Nachricht in Telefonspeicher kopieren</string>
-  <string name="selected_all">Alle auswählen</string>
-  <string name="deselected_all">Auswahl aufheben</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> ausgewählt</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">Nachricht auf SIM-Karte kopieren</string>
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Wählen Sie Bilder oder Videos von diesem Gerät aus</string>
-  <string name="mediapicker_audioListChooserDescription">Wählen Sie Audiodateien von diesem Gerät aus</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Videodatei kann nicht nicht angehängt werden. Die maximale Nachrichtengröße ist überschritten.</string>
-  <string name="mediapicker_audio_list_title">Audiodateien auswählen</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Audiodatei ausgewählt.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Keine Audiodatei ausgewählt.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> ausgewählt</string>
+    <string name="report_as_spam_to">An %s als Spam melden</string>
+    <string name="unicode_stripping_pref_title">Unicode-Zeichen entfernen</string>
+    <string name="pref_unicode_stripping_leave_intact">Zeichen unberührt lassen</string>
+    <string name="pref_unicode_stripping_non_encodable">Unkodierbare Zeichen entfernen</string>
+    <string name="pref_unicode_stripping_all">Unicode komplett entfernen</string>
+    <string name="validity_period_pref_title">Gültigkeitsdauer</string>
+    <string name="validity_period_slot1_pref_title">Gültigkeitsdauer für SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Gültigkeitsdauer für SIM 2</string>
+    <string name="sms_validity_period_not_set">Nicht festgelegt</string>
+    <string name="sms_validity_period_one_hour">1 Stunde</string>
+    <string name="sms_validity_period_six_hours">6 Stunden</string>
+    <string name="sms_validity_period_twelve_hours">12 Stunden</string>
+    <string name="sms_validity_period_one_day">1 Tag</string>
+    <string name="mms_validity_period_two_days">2 Tage</string>
+    <string name="mms_validity_period_one_week">1 Woche</string>
+    <string name="validity_period_maximum">Maximum</string>
+    <string name="pref_summary_mms_delivery_reports">Eine Zustellbestätigung für jede von Ihnen gesendete Nachricht anfordern</string>
+    <string name="pref_summary_mms_read_reports">Eine Lesebestätigung für jede von Ihnen gesendete Nachricht anfordern</string>
+    <string name="delivery_reports_mms_pref_title">Zustellbestätigungen</string>
+    <string name="read_reports_mms_pref_title">Bestätigungen lesen</string>
+    <string name="status_label">Status:\u0020</string>
+    <string name="status_read">Gelesen</string>
+    <string name="priority_pref_title">Sendepriorität</string>
+    <string name="priority_low">Niedrig</string>
+    <string name="priority_normal">Standard</string>
+    <string name="priority_high">Hoch</string>
+    <string name="sms_storage_pref_title">Speicher</string>
+    <string name="pref_summary_auto_delete">Alte Nachrichten löschen, wenn Limit erreicht wird</string>
+    <string name="auto_delete_pref_title">Alte Nachrichten löschen</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> Nachrichten pro Konversation</string>
+    <string name="sms_delete_pref_title">SMS Limit</string>
+    <string name="mms_delete_pref_title">MMS-Limit</string>
+    <string name="set">Festlegen</string>
+    <string name="no">Abbrechen</string>
+    <string name="pref_messages_to_save">Anzahl der zu speichernden Nachrichten festlegen</string>
+    <string name="swipe_to_delete_conversation_pref_title">Zum Löschen wischen</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Nach rechts wischen, um eine Konversation zu löschen</string>
+    <string name="pref_quickmessage">Schnellnachricht und Antwort</string>
+    <string name="pref_quickmessage_title">Schnellnachricht anzeigen</string>
+    <string name="pref_quickmessage_summary">Pop-Up für eingehende SMS automatisch öffnen</string>
+    <string name="pref_close_all_title">Alle schließen</string>
+    <string name="pref_close_all_summary">Die Schließen-Taste schließt alle Nachrichten</string>
+    <string name="message_counter">%1$d von %2$d</string>
+    <string name="button_close">Schließen</string>
+    <string name="button_view">Anzeigen</string>
+    <string name="button_templates">Vorlagen</string>
+    <string name="qm_button_full_conversation">Komplette Konversation</string>
+    <string name="type_to_reply_text_enter_to_send">Nachricht schreiben</string>
+    <string name="toast_sending_message">Nachricht wird gesendet\u2026</string>
+    <string name="qm_quick_reply">Schnellantwort</string>
+    <string name="send">Senden</string>
+    <string name="compose_message_hint_text">Nachricht eingeben</string>
+    <string name="show_emoticons_pref_title">Zugriff auf Emoticons</string>
+    <string name="show_emoticons_pref_summary">Emoticons-Taste auf der Tastatur anzeigen</string>
+    <string name="select_phone_account_title">Senden mit</string>
+    <string name="pref_title_manage_sim_messages">Nachrichten auf der SIM-Karte verwalten</string>
+    <string name="pref_title_manage_sim_messages_slot1">Nachrichten auf SIM 1 verwalten</string>
+    <string name="pref_title_manage_sim_messages_slot2">Nachrichten auf SIM 2 verwalten</string>
+    <string name="copy_to_sim">Nachricht auf SIM-Karte kopieren</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> von <xliff:g id="total">%2$d</xliff:g> Nachrichten auf SIM-Karte gespeichert.</string>
+    <string name="copy_to_sim_fail">Nachricht konnte nicht gespeichert werden</string>
+    <string name="copy_to_phone_success">Nachricht gespeichert</string>
+    <string name="copy_to_phone_fail">Nachricht konnte nicht gespeichert werden</string>
+    <string name="sim_empty">Keine Nachrichten auf der SIM-Karte.</string>
+    <string name="menu_send_email">E-Mail an <xliff:g id="name">%s</xliff:g> senden</string>
+    <string name="menu_call_back"><xliff:g id="name">%s</xliff:g> anrufen</string>
+    <string name="menu_add_address_to_contacts"><xliff:g id="contactEmailOrNumber">%s</xliff:g> zu Personen hinzufügen</string>
+    <string name="sim_capacity_title">SIM-Speicherkapazität</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> von <xliff:g id="total">%2$d</xliff:g> möglichen Einträgen auf der SIM-Karte werden verwendet</string>
+    <string name="confirm_dialog_title">Löschen?</string>
+    <string name="sim_manage_messages_title">SMS-Nachrichten auf der SIM-Karte</string>
+    <string name="refreshing">Wird aktualisiert\u2026</string>
+    <string name="confirm_delete_selected_messages">Ausgewählte Nachricht wird gelöscht.</string>
+    <string name="delete">Löschen</string>
+    <string name="menu_forward">Weiterleiten</string>
+    <string name="menu_reply">Antworten</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Nachricht in Tabletspeicher kopieren</string>
+    <string name="sim_copy_to_phone_memory" product="default">Nachricht in Telefonspeicher kopieren</string>
+    <string name="selected_all">Alle auswählen</string>
+    <string name="deselected_all">Auswahl aufheben</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> ausgewählt</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Nachricht auf SIM-Karte kopieren</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Wählen Sie Bilder oder Videos von diesem Gerät aus</string>
+    <string name="mediapicker_audioListChooserDescription">Wählen Sie Audiodateien von diesem Gerät aus</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Videodatei kann nicht nicht angehängt werden. Die maximale Nachrichtengröße ist überschritten.</string>
+    <string name="mediapicker_audio_list_title">Audiodateien auswählen</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Audiodatei ausgewählt.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Keine Audiodatei ausgewählt.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> ausgewählt</string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 28f2bf2..55d7244 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -16,127 +16,96 @@
     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">Αυτόματη εμφάνιση αναδυόμενου μηνύματος για τα εισερχόμενα SMS</string>
-  <string name="pref_close_all_title">Κλείσιμο όλων</string>
-  <string name="pref_close_all_summary">Το κουμπί κλείσιμο κλείνει όλα τα μηνύματα</string>
-  <string name="message_counter">%1$d από %2$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">Πρόσβαση emoticon</string>
-  <string name="show_emoticons_pref_summary">Εμφάνιση του πλήκτρου emoticon στο πληκτρολόγιο</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="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>
-  <!-- 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">Αποστολή email στο <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">Κλήση <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"><xliff:g id="used">%1$d</xliff:g> από <xliff:g id="total">%2$d</xliff:g> καταχωρήσεις κάρτας SIM σε χρήση</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">Αντιγραφή στη μνήμη 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">OK</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>
+    <string name="report_as_spam_to">Αναφορά ως ανεπιθύμητο στο %s</string>
+    <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>
+    <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>
+    <string name="priority_pref_title">Προτεραιότητα αποστολής</string>
+    <string name="priority_low">Χαμηλή</string>
+    <string name="priority_normal">Κανονική</string>
+    <string name="priority_high">Υψηλή</string>
+    <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>
+    <string name="swipe_to_delete_conversation_pref_title">Ολίσθηση για διαγραφή</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Σύρετε προς τα δεξιά για να διαγράψετε μια συζήτηση</string>
+    <string name="pref_quickmessage">Αναδυόμενο μήνυμα και απάντηση</string>
+    <string name="pref_quickmessage_title">Εμφάνιση αναδυόμενου μηνύματος</string>
+    <string name="pref_quickmessage_summary">Αυτόματη εμφάνιση αναδυόμενου μηνύματος για τα εισερχόμενα SMS</string>
+    <string name="pref_close_all_title">Κλείσιμο όλων</string>
+    <string name="pref_close_all_summary">Το κουμπί κλείσιμο κλείνει όλα τα μηνύματα</string>
+    <string name="message_counter">%1$d από %2$d</string>
+    <string name="button_close">Κλείσιμο</string>
+    <string name="button_view">Εμφάνιση</string>
+    <string name="button_templates">Πρότυπα</string>
+    <string name="qm_button_full_conversation">Πλήρης συνομιλία</string>
+    <string name="type_to_reply_text_enter_to_send">Πληκτρολογήστε για να απαντήσετε</string>
+    <string name="toast_sending_message">Αποστολή μηνύματος\u2026</string>
+    <string name="qm_quick_reply">Γρήγορη απάντηση</string>
+    <string name="send">Αποστολή</string>
+    <string name="compose_message_hint_text">Εισάγετε μήνυμα</string>
+    <string name="show_emoticons_pref_title">Πρόσβαση emoticon</string>
+    <string name="show_emoticons_pref_summary">Εμφάνιση του πλήκτρου emoticon στο πληκτρολόγιο</string>
+    <string name="select_phone_account_title">Αποστολή με</string>
+    <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="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>
+    <string name="sim_empty">Δεν υπάρχουν μηνύματα στην κάρτα SIM.</string>
+    <string name="menu_send_email">Αποστολή email στο <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Κλήση <xliff:g id="name">%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"><xliff:g id="used">%1$d</xliff:g> από <xliff:g id="total">%2$d</xliff:g> καταχωρήσεις κάρτας SIM σε χρήση</string>
+    <string name="confirm_dialog_title">Διαγραφή;</string>
+    <string name="sim_manage_messages_title">Μηνύματα κειμένου στην κάρτα SIM</string>
+    <string name="refreshing">Ανανέωση\u2026</string>
+    <string name="confirm_delete_selected_messages">Το επιλεγμένο μήνυμα θα διαγραφεί.</string>
+    <string name="delete">Διαγραφή</string>
+    <string name="menu_forward">Προώθηση</string>
+    <string name="menu_reply">Απάντηση</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Αντιγραφή στη μνήμη tablet</string>
+    <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>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Αντιγραφή μήνυματος στην κάρτα SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <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>
 </resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 6a968e9..f3609e9 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Report as spam to %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Strip Unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Leave characters intact</string>
-  <string name="pref_unicode_stripping_non_encodable">Strip non-encodable characters</string>
-  <string name="pref_unicode_stripping_all">Strip all unicode characters</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Validity period</string>
-  <string name="validity_period_slot1_pref_title">Validity period for SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Validity period for SIM 2</string>
-  <string name="sms_validity_period_not_set">Not set</string>
-  <string name="sms_validity_period_one_hour">1 hour</string>
-  <string name="sms_validity_period_six_hours">6 hours</string>
-  <string name="sms_validity_period_twelve_hours">12 hours</string>
-  <string name="sms_validity_period_one_day">1 day</string>
-  <string name="mms_validity_period_two_days">2 days</string>
-  <string name="mms_validity_period_one_week">1 week</string>
-  <string name="validity_period_maximum">Maximum</string>
-  <string name="pref_summary_mms_delivery_reports">Request a delivery report for each message you send</string>
-  <string name="pref_summary_mms_read_reports">Request a read report for each message you send</string>
-  <string name="delivery_reports_mms_pref_title">Delivery reports</string>
-  <string name="read_reports_mms_pref_title">Read reports</string>
-  <string name="status_label">Status:\u0020</string>
-  <string name="status_read">Read</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Sending priority</string>
-  <string name="priority_low">Low</string>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">High</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Storage</string>
-  <string name="pref_summary_auto_delete">Delete old messages as limits are reached</string>
-  <string name="auto_delete_pref_title">Delete old messages</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> messages per conversation</string>
-  <string name="sms_delete_pref_title">Text message limit</string>
-  <string name="mms_delete_pref_title">Multimedia message limit</string>
-  <string name="set">Set</string>
-  <string name="no">Cancel</string>
-  <string name="pref_messages_to_save">Set number of messages to save</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Swipe to delete</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Swipe to the right to delete a conversation</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">QuickMessage and Reply</string>
-  <string name="pref_quickmessage_title">Show QuickMessage</string>
-  <string name="pref_quickmessage_summary">Automatically open the QuickMessage pop-up for incoming SMS messages</string>
-  <string name="pref_close_all_title">Close all</string>
-  <string name="pref_close_all_summary">Close button closes all messages</string>
-  <string name="message_counter">%1$d of %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Close</string>
-  <string name="button_view">View</string>
-  <string name="button_templates">Templates</string>
-  <string name="qm_button_full_conversation">Full conversation</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Type to reply</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Sending message\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Quick reply</string>
-  <string name="send">Send</string>
-  <string name="compose_message_hint_text">Enter message</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Emoticons access</string>
-  <string name="show_emoticons_pref_summary">Show the emoticons key on the keyboard</string>
-  <string name="select_phone_account_title">Send with</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Manage SIM card messages</string>
-  <string name="pref_title_manage_sim_messages_slot1">Manage SIM 1 messages</string>
-  <string name="pref_title_manage_sim_messages_slot2">Manage SIM 2 messages</string>
-  <string name="copy_to_sim">Copy message to SIM card</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> messages saved to SIM card.</string>
-  <string name="copy_to_sim_fail">Unable to save message</string>
-  <string name="copy_to_phone_success">Message saved</string>
-  <string name="copy_to_phone_fail">Unable to save message</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">No messages on SIM card.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Send email to <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">Call <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">Add <xliff:g id="contactEmailOrNumber">%s</xliff:g> to People</string>
-  <string name="sim_capacity_title">SIM capacity</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> SIM card entries are used</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Delete?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Text messages on SIM card</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Refreshing\u2026</string>
-  <string name="confirm_delete_selected_messages">Selected message will be deleted.</string>
-  <!-- Delete button title -->
-  <string name="delete">Delete</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Forward</string>
-  <string name="menu_reply">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">Copy to tablet memory</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Copy to phone memory</string>
-  <string name="selected_all">Select all</string>
-  <string name="deselected_all">Deselect all</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> selected</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">Copy message to SIM card</string>
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Choose images or videos from this device</string>
-  <string name="mediapicker_audioListChooserDescription">Choose audio files from this device</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Can\'t attach video. Max message size exceeded.</string>
-  <string name="mediapicker_audio_list_title">Choose audio</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">The audio is selected.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">The audio is unselected.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selected</string>
+    <string name="report_as_spam_to">Report as spam to %s</string>
+    <string name="unicode_stripping_pref_title">Strip Unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Leave characters intact</string>
+    <string name="pref_unicode_stripping_non_encodable">Strip non-encodable characters</string>
+    <string name="pref_unicode_stripping_all">Strip all unicode characters</string>
+    <string name="validity_period_pref_title">Validity period</string>
+    <string name="validity_period_slot1_pref_title">Validity period for SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Validity period for SIM 2</string>
+    <string name="sms_validity_period_not_set">Not set</string>
+    <string name="sms_validity_period_one_hour">1 hour</string>
+    <string name="sms_validity_period_six_hours">6 hours</string>
+    <string name="sms_validity_period_twelve_hours">12 hours</string>
+    <string name="sms_validity_period_one_day">1 day</string>
+    <string name="mms_validity_period_two_days">2 days</string>
+    <string name="mms_validity_period_one_week">1 week</string>
+    <string name="validity_period_maximum">Maximum</string>
+    <string name="pref_summary_mms_delivery_reports">Request a delivery report for each message you send</string>
+    <string name="pref_summary_mms_read_reports">Request a read report for each message you send</string>
+    <string name="delivery_reports_mms_pref_title">Delivery reports</string>
+    <string name="read_reports_mms_pref_title">Read reports</string>
+    <string name="status_label">Status:\u0020</string>
+    <string name="status_read">Read</string>
+    <string name="priority_pref_title">Sending priority</string>
+    <string name="priority_low">Low</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">High</string>
+    <string name="sms_storage_pref_title">Storage</string>
+    <string name="pref_summary_auto_delete">Delete old messages as limits are reached</string>
+    <string name="auto_delete_pref_title">Delete old messages</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> messages per conversation</string>
+    <string name="sms_delete_pref_title">Text message limit</string>
+    <string name="mms_delete_pref_title">Multimedia message limit</string>
+    <string name="set">Set</string>
+    <string name="no">Cancel</string>
+    <string name="pref_messages_to_save">Set number of messages to save</string>
+    <string name="swipe_to_delete_conversation_pref_title">Swipe to delete</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Swipe to the right to delete a conversation</string>
+    <string name="pref_quickmessage">QuickMessage and Reply</string>
+    <string name="pref_quickmessage_title">Show QuickMessage</string>
+    <string name="pref_quickmessage_summary">Automatically open the QuickMessage pop-up for incoming SMS messages</string>
+    <string name="pref_close_all_title">Close all</string>
+    <string name="pref_close_all_summary">Close button closes all messages</string>
+    <string name="message_counter">%1$d of %2$d</string>
+    <string name="button_close">Close</string>
+    <string name="button_view">View</string>
+    <string name="button_templates">Templates</string>
+    <string name="qm_button_full_conversation">Full conversation</string>
+    <string name="type_to_reply_text_enter_to_send">Type to reply</string>
+    <string name="toast_sending_message">Sending message\u2026</string>
+    <string name="qm_quick_reply">Quick reply</string>
+    <string name="send">Send</string>
+    <string name="compose_message_hint_text">Enter message</string>
+    <string name="show_emoticons_pref_title">Emoticons access</string>
+    <string name="show_emoticons_pref_summary">Show the emoticons key on the keyboard</string>
+    <string name="select_phone_account_title">Send with</string>
+    <string name="pref_title_manage_sim_messages">Manage SIM card messages</string>
+    <string name="pref_title_manage_sim_messages_slot1">Manage SIM 1 messages</string>
+    <string name="pref_title_manage_sim_messages_slot2">Manage SIM 2 messages</string>
+    <string name="copy_to_sim">Copy message to SIM card</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> messages saved to SIM card.</string>
+    <string name="copy_to_sim_fail">Unable to save message</string>
+    <string name="copy_to_phone_success">Message saved</string>
+    <string name="copy_to_phone_fail">Unable to save message</string>
+    <string name="sim_empty">No messages on SIM card.</string>
+    <string name="menu_send_email">Send email to <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Call <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Add <xliff:g id="contactEmailOrNumber">%s</xliff:g> to People</string>
+    <string name="sim_capacity_title">SIM capacity</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> SIM card entries are used</string>
+    <string name="confirm_dialog_title">Delete?</string>
+    <string name="sim_manage_messages_title">Text messages on SIM card</string>
+    <string name="refreshing">Refreshing\u2026</string>
+    <string name="confirm_delete_selected_messages">Selected message will be deleted.</string>
+    <string name="delete">Delete</string>
+    <string name="menu_forward">Forward</string>
+    <string name="menu_reply">Reply</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Copy to tablet memory</string>
+    <string name="sim_copy_to_phone_memory" product="default">Copy to phone memory</string>
+    <string name="selected_all">Select all</string>
+    <string name="deselected_all">Deselect all</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> selected</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Copy message to SIM card</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Choose images or videos from this device</string>
+    <string name="mediapicker_audioListChooserDescription">Choose audio files from this device</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Can\'t attach video. Max message size exceeded.</string>
+    <string name="mediapicker_audio_list_title">Choose audio</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">The audio is selected.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">The audio is unselected.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selected</string>
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 31c1659..0d79f41 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Report as spam to %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Strip unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Leave characters intact</string>
-  <string name="pref_unicode_stripping_non_encodable">Strip non-encodable characters</string>
-  <string name="pref_unicode_stripping_all">Strip all unicode characters</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Validity period</string>
-  <string name="validity_period_slot1_pref_title">Validity period for SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Validity period for SIM 2</string>
-  <string name="sms_validity_period_not_set">Not set</string>
-  <string name="sms_validity_period_one_hour">1 hour</string>
-  <string name="sms_validity_period_six_hours">6 hours</string>
-  <string name="sms_validity_period_twelve_hours">12 hours</string>
-  <string name="sms_validity_period_one_day">1 day</string>
-  <string name="mms_validity_period_two_days">2 days</string>
-  <string name="mms_validity_period_one_week">1 week</string>
-  <string name="validity_period_maximum">Maximum</string>
-  <string name="pref_summary_mms_delivery_reports">Request a delivery report for each message you send</string>
-  <string name="pref_summary_mms_read_reports">Request a read report for each message you send</string>
-  <string name="delivery_reports_mms_pref_title">Delivery reports</string>
-  <string name="read_reports_mms_pref_title">Read reports</string>
-  <string name="status_label">Status:\u0020</string>
-  <string name="status_read">Read</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Sending priority</string>
-  <string name="priority_low">Low</string>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">High</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Storage</string>
-  <string name="pref_summary_auto_delete">Delete old messages as limits are reached</string>
-  <string name="auto_delete_pref_title">Delete old messages</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> messages per conversation</string>
-  <string name="sms_delete_pref_title">Text message limit</string>
-  <string name="mms_delete_pref_title">Multimedia message limit</string>
-  <string name="set">Set</string>
-  <string name="no">Cancel</string>
-  <string name="pref_messages_to_save">Set number of messages to save</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Swipe to delete</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Swipe to the right to delete a conversation</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">QuickMessage and Reply</string>
-  <string name="pref_quickmessage_title">Show QuickMessage</string>
-  <string name="pref_quickmessage_summary">Automatically open the QuickMessage pop-up for incoming SMS messages</string>
-  <string name="pref_close_all_title">Close all</string>
-  <string name="pref_close_all_summary">Close button closes all messages</string>
-  <string name="message_counter">%1$d of %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Close</string>
-  <string name="button_view">View</string>
-  <string name="button_templates">Templates</string>
-  <string name="qm_button_full_conversation">Full conversation</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Type to reply</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Sending message\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Quick reply</string>
-  <string name="send">Send</string>
-  <string name="compose_message_hint_text">Enter message</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Emoticons access</string>
-  <string name="show_emoticons_pref_summary">Show the emoticons key on the keyboard</string>
-  <string name="select_phone_account_title">Send with</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Manage SIM card messages</string>
-  <string name="pref_title_manage_sim_messages_slot1">Manage SIM 1 messages</string>
-  <string name="pref_title_manage_sim_messages_slot2">Manage SIM 2 messages</string>
-  <string name="copy_to_sim">Copy message to SIM card</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> messages saved to SIM card.</string>
-  <string name="copy_to_sim_fail">Unable to save message</string>
-  <string name="copy_to_phone_success">Message saved</string>
-  <string name="copy_to_phone_fail">Unable to save message</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">No messages on SIM card.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Send email to <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">Call <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">Add <xliff:g id="contactEmailOrNumber">%s</xliff:g> to People</string>
-  <string name="sim_capacity_title">SIM capacity</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> SIM card entries are used</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Delete?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Text messages on SIM card</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Refreshing\u2026</string>
-  <string name="confirm_delete_selected_messages">Selected message will be deleted.</string>
-  <!-- Delete button title -->
-  <string name="delete">Delete</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Forward</string>
-  <string name="menu_reply">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">Copy to tablet memory</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Copy to phone memory</string>
-  <string name="selected_all">Select all</string>
-  <string name="deselected_all">Deselect all</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> selected</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">Copy message to SIM card</string>
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Choose images or videos from this device</string>
-  <string name="mediapicker_audioListChooserDescription">Choose audio files from this device</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Can\'t attach video. Max message size exceeded.</string>
-  <string name="mediapicker_audio_list_title">Choose audio</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">The audio is selected.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">The audio is unselected.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selected</string>
+    <string name="report_as_spam_to">Report as spam to %s</string>
+    <string name="unicode_stripping_pref_title">Strip unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Leave characters intact</string>
+    <string name="pref_unicode_stripping_non_encodable">Strip non-encodable characters</string>
+    <string name="pref_unicode_stripping_all">Strip all unicode characters</string>
+    <string name="validity_period_pref_title">Validity period</string>
+    <string name="validity_period_slot1_pref_title">Validity period for SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Validity period for SIM 2</string>
+    <string name="sms_validity_period_not_set">Not set</string>
+    <string name="sms_validity_period_one_hour">1 hour</string>
+    <string name="sms_validity_period_six_hours">6 hours</string>
+    <string name="sms_validity_period_twelve_hours">12 hours</string>
+    <string name="sms_validity_period_one_day">1 day</string>
+    <string name="mms_validity_period_two_days">2 days</string>
+    <string name="mms_validity_period_one_week">1 week</string>
+    <string name="validity_period_maximum">Maximum</string>
+    <string name="pref_summary_mms_delivery_reports">Request a delivery report for each message you send</string>
+    <string name="pref_summary_mms_read_reports">Request a read report for each message you send</string>
+    <string name="delivery_reports_mms_pref_title">Delivery reports</string>
+    <string name="read_reports_mms_pref_title">Read reports</string>
+    <string name="status_label">Status:\u0020</string>
+    <string name="status_read">Read</string>
+    <string name="priority_pref_title">Sending priority</string>
+    <string name="priority_low">Low</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">High</string>
+    <string name="sms_storage_pref_title">Storage</string>
+    <string name="pref_summary_auto_delete">Delete old messages as limits are reached</string>
+    <string name="auto_delete_pref_title">Delete old messages</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> messages per conversation</string>
+    <string name="sms_delete_pref_title">Text message limit</string>
+    <string name="mms_delete_pref_title">Multimedia message limit</string>
+    <string name="set">Set</string>
+    <string name="no">Cancel</string>
+    <string name="pref_messages_to_save">Set number of messages to save</string>
+    <string name="swipe_to_delete_conversation_pref_title">Swipe to delete</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Swipe to the right to delete a conversation</string>
+    <string name="pref_quickmessage">QuickMessage and Reply</string>
+    <string name="pref_quickmessage_title">Show QuickMessage</string>
+    <string name="pref_quickmessage_summary">Automatically open the QuickMessage pop-up for incoming SMS messages</string>
+    <string name="pref_close_all_title">Close all</string>
+    <string name="pref_close_all_summary">Close button closes all messages</string>
+    <string name="message_counter">%1$d of %2$d</string>
+    <string name="button_close">Close</string>
+    <string name="button_view">View</string>
+    <string name="button_templates">Templates</string>
+    <string name="qm_button_full_conversation">Full conversation</string>
+    <string name="type_to_reply_text_enter_to_send">Type to reply</string>
+    <string name="toast_sending_message">Sending message\u2026</string>
+    <string name="qm_quick_reply">Quick reply</string>
+    <string name="send">Send</string>
+    <string name="compose_message_hint_text">Enter message</string>
+    <string name="show_emoticons_pref_title">Emoticons access</string>
+    <string name="show_emoticons_pref_summary">Show the emoticons key on the keyboard</string>
+    <string name="select_phone_account_title">Send with</string>
+    <string name="pref_title_manage_sim_messages">Manage SIM card messages</string>
+    <string name="pref_title_manage_sim_messages_slot1">Manage SIM 1 messages</string>
+    <string name="pref_title_manage_sim_messages_slot2">Manage SIM 2 messages</string>
+    <string name="copy_to_sim">Copy message to SIM card</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> messages saved to SIM card.</string>
+    <string name="copy_to_sim_fail">Unable to save message</string>
+    <string name="copy_to_phone_success">Message saved</string>
+    <string name="copy_to_phone_fail">Unable to save message</string>
+    <string name="sim_empty">No messages on SIM card.</string>
+    <string name="menu_send_email">Send email to <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Call <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Add <xliff:g id="contactEmailOrNumber">%s</xliff:g> to People</string>
+    <string name="sim_capacity_title">SIM capacity</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> SIM card entries are used</string>
+    <string name="confirm_dialog_title">Delete?</string>
+    <string name="sim_manage_messages_title">Text messages on SIM card</string>
+    <string name="refreshing">Refreshing\u2026</string>
+    <string name="confirm_delete_selected_messages">Selected message will be deleted.</string>
+    <string name="delete">Delete</string>
+    <string name="menu_forward">Forward</string>
+    <string name="menu_reply">Reply </string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Copy to tablet memory</string>
+    <string name="sim_copy_to_phone_memory" product="default">Copy to phone memory</string>
+    <string name="selected_all">Select all</string>
+    <string name="deselected_all">Deselect all</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> selected</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Copy message to SIM card</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Choose images or videos from this device</string>
+    <string name="mediapicker_audioListChooserDescription">Choose audio files from this device</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Can\'t attach video. Max message size exceeded.</string>
+    <string name="mediapicker_audio_list_title">Choose audio</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">The audio is selected.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">The audio is unselected.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selected</string>
 </resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 8144cb0..428b494 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Report as spam to %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Strip unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Leave characters intact</string>
-  <string name="pref_unicode_stripping_non_encodable">Strip non-encodable characters</string>
-  <string name="pref_unicode_stripping_all">Strip all unicode characters</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Validity period</string>
-  <string name="validity_period_slot1_pref_title">Validity period for SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Validity period for SIM 2</string>
-  <string name="sms_validity_period_not_set">Not set</string>
-  <string name="sms_validity_period_one_hour">1 hour</string>
-  <string name="sms_validity_period_six_hours">6 hours</string>
-  <string name="sms_validity_period_twelve_hours">12 hours</string>
-  <string name="sms_validity_period_one_day">1 day</string>
-  <string name="mms_validity_period_two_days">2 days</string>
-  <string name="mms_validity_period_one_week">1 week</string>
-  <string name="validity_period_maximum">Maximum</string>
-  <string name="pref_summary_mms_delivery_reports">Request a delivery report for each message you send</string>
-  <string name="pref_summary_mms_read_reports">Request a read report for each message you send</string>
-  <string name="delivery_reports_mms_pref_title">Delivery reports</string>
-  <string name="read_reports_mms_pref_title">Read reports</string>
-  <string name="status_label">Status:\u0020</string>
-  <string name="status_read">Read</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Sending priority</string>
-  <string name="priority_low">Low</string>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">High</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Storage</string>
-  <string name="pref_summary_auto_delete">Delete old messages as limits are reached</string>
-  <string name="auto_delete_pref_title">Delete old messages</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> messages per conversation</string>
-  <string name="sms_delete_pref_title">Text message limit</string>
-  <string name="mms_delete_pref_title">Multimedia message limit</string>
-  <string name="set">Set</string>
-  <string name="no">Cancel</string>
-  <string name="pref_messages_to_save">Set number of messages to save</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Swipe to delete</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Swipe to the right to delete a conversation</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">QuickMessage and Reply</string>
-  <string name="pref_quickmessage_title">Show QuickMessage</string>
-  <string name="pref_quickmessage_summary">Automatically open the QuickMessage pop-up for incoming SMS messages</string>
-  <string name="pref_close_all_title">Close all</string>
-  <string name="pref_close_all_summary">Close button closes all messages</string>
-  <string name="message_counter">%1$d of %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Close</string>
-  <string name="button_view">View</string>
-  <string name="button_templates">Templates</string>
-  <string name="qm_button_full_conversation">Full conversation</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Type to reply</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Sending message\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Quick reply</string>
-  <string name="send">Send</string>
-  <string name="compose_message_hint_text">Enter message</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Emoticons access</string>
-  <string name="show_emoticons_pref_summary">Show the emoticons key on the keyboard</string>
-  <string name="select_phone_account_title">Send with</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Manage SIM card messages</string>
-  <string name="pref_title_manage_sim_messages_slot1">Manage SIM 1 messages</string>
-  <string name="pref_title_manage_sim_messages_slot2">Manage SIM 2 messages</string>
-  <string name="copy_to_sim">Copy message to SIM card</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> messages saved to SIM card.</string>
-  <string name="copy_to_sim_fail">Unable to save message</string>
-  <string name="copy_to_phone_success">Message saved</string>
-  <string name="copy_to_phone_fail">Unable to save message</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">No messages on SIM card.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Send email to <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">Call <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">Add <xliff:g id="contactEmailOrNumber">%s</xliff:g> to People</string>
-  <string name="sim_capacity_title">SIM capacity</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> SIM card entries are used</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Delete?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Text messages on SIM card</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Refreshing\u2026</string>
-  <string name="confirm_delete_selected_messages">Selected message will be deleted.</string>
-  <!-- Delete button title -->
-  <string name="delete">Delete</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Forward</string>
-  <string name="menu_reply">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">Copy to tablet memory</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Copy to phone memory</string>
-  <string name="selected_all">Select all</string>
-  <string name="deselected_all">Deselect all</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> selected</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">Copy message to SIM card</string>
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Choose images or videos from this device</string>
-  <string name="mediapicker_audioListChooserDescription">Choose audio files from this device</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Can\'t attach video. Max message size exceeded.</string>
-  <string name="mediapicker_audio_list_title">Choose audio</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">The audio is selected.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">The audio is unselected.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selected</string>
+    <string name="report_as_spam_to">Report as spam to %s</string>
+    <string name="unicode_stripping_pref_title">Strip unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Leave characters intact</string>
+    <string name="pref_unicode_stripping_non_encodable">Strip non-encodable characters</string>
+    <string name="pref_unicode_stripping_all">Strip all unicode characters</string>
+    <string name="validity_period_pref_title">Validity period</string>
+    <string name="validity_period_slot1_pref_title">Validity period for SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Validity period for SIM 2</string>
+    <string name="sms_validity_period_not_set">Not set</string>
+    <string name="sms_validity_period_one_hour">1 hour</string>
+    <string name="sms_validity_period_six_hours">6 hours</string>
+    <string name="sms_validity_period_twelve_hours">12 hours</string>
+    <string name="sms_validity_period_one_day">1 day</string>
+    <string name="mms_validity_period_two_days">2 days</string>
+    <string name="mms_validity_period_one_week">1 week</string>
+    <string name="validity_period_maximum">Maximum</string>
+    <string name="pref_summary_mms_delivery_reports">Request a delivery report for each message you send</string>
+    <string name="pref_summary_mms_read_reports">Request a read report for each message you send</string>
+    <string name="delivery_reports_mms_pref_title">Delivery reports</string>
+    <string name="read_reports_mms_pref_title">Read reports</string>
+    <string name="status_label">Status:\u0020</string>
+    <string name="status_read">Read</string>
+    <string name="priority_pref_title">Sending priority</string>
+    <string name="priority_low">Low</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">High</string>
+    <string name="sms_storage_pref_title">Storage</string>
+    <string name="pref_summary_auto_delete">Delete old messages as limits are reached</string>
+    <string name="auto_delete_pref_title">Delete old messages</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> messages per conversation</string>
+    <string name="sms_delete_pref_title">Text message limit</string>
+    <string name="mms_delete_pref_title">Multimedia message limit</string>
+    <string name="set">Set</string>
+    <string name="no">Cancel</string>
+    <string name="pref_messages_to_save">Set number of messages to save</string>
+    <string name="swipe_to_delete_conversation_pref_title">Swipe to delete</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Swipe to the right to delete a conversation</string>
+    <string name="pref_quickmessage">QuickMessage and Reply</string>
+    <string name="pref_quickmessage_title">Show QuickMessage</string>
+    <string name="pref_quickmessage_summary">Automatically open the QuickMessage pop-up for incoming SMS messages</string>
+    <string name="pref_close_all_title">Close all</string>
+    <string name="pref_close_all_summary">Close button closes all messages</string>
+    <string name="message_counter">%1$d of %2$d</string>
+    <string name="button_close">Close</string>
+    <string name="button_view">View</string>
+    <string name="button_templates">Templates</string>
+    <string name="qm_button_full_conversation">Full conversation</string>
+    <string name="type_to_reply_text_enter_to_send">Type to reply</string>
+    <string name="toast_sending_message">Sending message\u2026</string>
+    <string name="qm_quick_reply">Quick reply</string>
+    <string name="send">Send</string>
+    <string name="compose_message_hint_text">Enter message</string>
+    <string name="show_emoticons_pref_title">Emoticons access</string>
+    <string name="show_emoticons_pref_summary">Show the emoticons key on the keyboard</string>
+    <string name="select_phone_account_title">Send with</string>
+    <string name="pref_title_manage_sim_messages">Manage SIM card messages</string>
+    <string name="pref_title_manage_sim_messages_slot1">Manage SIM 1 messages</string>
+    <string name="pref_title_manage_sim_messages_slot2">Manage SIM 2 messages</string>
+    <string name="copy_to_sim">Copy message to SIM card</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> messages saved to SIM card.</string>
+    <string name="copy_to_sim_fail">Unable to save message</string>
+    <string name="copy_to_phone_success">Message saved</string>
+    <string name="copy_to_phone_fail">Unable to save message</string>
+    <string name="sim_empty">No messages on SIM card.</string>
+    <string name="menu_send_email">Send email to <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Call <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Add <xliff:g id="contactEmailOrNumber">%s</xliff:g> to People</string>
+    <string name="sim_capacity_title">SIM capacity</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> SIM card entries are used</string>
+    <string name="confirm_dialog_title">Delete?</string>
+    <string name="sim_manage_messages_title">Text messages on SIM card</string>
+    <string name="refreshing">Refreshing\u2026</string>
+    <string name="confirm_delete_selected_messages">Selected message will be deleted.</string>
+    <string name="delete">Delete</string>
+    <string name="menu_forward">Forward</string>
+    <string name="menu_reply">Reply</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Copy to tablet memory</string>
+    <string name="sim_copy_to_phone_memory" product="default">Copy to phone memory</string>
+    <string name="selected_all">Select all</string>
+    <string name="deselected_all">Deselect all</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> selected</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Copy message to SIM card</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Choose images or videos from this device</string>
+    <string name="mediapicker_audioListChooserDescription">Choose audio files from this device</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Can\'t attach video. Max message size exceeded.</string>
+    <string name="mediapicker_audio_list_title">Choose audio</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">The audio is selected.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">The audio is unselected.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selected</string>
 </resources>
diff --git a/res/values-en-rPT/arrays.xml b/res/values-en-rPT/arrays.xml
deleted file mode 100644
index f2be096..0000000
--- a/res/values-en-rPT/arrays.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String to match as no subject and filter out as a subject. For example, if the
-         subject string is "no subject", we won't display that. We'll pretend
-         no subject string was delivered. -->
-  <!-- Choices for quick-reply to message notification. Users with an Android
-    Wear device (e.g. smartwatch) can reply to messages either by speaking their
-    response, or choosing one of these predefined options. -->
-</resources>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-en-rPT/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-en-rPT/strings.xml b/res/values-en-rPT/strings.xml
deleted file mode 100644
index d73a67e..0000000
--- a/res/values-en-rPT/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- The name of the application as it appears under the main Launcher icon and in various activity titles -->
-  <!-- The name of the application as it appears in external share intent dialogs -->
-  <!-- The title when selecting a conversation to share to -->
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <!-- The tab header for the frequently used contacts list -->
-  <!-- The tab header for all contacts list -->
-  <!-- The text on the list item in the contact picker that allows a user to send an SMS directly
-         to a number that he/she typed. eg. "Send to 650-555-1234" -->
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <!-- Abbreviated message to express that something occurred some number of hours in the past (e.g., 5 hours ago). -->
-  <!-- Abbreviated message to express that something occurred some number of days in the past (e.g., 5 days ago). -->
-  <!--
-        Plurals used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <!-- Title of the class-0 message activity. -->
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <!-- Title for SMS storage low notification and dialog. Must match the framework's notification title, i.e. //frameworks/base/core/res/res/values/strings.xml#low_internal_storage_view_title -->
-  <!-- Text for SMS storage low notification and dialog -->
-  <!-- Ticker for SMS storage low notification -->
-  <!-- Title for asking the user to enter their phone number -->
-  <!-- Text for asking the user to enter their phone number -->
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <!-- Free SMS storage actions -->
-  <!-- Free SMS storage action confirm dialog message -->
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <!-- While sending a message display this message. -->
-  <!-- When sending a message failed display this message. -->
-  <!-- When retrying sending for a message. -->
-  <!-- When showing resend action display this message. -->
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <!-- When showing resend action, display this message. -->
-  <!-- Title line for an MMS requiring manual download. -->
-  <!-- Title line for an MMS auto-downloading. -->
-  <!-- Title line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which is selected. -->
-  <!-- Timestamp line to display while downloading a message. -->
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <!-- Display this info line with an MMS notification -->
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for download failed -->
-  <!-- notification line 1 for multiple downloads failed -->
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <!-- Notification content when emergency SMS fails to send -->
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <!-- Content description text for Back button on the action bar -->
-  <!-- Action menu title for showing archived conversations -->
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <!-- An enumeration comma for separating multiple names in notifications. [CHAR LIMIT=2] -->
-  <!-- Separator between parts of a notification in each line of an inboxStyle notification. [CHAR LIMIT=2] -->
-  <!-- Separator between title and content in notification ticker -->
-  <!-- Separator between title and content in notifications -->
-  <!-- Shown in notifications when there's a picture. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <!-- Shown in the Android Wear conversation log as the sender for outgoing messages,
-         when we don't know the user's real name (e.g. no "Me" contact on the phone). -->
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <!-- Accessibility announcement for an incoming message -->
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <!-- Accessibility description for conversation list for group conversations -->
-  <!-- Accessibility description for conversation list for failed messages -->
-  <!-- Accessibility name for a group conversation -->
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <!-- Title for the preferences/settings activity -->
-  <!-- Title for the archived conversations activity -->
-  <!-- Action title: Close -->
-  <!-- Preference category: MMS messaging -->
-  <!-- Preference category: Advanced -->
-  <!-- Preference category: Debug -->
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <!-- Title for the notification sound preference -->
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <!-- Preference summary: Current default SMS app -->
-  <!-- Preference title: MMS phone number -->
-  <!-- Display text for phone number preference when the number is unknown -->
-  <!-- Title for the preference for playing a message send sound -->
-  <!-- Strings for dump sms/mms dialog -->
-  <!-- Title of long press menu on an individual message. -->
-  <!-- Menu item to copy message text -->
-  <!-- Title of long press menu for details about an individual message. -->
-  <!-- Title of long press menu for deleting an individual message. -->
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <!-- Title of "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <!-- Sender to be used if the sender address has been hidden -->
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <!-- Notifies the user when an attachment fails to load -->
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <!-- Title for the "People and Options" activity -->
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <!-- Title for the phone call button in the action bar that lets the user call a participant in an SMS conversation -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <!-- The hint text shown in the message compose input box when photo(s) is attached -->
-  <!-- The hint text shown in the message compose input box when audio recording(s) is attached -->
-  <!-- The hint text shown in the message compose input box when video(s) is attached -->
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <!-- Announcement after the user adds or removes an attachment -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <!-- The format of the subtitle of the help activity. -->
-  <!--  Action menu title to let users view open source license -->
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <!-- Reached MMS message attachment limit -->
-  <!-- Message attachment load failed -->
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- When there's a subject in an mms, the subject + message are shown in a notification -->
-  <!-- Text shown on contact VCard when it's being loaded -->
-  <!-- Text shown on contact VCard when it failed to load -->
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <!-- Title for the activity that shows details of VCards -->
-  <!-- VCard label for displaying birthdays -->
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <!-- Title for the message forwarding dialog -->
-  <!-- Title for the message reply dialog -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <!-- Dialog button text that closes the application. -->
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <!-- A message in conversation list view to indicate that the snipit text and preview is from an unsent draft. -->
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <!-- Indicates that the current message will be sent via MMS -->
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <!-- Title of block confirmation dialog -->
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <!-- The title of the list of blocked contacts -->
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <!-- Accessibility toast shown when a message is sending. -->
-  <!-- Accessibility toast shown when a message is sent. -->
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <!-- Accessibility : content description for numbers -->
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <!-- Text prepended to the subject of a forwarded message -->
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <!-- The notification toast text and action button label shown at bottom of screen, for when a new message comes in while the user
-         is in that conversation, but the message list is not scrolled to the bottom -->
-  <!-- Content description for the message images in a conversation or for the image preview in the conversation list if the lastest message in that conversation contains an image-->
-  <!-- Text for a toast message notifying the user that we can't find an appropriate application to handle their request -->
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Screen title after user selects APNs setting option -->
-  <!-- Edit access point label summary text when no value has been set -->
-  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
-  <!-- Edit access point labels: The actual access point name-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The type of APN -->
-  <!-- Edit access point screen menu option to delete this APN -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <!-- APNs screen menu option to reset default APN settings -->
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <!-- Title for Access Point Names settings -->
-  <!-- Title for Access Point Names settings activity -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <!-- The title for general settings section in the settings activity  -->
-  <!-- The title for advanced settings section in the settings activity  -->
-  <!-- The title for general settings activity  -->
-  <!-- The title for advanced settings activity  -->
-  <!-- The title for sim_specific settings  -->
-  <!-- The group MMS choices in settings -->
-  <!-- SIM number shown in the settings when the number is not known -->
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <!-- Content description for the SIM selector button in the conversation -->
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <!-- Content description for the audio record view -->
-  <!-- Content description for new conversation button in desktop widget -->
-  <!-- Content description for widget title -->
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <!-- Content description for new message button in desktop widget -->
-  <!-- Content description for conversation list button in desktop widget -->
-  <!-- Shown when loading conversations in the widget -->
-  <!-- Shown when loading messages in the widget -->
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <!-- Toast message telling the user that someone was blocked -->
-  <!-- Toast message telling the user that someone was unblocked -->
-  <!-- Title for attachment chooser activity -->
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message load failed -->
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <!-- When converting html to text link urls are inlined.  This specifies how the link should be
-    displayed.  For example, a link "click here" which navigates to "www.google.com" would have
-    text="click here" and url="www.google.com", using the below format to create "click here (www.google.com)" -->
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
-</resources>
diff --git a/res/values-eo/arrays.xml b/res/values-eo/arrays.xml
index 465fe06..2e19b71 100644
--- a/res/values-eo/arrays.xml
+++ b/res/values-eo/arrays.xml
@@ -16,23 +16,17 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String to match as no subject and filter out as a subject. For example, if the
-         subject string is "no subject", we won't display that. We'll pretend
-         no subject string was delivered. -->
-  <!-- Choices for quick-reply to message notification. Users with an Android
-    Wear device (e.g. smartwatch) can reply to messages either by speaking their
-    response, or choosing one of these predefined options. -->
-  <string-array name="notification_reply_choices">
-    <item>Jes</item>
-    <item>Ne</item>
-    <item>OK</item>
-    <item>Hehe</item>
-    <item>Dankon</item>
-    <item>I agree</item>
-    <item>Nice</item>
-    <item>On my way</item>
-    <item>OK, let me get back to you later</item>
-    <item>:)</item>
-    <item>:(</item>
-  </string-array>
+    <string-array name="notification_reply_choices">
+        <item>Jes</item>
+        <item>Ne</item>
+        <item>OK</item>
+        <item>Hehe</item>
+        <item>Dankon</item>
+        <item>I agree</item>
+        <item>Nice</item>
+        <item>On my way</item>
+        <item>OK, let me get back to you later</item>
+        <item>:)</item>
+        <item>:(</item>
+    </string-array>
 </resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 01bce84..fe90bc6 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -16,44 +16,13 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="sms_validity_period_one_hour">1 horo</string>
-  <string name="sms_validity_period_six_hours">6 horoj</string>
-  <string name="sms_validity_period_twelve_hours">12 horoj</string>
-  <string name="sms_validity_period_one_day">1 tago</string>
-  <string name="mms_validity_period_two_days">2 tagoj</string>
-  <string name="mms_validity_period_one_week">1 semajno</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <string name="no">Nuligi</string>
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <string name="send">Sendi</string>
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <string name="delete">Forigi</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="sms_validity_period_one_hour">1 horo</string>
+    <string name="sms_validity_period_six_hours">6 horoj</string>
+    <string name="sms_validity_period_twelve_hours">12 horoj</string>
+    <string name="sms_validity_period_one_day">1 tago</string>
+    <string name="mms_validity_period_two_days">2 tagoj</string>
+    <string name="mms_validity_period_one_week">1 semajno</string>
+    <string name="no">Nuligi</string>
+    <string name="send">Sendi</string>
+    <string name="delete">Forigi</string>
 </resources>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index c705993..0e7416a 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -16,395 +16,58 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- The name of the application as it appears under the main Launcher icon and in various activity titles -->
-  <!-- The name of the application as it appears in external share intent dialogs -->
-  <!-- The title when selecting a conversation to share to -->
-  <string name="action_settings">Agordoj</string>
-  <string name="sendButtonContentDescription">Sendi mesaĝon</string>
-  <string name="settings_with_arrow">Agordoj &gt;</string>
-  <string name="settings">Agordoj</string>
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <!-- The tab header for the frequently used contacts list -->
-  <!-- The tab header for all contacts list -->
-  <string name="contact_picker_all_contacts_tab_title">Ĉiuj kontaktoj</string>
-  <!-- The text on the list item in the contact picker that allows a user to send an SMS directly
-         to a number that he/she typed. eg. "Send to 650-555-1234" -->
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <string name="mediapicker_gallery_image_item_description">bildo <xliff:g id="date">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g></string>
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <!-- Abbreviated message to express that something occurred some number of hours in the past (e.g., 5 hours ago). -->
-  <plurals name="num_hours_ago">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> horo</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> horoj</item>
-  </plurals>
-  <!-- Abbreviated message to express that something occurred some number of days in the past (e.g., 5 days ago). -->
-  <plurals name="num_days_ago">
-    <item quantity="one"><xliff:g id="count">%d</xliff:g> tago</item>
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> tagoj</item>
-  </plurals>
-  <!--
-        Plurals used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <plurals name="week_count">
-    <!-- Singular case -->
-    <item quantity="one">semajno</item>
-    <!-- Plural case -->
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> semajnoj</item>
-  </plurals>
-  <plurals name="month_count">
-    <!-- Singular case -->
-    <item quantity="one">monato</item>
-    <!-- Plural case -->
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> monatoj</item>
-  </plurals>
-  <plurals name="year_count">
-    <!-- Singular case -->
-    <item quantity="one">jari</item>
-    <!-- Plural case -->
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> jaroj</item>
-  </plurals>
-  <!-- Title of the class-0 message activity. -->
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <!-- Title for SMS storage low notification and dialog. Must match the framework's notification title, i.e. //frameworks/base/core/res/res/values/strings.xml#low_internal_storage_view_title -->
-  <!-- Text for SMS storage low notification and dialog -->
-  <!-- Ticker for SMS storage low notification -->
-  <!-- Title for asking the user to enter their phone number -->
-  <!-- Text for asking the user to enter their phone number -->
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <!-- Free SMS storage actions -->
-  <!-- Free SMS storage action confirm dialog message -->
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <!-- While sending a message display this message. -->
-  <!-- When sending a message failed display this message. -->
-  <!-- When retrying sending for a message. -->
-  <!-- When showing resend action display this message. -->
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <!-- When showing resend action, display this message. -->
-  <!-- Title line for an MMS requiring manual download. -->
-  <!-- Title line for an MMS auto-downloading. -->
-  <!-- Title line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which is selected. -->
-  <!-- Timestamp line to display while downloading a message. -->
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <!-- Display this info line with an MMS notification -->
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for download failed -->
-  <!-- notification line 1 for multiple downloads failed -->
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <!-- Notification content when emergency SMS fails to send -->
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <plurals name="notification_new_messages">
-    <item quantity="one">Nova mesaĝo</item>
-    <item quantity="other"><xliff:g id="messages">%d</xliff:g> novaj mesaĝoj</item>
-  </plurals>
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <!-- Content description text for Back button on the action bar -->
-  <!-- Action menu title for showing archived conversations -->
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <string name="action_delete">Forigi</string>
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <string name="action_delete_message">Forigi</string>
-  <string name="delete_message_confirmation_button">Forigi</string>
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <string name="delete_conversation_confirmation_button">Forigi</string>
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <string name="delete_conversation_decline_button">Nuligi</string>
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <!-- An enumeration comma for separating multiple names in notifications. [CHAR LIMIT=2] -->
-  <string name="enumeration_comma">,\u0020</string>
-  <!-- Separator between parts of a notification in each line of an inboxStyle notification. [CHAR LIMIT=2] -->
-  <string name="notification_separator">\u0020\u0020</string>
-  <!-- Separator between title and content in notification ticker -->
-  <string name="notification_ticker_separator">:\u0020</string>
-  <!-- Separator between title and content in notifications -->
-  <string name="notification_space_separator">\u0020\u0020</string>
-  <!-- Shown in notifications when there's a picture. [CHAR LIMIT=25] -->
-  <string name="notification_picture">Bildo</string>
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <!-- Shown in the Android Wear conversation log as the sender for outgoing messages,
-         when we don't know the user's real name (e.g. no "Me" contact on the phone). -->
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <!-- Accessibility announcement for an incoming message -->
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <!-- Accessibility description for conversation list for group conversations -->
-  <!-- Accessibility description for conversation list for failed messages -->
-  <!-- Accessibility name for a group conversation -->
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <!-- Title for the preferences/settings activity -->
-  <string name="settings_activity_title">Agordoj</string>
-  <!-- Title for the archived conversations activity -->
-  <!-- Action title: Close -->
-  <!-- Preference category: MMS messaging -->
-  <!-- Preference category: Advanced -->
-  <!-- Preference category: Debug -->
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <string name="notifications_enabled_pref_title">Sciigoj</string>
-  <!-- Title for the notification sound preference -->
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <!-- Preference summary: Current default SMS app -->
-  <!-- Preference title: MMS phone number -->
-  <!-- Display text for phone number preference when the number is unknown -->
-  <!-- Title for the preference for playing a message send sound -->
-  <!-- Strings for dump sms/mms dialog -->
-  <!-- Title of long press menu on an individual message. -->
-  <!-- Menu item to copy message text -->
-  <!-- Title of long press menu for details about an individual message. -->
-  <!-- Title of long press menu for deleting an individual message. -->
-  <string name="message_context_menu_delete_message">Forigi</string>
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <!-- Title of "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <!-- Sender to be used if the sender address has been hidden -->
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <!-- Notifies the user when an attachment fails to load -->
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <string name="chips_text_delete_button_content_description">Forigi tekston</string>
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <!-- Title for the "People and Options" activity -->
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <!-- Title for the phone call button in the action bar that lets the user call a participant in an SMS conversation -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <!-- The hint text shown in the message compose input box when photo(s) is attached -->
-  <!-- The hint text shown in the message compose input box when audio recording(s) is attached -->
-  <!-- The hint text shown in the message compose input box when video(s) is attached -->
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <!-- Announcement after the user adds or removes an attachment -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <!-- The format of the subtitle of the help activity. -->
-  <!--  Action menu title to let users view open source license -->
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <string name="notifications_enabled_conversation_pref_title">Sciigoj</string>
-  <!-- Reached MMS message attachment limit -->
-  <!-- Message attachment load failed -->
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- When there's a subject in an mms, the subject + message are shown in a notification -->
-  <!-- Text shown on contact VCard when it's being loaded -->
-  <!-- Text shown on contact VCard when it failed to load -->
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <!-- Title for the activity that shows details of VCards -->
-  <!-- VCard label for displaying birthdays -->
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <!-- Title for the message forwarding dialog -->
-  <!-- Title for the message reply dialog -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <!-- Dialog button text that closes the application. -->
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <string name="conversation_list_item_view_sent_from_you_prefix">Vi:\u0020</string>
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <!-- A message in conversation list view to indicate that the snipit text and preview is from an unsent draft. -->
-  <string name="conversation_list_item_view_draft_message">Malneto</string>
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <string name="conversation_list_snippet_picture">Bildo</string>
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <!-- Indicates that the current message will be sent via MMS -->
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <!-- Title of block confirmation dialog -->
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <!-- The title of the list of blocked contacts -->
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <!-- Accessibility toast shown when a message is sending. -->
-  <!-- Accessibility toast shown when a message is sent. -->
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <!-- Accessibility : content description for numbers -->
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <!-- Text prepended to the subject of a forwarded message -->
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <!-- The notification toast text and action button label shown at bottom of screen, for when a new message comes in while the user
-         is in that conversation, but the message list is not scrolled to the bottom -->
-  <string name="in_conversation_notify_new_message_text">Nova mesaĝo</string>
-  <!-- Content description for the message images in a conversation or for the image preview in the conversation list if the lastest message in that conversation contains an image-->
-  <!-- Text for a toast message notifying the user that we can't find an appropriate application to handle their request -->
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <!-- Label for new message button in share intent dialog -->
-  <string name="share_new_message">Nova mesaĝo</string>
-  <!-- Label for new message button in share intent dialog -->
-  <string name="share_cancel">Nuligi</string>
-  <!-- Screen title after user selects APNs setting option -->
-  <!-- Edit access point label summary text when no value has been set -->
-  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
-  <!-- Edit access point labels: The actual access point name-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The type of APN -->
-  <!-- Edit access point screen menu option to delete this APN -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <!-- APNs screen menu option to reset default APN settings -->
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <!-- Title for Access Point Names settings -->
-  <!-- Title for Access Point Names settings activity -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <!-- The title for general settings section in the settings activity  -->
-  <!-- The title for advanced settings section in the settings activity  -->
-  <!-- The title for general settings activity  -->
-  <!-- The title for advanced settings activity  -->
-  <!-- The title for sim_specific settings  -->
-  <!-- The group MMS choices in settings -->
-  <!-- SIM number shown in the settings when the number is not known -->
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <string name="secondary_user_new_message_title">Nova mesaĝo</string>
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <string name="secondary_user_new_message_ticker">Nova mesaĝo.</string>
-  <!-- Content description for the SIM selector button in the conversation -->
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <!-- Content description for the audio record view -->
-  <!-- Content description for new conversation button in desktop widget -->
-  <!-- Content description for widget title -->
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <!-- Content description for new message button in desktop widget -->
-  <string name="widget_new_message_content_description">Nova mesaĝo</string>
-  <!-- Content description for conversation list button in desktop widget -->
-  <!-- Shown when loading conversations in the widget -->
-  <!-- Shown when loading messages in the widget -->
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <!-- Toast message telling the user that someone was blocked -->
-  <!-- Toast message telling the user that someone was unblocked -->
-  <!-- Title for attachment chooser activity -->
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message load failed -->
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <!-- When converting html to text link urls are inlined.  This specifies how the link should be
-    displayed.  For example, a link "click here" which navigates to "www.google.com" would have
-    text="click here" and url="www.google.com", using the below format to create "click here (www.google.com)" -->
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
+    <string name="action_settings">Agordoj</string>
+    <string name="sendButtonContentDescription">Sendi mesaĝon</string>
+    <string name="settings_with_arrow">Agordoj &gt;</string>
+    <string name="settings">Agordoj</string>
+    <string name="contact_picker_all_contacts_tab_title">Ĉiuj kontaktoj</string>
+    <string name="mediapicker_gallery_image_item_description">bildo <xliff:g id="date">%1$tB %1$te %1$tY %1$tl %1$tM %1$tp</xliff:g></string>
+    <plurals name="num_hours_ago">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> horo</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> horoj</item>
+    </plurals>
+    <plurals name="num_days_ago">
+        <item quantity="one"><xliff:g id="count">%d</xliff:g> tago</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> tagoj</item>
+    </plurals>
+    <plurals name="week_count">
+        <item quantity="one">semajno</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> semajnoj</item>
+    </plurals>
+    <plurals name="month_count">
+        <item quantity="one">monato</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> monatoj</item>
+    </plurals>
+    <plurals name="year_count">
+        <item quantity="one">jari</item>
+        <item quantity="other"><xliff:g id="count">%d</xliff:g> jaroj</item>
+    </plurals>
+    <plurals name="notification_new_messages">
+        <item quantity="one">Nova mesaĝo</item>
+        <item quantity="other"><xliff:g id="messages">%d</xliff:g> novaj mesaĝoj</item>
+    </plurals>
+    <string name="action_delete">Forigi</string>
+    <string name="action_delete_message">Forigi</string>
+    <string name="delete_message_confirmation_button">Forigi</string>
+    <string name="delete_conversation_confirmation_button">Forigi</string>
+    <string name="delete_conversation_decline_button">Nuligi</string>
+    <string name="enumeration_comma">,\u0020</string>
+    <string name="notification_separator">\u0020\u0020</string>
+    <string name="notification_ticker_separator">:\u0020</string>
+    <string name="notification_space_separator">\u0020\u0020</string>
+    <string name="notification_picture">Bildo</string>
+    <string name="settings_activity_title">Agordoj</string>
+    <string name="notifications_enabled_pref_title">Sciigoj</string>
+    <string name="message_context_menu_delete_message">Forigi</string>
+    <string name="chips_text_delete_button_content_description">Forigi tekston</string>
+    <string name="notifications_enabled_conversation_pref_title">Sciigoj</string>
+    <string name="conversation_list_item_view_sent_from_you_prefix">Vi:\u0020</string>
+    <string name="conversation_list_item_view_draft_message">Malneto</string>
+    <string name="conversation_list_snippet_picture">Bildo</string>
+    <string name="in_conversation_notify_new_message_text">Nova mesaĝo</string>
+    <string name="share_new_message">Nova mesaĝo</string>
+    <string name="share_cancel">Nuligi</string>
+    <string name="secondary_user_new_message_title">Nova mesaĝo</string>
+    <string name="secondary_user_new_message_ticker">Nova mesaĝo.</string>
+    <string name="widget_new_message_content_description">Nova mesaĝo</string>
 </resources>
diff --git a/res/values-es-rMX/arrays.xml b/res/values-es-rMX/arrays.xml
deleted file mode 100644
index f2be096..0000000
--- a/res/values-es-rMX/arrays.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String to match as no subject and filter out as a subject. For example, if the
-         subject string is "no subject", we won't display that. We'll pretend
-         no subject string was delivered. -->
-  <!-- Choices for quick-reply to message notification. Users with an Android
-    Wear device (e.g. smartwatch) can reply to messages either by speaking their
-    response, or choosing one of these predefined options. -->
-</resources>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index 629ae61..b8d2592 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -16,60 +16,29 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Informar como spam a %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Limpiar Unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">No modificar el mensaje</string>
-  <string name="pref_unicode_stripping_non_encodable">Sustituir los caracteres no compatibles</string>
-  <string name="pref_unicode_stripping_all">Sustituir todos los caracteres unicode</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Deslizar para eliminar</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Deslize a la derecha para borrar una conversación</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Mensaje y respuesta rápida</string>
-  <string name="pref_quickmessage_title">Mostrar mensaje rápido</string>
-  <string name="pref_quickmessage_summary">Abrir automáticamente la ventana de mensaje rápido para los mensajes SMS entrantes</string>
-  <string name="pref_close_all_title">Cerrar todo</string>
-  <string name="pref_close_all_summary">Al pulsar Cerrar se cerrarán todos los mensajes</string>
-  <string name="message_counter">%1$d de %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Cerrar</string>
-  <string name="button_view">Ver</string>
-  <string name="button_templates">Plantillas</string>
-  <string name="qm_button_full_conversation">Conversación completa</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Escribir para responder</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Enviando mensaje\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Respuesta rápida</string>
-  <string name="send">Enviar</string>
-  <string name="compose_message_hint_text">Ingresar mensaje</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Acceso de emoticonos</string>
-  <string name="show_emoticons_pref_summary">Mostrar el botón de emoticonos en el teclado</string>
-  <string name="select_phone_account_title">Enviar con</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">Informar como spam a %s</string>
+    <string name="unicode_stripping_pref_title">Limpiar Unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">No modificar el mensaje</string>
+    <string name="pref_unicode_stripping_non_encodable">Sustituir los caracteres no compatibles</string>
+    <string name="pref_unicode_stripping_all">Sustituir todos los caracteres unicode</string>
+    <string name="swipe_to_delete_conversation_pref_title">Deslizar para eliminar</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Deslize a la derecha para borrar una conversación</string>
+    <string name="pref_quickmessage">Mensaje y respuesta rápida</string>
+    <string name="pref_quickmessage_title">Mostrar mensaje rápido</string>
+    <string name="pref_quickmessage_summary">Abrir automáticamente la ventana de mensaje rápido para los mensajes SMS entrantes</string>
+    <string name="pref_close_all_title">Cerrar todo</string>
+    <string name="pref_close_all_summary">Al pulsar Cerrar se cerrarán todos los mensajes</string>
+    <string name="message_counter">%1$d de %2$d</string>
+    <string name="button_close">Cerrar</string>
+    <string name="button_view">Ver</string>
+    <string name="button_templates">Plantillas</string>
+    <string name="qm_button_full_conversation">Conversación completa</string>
+    <string name="type_to_reply_text_enter_to_send">Escribir para responder</string>
+    <string name="toast_sending_message">Enviando mensaje\u2026</string>
+    <string name="qm_quick_reply">Respuesta rápida</string>
+    <string name="send">Enviar</string>
+    <string name="compose_message_hint_text">Ingresar mensaje</string>
+    <string name="show_emoticons_pref_title">Acceso de emoticonos</string>
+    <string name="show_emoticons_pref_summary">Mostrar el botón de emoticonos en el teclado</string>
+    <string name="select_phone_account_title">Enviar con</string>
 </resources>
diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml
deleted file mode 100644
index d73a67e..0000000
--- a/res/values-es-rMX/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- The name of the application as it appears under the main Launcher icon and in various activity titles -->
-  <!-- The name of the application as it appears in external share intent dialogs -->
-  <!-- The title when selecting a conversation to share to -->
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <!-- The tab header for the frequently used contacts list -->
-  <!-- The tab header for all contacts list -->
-  <!-- The text on the list item in the contact picker that allows a user to send an SMS directly
-         to a number that he/she typed. eg. "Send to 650-555-1234" -->
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <!-- Abbreviated message to express that something occurred some number of hours in the past (e.g., 5 hours ago). -->
-  <!-- Abbreviated message to express that something occurred some number of days in the past (e.g., 5 days ago). -->
-  <!--
-        Plurals used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <!-- Title of the class-0 message activity. -->
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <!-- Title for SMS storage low notification and dialog. Must match the framework's notification title, i.e. //frameworks/base/core/res/res/values/strings.xml#low_internal_storage_view_title -->
-  <!-- Text for SMS storage low notification and dialog -->
-  <!-- Ticker for SMS storage low notification -->
-  <!-- Title for asking the user to enter their phone number -->
-  <!-- Text for asking the user to enter their phone number -->
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <!-- Free SMS storage actions -->
-  <!-- Free SMS storage action confirm dialog message -->
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <!-- While sending a message display this message. -->
-  <!-- When sending a message failed display this message. -->
-  <!-- When retrying sending for a message. -->
-  <!-- When showing resend action display this message. -->
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <!-- When showing resend action, display this message. -->
-  <!-- Title line for an MMS requiring manual download. -->
-  <!-- Title line for an MMS auto-downloading. -->
-  <!-- Title line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which is selected. -->
-  <!-- Timestamp line to display while downloading a message. -->
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <!-- Display this info line with an MMS notification -->
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for download failed -->
-  <!-- notification line 1 for multiple downloads failed -->
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <!-- Notification content when emergency SMS fails to send -->
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <!-- Content description text for Back button on the action bar -->
-  <!-- Action menu title for showing archived conversations -->
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <!-- An enumeration comma for separating multiple names in notifications. [CHAR LIMIT=2] -->
-  <!-- Separator between parts of a notification in each line of an inboxStyle notification. [CHAR LIMIT=2] -->
-  <!-- Separator between title and content in notification ticker -->
-  <!-- Separator between title and content in notifications -->
-  <!-- Shown in notifications when there's a picture. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <!-- Shown in the Android Wear conversation log as the sender for outgoing messages,
-         when we don't know the user's real name (e.g. no "Me" contact on the phone). -->
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <!-- Accessibility announcement for an incoming message -->
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <!-- Accessibility description for conversation list for group conversations -->
-  <!-- Accessibility description for conversation list for failed messages -->
-  <!-- Accessibility name for a group conversation -->
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <!-- Title for the preferences/settings activity -->
-  <!-- Title for the archived conversations activity -->
-  <!-- Action title: Close -->
-  <!-- Preference category: MMS messaging -->
-  <!-- Preference category: Advanced -->
-  <!-- Preference category: Debug -->
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <!-- Title for the notification sound preference -->
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <!-- Preference summary: Current default SMS app -->
-  <!-- Preference title: MMS phone number -->
-  <!-- Display text for phone number preference when the number is unknown -->
-  <!-- Title for the preference for playing a message send sound -->
-  <!-- Strings for dump sms/mms dialog -->
-  <!-- Title of long press menu on an individual message. -->
-  <!-- Menu item to copy message text -->
-  <!-- Title of long press menu for details about an individual message. -->
-  <!-- Title of long press menu for deleting an individual message. -->
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <!-- Title of "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <!-- Sender to be used if the sender address has been hidden -->
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <!-- Notifies the user when an attachment fails to load -->
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <!-- Title for the "People and Options" activity -->
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <!-- Title for the phone call button in the action bar that lets the user call a participant in an SMS conversation -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <!-- The hint text shown in the message compose input box when photo(s) is attached -->
-  <!-- The hint text shown in the message compose input box when audio recording(s) is attached -->
-  <!-- The hint text shown in the message compose input box when video(s) is attached -->
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <!-- Announcement after the user adds or removes an attachment -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <!-- The format of the subtitle of the help activity. -->
-  <!--  Action menu title to let users view open source license -->
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <!-- Reached MMS message attachment limit -->
-  <!-- Message attachment load failed -->
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- When there's a subject in an mms, the subject + message are shown in a notification -->
-  <!-- Text shown on contact VCard when it's being loaded -->
-  <!-- Text shown on contact VCard when it failed to load -->
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <!-- Title for the activity that shows details of VCards -->
-  <!-- VCard label for displaying birthdays -->
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <!-- Title for the message forwarding dialog -->
-  <!-- Title for the message reply dialog -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <!-- Dialog button text that closes the application. -->
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <!-- A message in conversation list view to indicate that the snipit text and preview is from an unsent draft. -->
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <!-- Indicates that the current message will be sent via MMS -->
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <!-- Title of block confirmation dialog -->
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <!-- The title of the list of blocked contacts -->
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <!-- Accessibility toast shown when a message is sending. -->
-  <!-- Accessibility toast shown when a message is sent. -->
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <!-- Accessibility : content description for numbers -->
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <!-- Text prepended to the subject of a forwarded message -->
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <!-- The notification toast text and action button label shown at bottom of screen, for when a new message comes in while the user
-         is in that conversation, but the message list is not scrolled to the bottom -->
-  <!-- Content description for the message images in a conversation or for the image preview in the conversation list if the lastest message in that conversation contains an image-->
-  <!-- Text for a toast message notifying the user that we can't find an appropriate application to handle their request -->
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Screen title after user selects APNs setting option -->
-  <!-- Edit access point label summary text when no value has been set -->
-  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
-  <!-- Edit access point labels: The actual access point name-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The type of APN -->
-  <!-- Edit access point screen menu option to delete this APN -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <!-- APNs screen menu option to reset default APN settings -->
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <!-- Title for Access Point Names settings -->
-  <!-- Title for Access Point Names settings activity -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <!-- The title for general settings section in the settings activity  -->
-  <!-- The title for advanced settings section in the settings activity  -->
-  <!-- The title for general settings activity  -->
-  <!-- The title for advanced settings activity  -->
-  <!-- The title for sim_specific settings  -->
-  <!-- The group MMS choices in settings -->
-  <!-- SIM number shown in the settings when the number is not known -->
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <!-- Content description for the SIM selector button in the conversation -->
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <!-- Content description for the audio record view -->
-  <!-- Content description for new conversation button in desktop widget -->
-  <!-- Content description for widget title -->
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <!-- Content description for new message button in desktop widget -->
-  <!-- Content description for conversation list button in desktop widget -->
-  <!-- Shown when loading conversations in the widget -->
-  <!-- Shown when loading messages in the widget -->
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <!-- Toast message telling the user that someone was blocked -->
-  <!-- Toast message telling the user that someone was unblocked -->
-  <!-- Title for attachment chooser activity -->
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message load failed -->
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <!-- When converting html to text link urls are inlined.  This specifies how the link should be
-    displayed.  For example, a link "click here" which navigates to "www.google.com" would have
-    text="click here" and url="www.google.com", using the below format to create "click here (www.google.com)" -->
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
-</resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 1110f77..f39853b 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Informar como no deseado a %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Limpiar Unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">No modificar los caracteres</string>
-  <string name="pref_unicode_stripping_non_encodable">Sustituir los caracteres no compatibles</string>
-  <string name="pref_unicode_stripping_all">Sustituir todos los caracteres Unicode</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Período de validez</string>
-  <string name="validity_period_slot1_pref_title">Período de validez para la SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Período de validez para la SIM 2</string>
-  <string name="sms_validity_period_not_set">Sin establecer</string>
-  <string name="sms_validity_period_one_hour">1 hora</string>
-  <string name="sms_validity_period_six_hours">6 horas</string>
-  <string name="sms_validity_period_twelve_hours">12 horas</string>
-  <string name="sms_validity_period_one_day">1 día</string>
-  <string name="mms_validity_period_two_days">2 días</string>
-  <string name="mms_validity_period_one_week">1 semana</string>
-  <string name="validity_period_maximum">Máximo</string>
-  <string name="pref_summary_mms_delivery_reports">Solicitar un informe de entrega para cada mensaje enviado</string>
-  <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>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">Alta</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Almacenamiento</string>
-  <string name="pref_summary_auto_delete">Borrar mensajes antiguos al llegar al límite</string>
-  <string name="auto_delete_pref_title">Borrar mensajes antiguos</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s </xliff:g> mensajes por conversación</string>
-  <string name="sms_delete_pref_title">Límite de mensaje de texto</string>
-  <string name="mms_delete_pref_title">Límite de mensajes multimedia</string>
-  <string name="set">Establecer</string>
-  <string name="no">Cancelar</string>
-  <string name="pref_messages_to_save">Establece el número de mensajes a guardar</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Deslizar para borrar</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Deslice a la derecha para borrar una conversación</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Mensaje y respuesta rápida</string>
-  <string name="pref_quickmessage_title">Mostrar mensaje rápido</string>
-  <string name="pref_quickmessage_summary">Abrir automáticamente la respuestá rápida para los mensajes SMS entrantes</string>
-  <string name="pref_close_all_title">Cerrar todo</string>
-  <string name="pref_close_all_summary">Si pulsa Cerrar se cerrarán todos los mensajes</string>
-  <string name="message_counter">%1$d de %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Cerrar</string>
-  <string name="button_view">Ver</string>
-  <string name="button_templates">Plantillas</string>
-  <string name="qm_button_full_conversation">Conversación completa</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Escribir para responder</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Enviando mensaje\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Respuesta rápida</string>
-  <string name="send">Enviar</string>
-  <string name="compose_message_hint_text">Ingresar mensaje</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Acceso a emoticonos</string>
-  <string name="show_emoticons_pref_summary">Mostrar el botón de emoticonos en el teclado</string>
-  <string name="select_phone_account_title">Enviar con</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Gestionar mensajes de la SIM</string>
-  <string name="pref_title_manage_sim_messages_slot1">Gestionar mensajes de SIM 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Gestionar mensajes de SIM 2</string>
-  <string name="copy_to_sim">Copiar el mensaje a la tarjeta SIM</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> mensajes guardados en la tarjeta SIM.</string>
-  <string name="copy_to_sim_fail">No se puede guardar el mensaje</string>
-  <string name="copy_to_phone_success">Mensaje guardado</string>
-  <string name="copy_to_phone_fail">No se puede guardar el mensaje</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">Sin mensajes en la tarjeta SIM.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Enviar email a <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">Llamar <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">Añadir <xliff:g id="contactEmailOrNumber">%s </xliff:g> a personas</string>
-  <string name="sim_capacity_title">Capacidad de la SIM</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> entradas de la tarjeta SIM en uso</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">¿Borrar?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Mensajes de texto en la tarjeta SIM</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Refrescando\u2026</string>
-  <string name="confirm_delete_selected_messages">Se eliminarán los mensajes seleccionados.</string>
-  <!-- Delete button title -->
-  <string name="delete">Borrar</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Siguiente</string>
-  <string name="menu_reply">Responder</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 a la memoria de la tableta</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Copiar a la memoria del teléfono</string>
-  <string name="selected_all">Marcar todo</string>
-  <string name="deselected_all">Anular selección de todo</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> seleccionado</string>
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <string name="yes">Aceptar</string>
-  <!-- Copy message to sim -->
-  <string name="operation_to_card_memory">Copiar el mensaje a la tarjeta 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">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">Audio seleccionado.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Audio no seleccionado.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> seleccionados</string>
+    <string name="report_as_spam_to">Informar como no deseado a %s</string>
+    <string name="unicode_stripping_pref_title">Limpiar Unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">No modificar los caracteres</string>
+    <string name="pref_unicode_stripping_non_encodable">Sustituir los caracteres incompatibles</string>
+    <string name="pref_unicode_stripping_all">Sustituir todos los caracteres Unicode</string>
+    <string name="validity_period_pref_title">Período de validez</string>
+    <string name="validity_period_slot1_pref_title">Período de validez para la SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Período de validez para la SIM 2</string>
+    <string name="sms_validity_period_not_set">Sin establecer</string>
+    <string name="sms_validity_period_one_hour">1 hora</string>
+    <string name="sms_validity_period_six_hours">6 horas</string>
+    <string name="sms_validity_period_twelve_hours">12 horas</string>
+    <string name="sms_validity_period_one_day">1 día</string>
+    <string name="mms_validity_period_two_days">2 días</string>
+    <string name="mms_validity_period_one_week">1 semana</string>
+    <string name="validity_period_maximum">Máximo</string>
+    <string name="pref_summary_mms_delivery_reports">Solicitar un informe de entrega para cada mensaje enviado</string>
+    <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>
+    <string name="priority_pref_title">Prioridad de envío</string>
+    <string name="priority_low">Baja</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">Alta</string>
+    <string name="sms_storage_pref_title">Almacenamiento</string>
+    <string name="pref_summary_auto_delete">Borrar mensajes antiguos al llegar al límite</string>
+    <string name="auto_delete_pref_title">Borrar mensajes antiguos</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s </xliff:g> mensajes por conversación</string>
+    <string name="sms_delete_pref_title">Límite de mensaje de texto</string>
+    <string name="mms_delete_pref_title">Límite de mensajes multimedia</string>
+    <string name="set">Establecer</string>
+    <string name="no">Cancelar</string>
+    <string name="pref_messages_to_save">Establece el número de mensajes a guardar</string>
+    <string name="swipe_to_delete_conversation_pref_title">Deslizar para borrar</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Deslice a la derecha para borrar una conversación</string>
+    <string name="pref_quickmessage">Mensaje y respuesta rápida</string>
+    <string name="pref_quickmessage_title">Mostrar mensaje rápido</string>
+    <string name="pref_quickmessage_summary">Abrir automáticamente la respuestá rápida para los mensajes SMS entrantes</string>
+    <string name="pref_close_all_title">Cerrar todo</string>
+    <string name="pref_close_all_summary">Si pulsa Cerrar se cerrarán todos los mensajes</string>
+    <string name="message_counter">%1$d de %2$d</string>
+    <string name="button_close">Cerrar</string>
+    <string name="button_view">Ver</string>
+    <string name="button_templates">Plantillas</string>
+    <string name="qm_button_full_conversation">Conversación completa</string>
+    <string name="type_to_reply_text_enter_to_send">Escribir para responder</string>
+    <string name="toast_sending_message">Enviando mensaje\u2026</string>
+    <string name="qm_quick_reply">Respuesta rápida</string>
+    <string name="send">Enviar</string>
+    <string name="compose_message_hint_text">Ingresar mensaje</string>
+    <string name="show_emoticons_pref_title">Acceso a emoticonos</string>
+    <string name="show_emoticons_pref_summary">Mostrar el botón de emoticonos en el teclado</string>
+    <string name="select_phone_account_title">Enviar con</string>
+    <string name="pref_title_manage_sim_messages">Gestionar mensajes de la SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Gestionar mensajes de SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Gestionar mensajes de SIM 2</string>
+    <string name="copy_to_sim">Copiar el mensaje a la tarjeta SIM</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> mensajes guardados en la tarjeta SIM.</string>
+    <string name="copy_to_sim_fail">No se puede guardar el mensaje</string>
+    <string name="copy_to_phone_success">Mensaje guardado</string>
+    <string name="copy_to_phone_fail">No se puede guardar el mensaje</string>
+    <string name="sim_empty">Sin mensajes en la tarjeta SIM.</string>
+    <string name="menu_send_email">Enviar email a <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Llamar <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Añadir <xliff:g id="contactEmailOrNumber">%s </xliff:g> a personas</string>
+    <string name="sim_capacity_title">Capacidad de la SIM</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> entradas de la tarjeta SIM en uso</string>
+    <string name="confirm_dialog_title">¿Borrar?</string>
+    <string name="sim_manage_messages_title">Mensajes de texto en la tarjeta SIM</string>
+    <string name="refreshing">Refrescando\u2026</string>
+    <string name="confirm_delete_selected_messages">Se eliminarán los mensajes seleccionados.</string>
+    <string name="delete">Borrar</string>
+    <string name="menu_forward">Siguiente</string>
+    <string name="menu_reply">Responder</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Copia a la memoria de la tableta</string>
+    <string name="sim_copy_to_phone_memory" product="default">Copiar a la memoria del teléfono</string>
+    <string name="selected_all">Marcar todo</string>
+    <string name="deselected_all">Anular selección de todo</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> seleccionado</string>
+    <string name="yes">Aceptar</string>
+    <string name="operation_to_card_memory">Copiar el mensaje a la tarjeta SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <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">Audio seleccionado.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Audio no seleccionado.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> seleccionados</string>
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index cae0314..47b9d26 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Informar como spam a %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Limpiar unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Dejar texto intacto</string>
-  <string name="pref_unicode_stripping_non_encodable">Sustituir los caracteres no compatibles</string>
-  <string name="pref_unicode_stripping_all">Limpiar todos los caracteres unicode</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Período de validez</string>
-  <string name="validity_period_slot1_pref_title">Período de validez de la SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Período de validez de la SIM 2</string>
-  <string name="sms_validity_period_not_set">No establecido</string>
-  <string name="sms_validity_period_one_hour">1 hora</string>
-  <string name="sms_validity_period_six_hours">6 horas</string>
-  <string name="sms_validity_period_twelve_hours">12 horas</string>
-  <string name="sms_validity_period_one_day">1 día</string>
-  <string name="mms_validity_period_two_days">2 días</string>
-  <string name="mms_validity_period_one_week">1 semana</string>
-  <string name="validity_period_maximum">Máximo</string>
-  <string name="pref_summary_mms_delivery_reports">Solicitar un informe de entrega para cada mensaje enviado</string>
-  <string name="pref_summary_mms_read_reports">Pedir confirmacion de lectura por cada mensaje SMS 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>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">Alta</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Almacenamiento</string>
-  <string name="pref_summary_auto_delete">Eliminar los mensajes antiguos cuando alcancen los límites</string>
-  <string name="auto_delete_pref_title">Eliminar mensajes antiguos</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mensajes por conversación</string>
-  <string name="sms_delete_pref_title">Límite de mensajes de texto</string>
-  <string name="mms_delete_pref_title">Límite de mensajes multimedia</string>
-  <string name="set">Establecer</string>
-  <string name="no">Cancelar</string>
-  <string name="pref_messages_to_save">Establece el número de mensajes a guardar</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Deslizar para eliminar</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Deslize a la derecha para borrar una conversación</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Mensaje rápido y respuesta</string>
-  <string name="pref_quickmessage_title">Mostrar mensaje rápido</string>
-  <string name="pref_quickmessage_summary">Abrir automáticamente la respuesta rápida para los mensajes SMS entrantes</string>
-  <string name="pref_close_all_title">Cerrar todo</string>
-  <string name="pref_close_all_summary">Al pulsar Cerrar, se cerrarán todos los mensajes</string>
-  <string name="message_counter">%1$d de %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Cerrar</string>
-  <string name="button_view">Ver</string>
-  <string name="button_templates">Plantillas</string>
-  <string name="qm_button_full_conversation">Conversación completa</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Escribir mensaje</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Enviando mensaje\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Respuesta rápida</string>
-  <string name="send">Enviar</string>
-  <string name="compose_message_hint_text">Ingresar mensaje</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Acceso de emoticonos</string>
-  <string name="show_emoticons_pref_summary">Mostrar el botón de emoticonos en el teclado</string>
-  <string name="select_phone_account_title">Enviar con</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Administrar mensajes de la SIM</string>
-  <string name="pref_title_manage_sim_messages_slot1">Administrar mensajes de la SIM 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Administrar mensajes de la SIM 2</string>
-  <string name="copy_to_sim">Copiar el mensaje a la tarjeta SIM</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> mensajes guardados en la tarjeta SIM.</string>
-  <string name="copy_to_sim_fail">No se pudo guardar el mensaje</string>
-  <string name="copy_to_phone_success">Mensaje guardado</string>
-  <string name="copy_to_phone_fail">No se pudo guardar el mensaje</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">No hay mensajes en tarjeta SIM.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Enviar un correo electrónico a <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">Llamar a <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">Añadir a <xliff:g id="contactEmailOrNumber">%s</xliff:g> a Personas</string>
-  <string name="sim_capacity_title">Capacidad SIM</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> entradas de la tarjeta SIM en uso</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">¿Eliminar?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Mensajes de texto en la tarjeta SIM</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Actualizando\u2026</string>
-  <string name="confirm_delete_selected_messages">Se eliminará el mensaje seleccionado.</string>
-  <!-- Delete button title -->
-  <string name="delete">Eliminar</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Reenviar</string>
-  <string name="menu_reply">Responder</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Copiar a la memoria de la tableta</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Copiar a la memoria del teléfono</string>
-  <string name="selected_all">Seleccionar todo</string>
-  <string name="deselected_all">Anular selección</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> seleccionado</string>
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <string name="yes">ACEPTAR</string>
-  <!-- Copy message to sim -->
-  <string name="operation_to_card_memory">Copiar el mensaje a la tarjeta 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">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>
+    <string name="report_as_spam_to">Informar como spam a %s</string>
+    <string name="unicode_stripping_pref_title">Limpiar unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Dejar texto intacto</string>
+    <string name="pref_unicode_stripping_non_encodable">Sustituir los caracteres no compatibles</string>
+    <string name="pref_unicode_stripping_all">Limpiar todos los caracteres unicode</string>
+    <string name="validity_period_pref_title">Período de validez</string>
+    <string name="validity_period_slot1_pref_title">Período de validez de la SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Período de validez de la SIM 2</string>
+    <string name="sms_validity_period_not_set">No establecido</string>
+    <string name="sms_validity_period_one_hour">1 hora</string>
+    <string name="sms_validity_period_six_hours">6 horas</string>
+    <string name="sms_validity_period_twelve_hours">12 horas</string>
+    <string name="sms_validity_period_one_day">1 día</string>
+    <string name="mms_validity_period_two_days">2 días</string>
+    <string name="mms_validity_period_one_week">1 semana</string>
+    <string name="validity_period_maximum">Máximo</string>
+    <string name="pref_summary_mms_delivery_reports">Solicitar un informe de entrega para cada mensaje enviado</string>
+    <string name="pref_summary_mms_read_reports">Pedir confirmacion de lectura por cada mensaje SMS 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>
+    <string name="priority_pref_title">Prioridad de envío</string>
+    <string name="priority_low">Baja</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">Alta</string>
+    <string name="sms_storage_pref_title">Almacenamiento</string>
+    <string name="pref_summary_auto_delete">Eliminar los mensajes antiguos cuando alcancen los límites</string>
+    <string name="auto_delete_pref_title">Eliminar mensajes antiguos</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mensajes por conversación</string>
+    <string name="sms_delete_pref_title">Límite de mensajes de texto</string>
+    <string name="mms_delete_pref_title">Límite de mensajes multimedia</string>
+    <string name="set">Establecer</string>
+    <string name="no">Cancelar</string>
+    <string name="pref_messages_to_save">Establece el número de mensajes a guardar</string>
+    <string name="swipe_to_delete_conversation_pref_title">Deslizar para eliminar</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Deslize a la derecha para borrar una conversación</string>
+    <string name="pref_quickmessage">Mensaje rápido y respuesta</string>
+    <string name="pref_quickmessage_title">Mostrar mensaje rápido</string>
+    <string name="pref_quickmessage_summary">Abrir automáticamente la respuesta rápida para los mensajes SMS entrantes</string>
+    <string name="pref_close_all_title">Cerrar todo</string>
+    <string name="pref_close_all_summary">Al pulsar Cerrar, se cerrarán todos los mensajes</string>
+    <string name="message_counter">%1$d de %2$d</string>
+    <string name="button_close">Cerrar</string>
+    <string name="button_view">Ver</string>
+    <string name="button_templates">Plantillas</string>
+    <string name="qm_button_full_conversation">Conversación completa</string>
+    <string name="type_to_reply_text_enter_to_send">Escribir mensaje</string>
+    <string name="toast_sending_message">Enviando mensaje\u2026</string>
+    <string name="qm_quick_reply">Respuesta rápida</string>
+    <string name="send">Enviar</string>
+    <string name="compose_message_hint_text">Ingresar mensaje</string>
+    <string name="show_emoticons_pref_title">Acceso de emoticonos</string>
+    <string name="show_emoticons_pref_summary">Mostrar el botón de emoticonos en el teclado</string>
+    <string name="select_phone_account_title">Enviar con</string>
+    <string name="pref_title_manage_sim_messages">Administrar mensajes de la SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Administrar mensajes de la SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Administrar mensajes de la SIM 2</string>
+    <string name="copy_to_sim">Copiar el mensaje a la tarjeta SIM</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> mensajes guardados en la tarjeta SIM.</string>
+    <string name="copy_to_sim_fail">No se pudo guardar el mensaje</string>
+    <string name="copy_to_phone_success">Mensaje guardado</string>
+    <string name="copy_to_phone_fail">No se pudo guardar el mensaje</string>
+    <string name="sim_empty">No hay mensajes en tarjeta SIM.</string>
+    <string name="menu_send_email">Enviar un correo electrónico a <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Llamar a <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Añadir a <xliff:g id="contactEmailOrNumber">%s</xliff:g> a Personas</string>
+    <string name="sim_capacity_title">Capacidad SIM</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> entradas de la tarjeta SIM en uso</string>
+    <string name="confirm_dialog_title">¿Eliminar?</string>
+    <string name="sim_manage_messages_title">Mensajes de texto en la tarjeta SIM</string>
+    <string name="refreshing">Actualizando\u2026</string>
+    <string name="confirm_delete_selected_messages">Se eliminará el mensaje seleccionado.</string>
+    <string name="delete">Eliminar</string>
+    <string name="menu_forward">Reenviar</string>
+    <string name="menu_reply">Responder</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Copiar a la memoria de la tableta</string>
+    <string name="sim_copy_to_phone_memory" product="default">Copiar a la memoria del teléfono</string>
+    <string name="selected_all">Seleccionar todo</string>
+    <string name="deselected_all">Anular selección</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> seleccionado</string>
+    <string name="yes">ACEPTAR</string>
+    <string name="operation_to_card_memory">Copiar el mensaje a la tarjeta SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <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>
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index ce1fc7e..8c04370 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -16,49 +16,18 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <string name="pref_unicode_stripping_leave_intact">Jäta märgid puutumata</string>
-  <string name="pref_unicode_stripping_non_encodable">Eemalda kodeerimatud märgid</string>
-  <string name="pref_unicode_stripping_all">Eemalda kõik unicode märgid</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">QuickMessage ja Vastus</string>
-  <string name="pref_quickmessage_title">Näita QuickMessage</string>
-  <string name="pref_quickmessage_summary">Ava automaatselt QuickMessage hüpikaken saabuvtele SMS sõnumitele</string>
-  <string name="pref_close_all_title">Sulge kõik</string>
-  <string name="pref_close_all_summary">Sulgemisnupp sulgeb kõik sõnumid</string>
-  <string name="message_counter">%2$d %1$d -st</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Sulge</string>
-  <string name="button_view">Vaade</string>
-  <string name="button_templates">Mallid</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Kirjuta et vastata</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Saadan sõnumit\u2026</string>
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="pref_unicode_stripping_leave_intact">Jäta märgid puutumata</string>
+    <string name="pref_unicode_stripping_non_encodable">Eemalda kodeerimatud märgid</string>
+    <string name="pref_unicode_stripping_all">Eemalda kõik unicode märgid</string>
+    <string name="pref_quickmessage">QuickMessage ja Vastus</string>
+    <string name="pref_quickmessage_title">Näita QuickMessage</string>
+    <string name="pref_quickmessage_summary">Ava automaatselt QuickMessage hüpikaken saabuvtele SMS sõnumitele</string>
+    <string name="pref_close_all_title">Sulge kõik</string>
+    <string name="pref_close_all_summary">Sulgemisnupp sulgeb kõik sõnumid</string>
+    <string name="message_counter">%2$d %1$d -st</string>
+    <string name="button_close">Sulge</string>
+    <string name="button_view">Vaade</string>
+    <string name="button_templates">Mallid</string>
+    <string name="type_to_reply_text_enter_to_send">Kirjuta et vastata</string>
+    <string name="toast_sending_message">Saadan sõnumit\u2026</string>
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 1324e67..ddd3a20 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Spam dela adierazi %s(r) i</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Garbitu Unicodea</string>
-  <string name="pref_unicode_stripping_leave_intact">Laga karaktereak ukitu gabe</string>
-  <string name="pref_unicode_stripping_non_encodable">Ezabatu kodetu ezin diren karaktereak</string>
-  <string name="pref_unicode_stripping_all">Garbitu unicode karaktere guztiak</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Baliozkotasun epea</string>
-  <string name="validity_period_slot1_pref_title">1. SIMaren baliozkotasun epea</string>
-  <string name="validity_period_slot2_pref_title">2. SIMaren baliozkotasun epea</string>
-  <string name="sms_validity_period_not_set">Ezarri gabea</string>
-  <string name="sms_validity_period_one_hour">Ordu 1</string>
-  <string name="sms_validity_period_six_hours">6 ordu</string>
-  <string name="sms_validity_period_twelve_hours">12 ordu</string>
-  <string name="sms_validity_period_one_day">Egun 1</string>
-  <string name="mms_validity_period_two_days">2 egun</string>
-  <string name="mms_validity_period_one_week">Aste 1</string>
-  <string name="validity_period_maximum">Gehienez</string>
-  <string name="pref_summary_mms_delivery_reports">Eskatu entrega txostena mezu bat bidaltzen duzun bakoitzean</string>
-  <string name="pref_summary_mms_read_reports">Eskatu mezua-irakurtze txostena mezu bat bidaltzen duzun bakoitzean</string>
-  <string name="delivery_reports_mms_pref_title">Entrega txostenak</string>
-  <string name="read_reports_mms_pref_title">Irakurtze txostenak</string>
-  <string name="status_label">Egoera:\u0020</string>
-  <string name="status_read">Irakurrita</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Bidaltze lehentasuna</string>
-  <string name="priority_low">Baxua</string>
-  <string name="priority_normal">Arrunta</string>
-  <string name="priority_high">Altua</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Biltegiratzea</string>
-  <string name="pref_summary_auto_delete">Ezabatu mezu zaharrak mugak gainditu ahala</string>
-  <string name="auto_delete_pref_title">Ezabatu mezu zaharrak</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mezu elkarrizketako</string>
-  <string name="sms_delete_pref_title">Testu mezuen muga</string>
-  <string name="mms_delete_pref_title">Multimedia mezuen muga</string>
-  <string name="set">Ezarri</string>
-  <string name="no">Utzi</string>
-  <string name="pref_messages_to_save">Ezarri gorde beharreko mezu kopurua</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Pasatu hatza ezabatzeko</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Pasatu hatza eskuinera elkarrizketa bat ezabatzeko</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Mezu eta erantzun azkarrak</string>
-  <string name="pref_quickmessage_title">Erakutsi mezu azkarra</string>
-  <string name="pref_quickmessage_summary">Ireki automatikoki mezu azkarren laster-leihoa SMSak jasotzean</string>
-  <string name="pref_close_all_title">Dena itxi</string>
-  <string name="pref_close_all_summary">Itxi sakatzean, mezu guztiak itxiko dira</string>
-  <string name="message_counter">%1$d / %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Itxi</string>
-  <string name="button_view">Ikusi</string>
-  <string name="button_templates">Txantiloiak</string>
-  <string name="qm_button_full_conversation">Elkarrizketa osoa</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Idatzi erantzuteko</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Mezua bidaltzen\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Erantzun azkarra</string>
-  <string name="send">Bidali</string>
-  <string name="compose_message_hint_text">Sartu mezua</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Emotikonoen tekla</string>
-  <string name="show_emoticons_pref_summary">Erakutsi emotikonoen tekla teklatuan</string>
-  <string name="select_phone_account_title">Bidali honekin</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Kudeatu SIM txarteleko mezuak</string>
-  <string name="pref_title_manage_sim_messages_slot1">Kudeatu 1. SIM txarteleko mezuak</string>
-  <string name="pref_title_manage_sim_messages_slot2">Kudeatu 2. SIM txarteleko mezuak</string>
-  <string name="copy_to_sim">Kopiatu mezua SIM txartelera</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> mezu gorde dira SIM txartelean.</string>
-  <string name="copy_to_sim_fail">Ezin izan da mezua gorde</string>
-  <string name="copy_to_phone_success">Mezua gorde da</string>
-  <string name="copy_to_phone_fail">Ezin izan da mezua gorde</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">Ez dago mezurik SIM txartelean.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Bidali e-posta mezua \"<xliff:g id="name">%s</xliff:g>\" -(e)ri</string>
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <string name="menu_call_back">Deitu <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">Gehitu <xliff:g id="contactEmailOrNumber">%s</xliff:g>\" jendera</string>
-  <string name="sim_capacity_title">SIM edukiera</string>
-  <string name="sim_capacity"><xliff:g id="total">%2$d</xliff:g>tik <xliff:g id="used">%1$d</xliff:g> sarrera erabilita SIM txartelean</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Ezabatu?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">SIM txarteleko testu mezuak</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Eguneratzen\u2026</string>
-  <string name="confirm_delete_selected_messages">Aukeratutako mezua ezabatuko da.</string>
-  <!-- Delete button title -->
-  <string name="delete">Ezabatu</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Birbidali</string>
-  <string name="menu_reply">Erantzun</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Kopiatu tabletaren memoriara</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Kopiatu telefonoaren memoriara</string>
-  <string name="selected_all">Hautatu guztiak</string>
-  <string name="deselected_all">Desautatu guztiak</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> hautatuta</string>
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <string name="yes">Ados</string>
-  <!-- Copy message to sim -->
-  <string name="operation_to_card_memory">Kopiatu mezua SIM txartelera</string>
-  <string name="slot1">1. SIMa</string>
-  <string name="slot2">2. SIMa</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Hautatu gailu honetako irudi edo bideoak</string>
-  <string name="mediapicker_audioListChooserDescription">Hautoatu gailu honetako audio fitxategiak</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Ezin izan da bideoa erantsi. Mezuaren gehieneko tamaina gainditu da.</string>
-  <string name="mediapicker_audio_list_title">Aukeratu audioa</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Audioa aukeratuta dago.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Audioa ez dago aukeratuta.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> aukeratuta</string>
+    <string name="report_as_spam_to">Spam dela adierazi %s(r) i</string>
+    <string name="unicode_stripping_pref_title">Garbitu Unicodea</string>
+    <string name="pref_unicode_stripping_leave_intact">Laga karaktereak ukitu gabe</string>
+    <string name="pref_unicode_stripping_non_encodable">Ezabatu kodetu ezin diren karaktereak</string>
+    <string name="pref_unicode_stripping_all">Garbitu unicode karaktere guztiak</string>
+    <string name="validity_period_pref_title">Baliozkotasun epea</string>
+    <string name="validity_period_slot1_pref_title">1. SIMaren baliozkotasun epea</string>
+    <string name="validity_period_slot2_pref_title">2. SIMaren baliozkotasun epea</string>
+    <string name="sms_validity_period_not_set">Ezarri gabea</string>
+    <string name="sms_validity_period_one_hour">Ordu 1</string>
+    <string name="sms_validity_period_six_hours">6 ordu</string>
+    <string name="sms_validity_period_twelve_hours">12 ordu</string>
+    <string name="sms_validity_period_one_day">Egun 1</string>
+    <string name="mms_validity_period_two_days">2 egun</string>
+    <string name="mms_validity_period_one_week">Aste 1</string>
+    <string name="validity_period_maximum">Gehienez</string>
+    <string name="pref_summary_mms_delivery_reports">Eskatu entrega txostena mezu bat bidaltzen duzun bakoitzean</string>
+    <string name="pref_summary_mms_read_reports">Eskatu mezua-irakurtze txostena mezu bat bidaltzen duzun bakoitzean</string>
+    <string name="delivery_reports_mms_pref_title">Entrega txostenak</string>
+    <string name="read_reports_mms_pref_title">Irakurtze txostenak</string>
+    <string name="status_label">Egoera:\u0020</string>
+    <string name="status_read">Irakurrita</string>
+    <string name="priority_pref_title">Bidaltze lehentasuna</string>
+    <string name="priority_low">Baxua</string>
+    <string name="priority_normal">Arrunta</string>
+    <string name="priority_high">Altua</string>
+    <string name="sms_storage_pref_title">Biltegiratzea</string>
+    <string name="pref_summary_auto_delete">Ezabatu mezu zaharrak mugak gainditu ahala</string>
+    <string name="auto_delete_pref_title">Ezabatu mezu zaharrak</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mezu elkarrizketako</string>
+    <string name="sms_delete_pref_title">Testu mezuen muga</string>
+    <string name="mms_delete_pref_title">Multimedia mezuen muga</string>
+    <string name="set">Ezarri</string>
+    <string name="no">Utzi</string>
+    <string name="pref_messages_to_save">Ezarri gorde beharreko mezu kopurua</string>
+    <string name="swipe_to_delete_conversation_pref_title">Pasatu hatza ezabatzeko</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Pasatu hatza eskuinera elkarrizketa bat ezabatzeko</string>
+    <string name="pref_quickmessage">Mezu eta erantzun azkarrak</string>
+    <string name="pref_quickmessage_title">Erakutsi mezu azkarra</string>
+    <string name="pref_quickmessage_summary">Ireki automatikoki mezu azkarren laster-leihoa SMSak jasotzean</string>
+    <string name="pref_close_all_title">Dena itxi</string>
+    <string name="pref_close_all_summary">Itxi sakatzean, mezu guztiak itxiko dira</string>
+    <string name="message_counter">%1$d / %2$d</string>
+    <string name="button_close">Itxi</string>
+    <string name="button_view">Ikusi</string>
+    <string name="button_templates">Txantiloiak</string>
+    <string name="qm_button_full_conversation">Elkarrizketa osoa</string>
+    <string name="type_to_reply_text_enter_to_send">Idatzi erantzuteko</string>
+    <string name="toast_sending_message">Mezua bidaltzen\u2026</string>
+    <string name="qm_quick_reply">Erantzun azkarra</string>
+    <string name="send">Bidali</string>
+    <string name="compose_message_hint_text">Sartu mezua</string>
+    <string name="show_emoticons_pref_title">Emotikonoen tekla</string>
+    <string name="show_emoticons_pref_summary">Erakutsi emotikonoen tekla teklatuan</string>
+    <string name="select_phone_account_title">Bidali honekin</string>
+    <string name="pref_title_manage_sim_messages">Kudeatu SIM txarteleko mezuak</string>
+    <string name="pref_title_manage_sim_messages_slot1">Kudeatu 1. SIM txarteleko mezuak</string>
+    <string name="pref_title_manage_sim_messages_slot2">Kudeatu 2. SIM txarteleko mezuak</string>
+    <string name="copy_to_sim">Kopiatu mezua SIM txartelera</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> mezu gorde dira SIM txartelean.</string>
+    <string name="copy_to_sim_fail">Ezin izan da mezua gorde</string>
+    <string name="copy_to_phone_success">Mezua gorde da</string>
+    <string name="copy_to_phone_fail">Ezin izan da mezua gorde</string>
+    <string name="sim_empty">Ez dago mezurik SIM txartelean.</string>
+    <string name="menu_send_email">Bidali e-posta mezua \"<xliff:g id="name">%s</xliff:g>\" -(e)ri</string>
+    <string name="menu_call_back">Deitu <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Gehitu <xliff:g id="contactEmailOrNumber">%s</xliff:g>\" jendera</string>
+    <string name="sim_capacity_title">SIM edukiera</string>
+    <string name="sim_capacity"><xliff:g id="total">%2$d</xliff:g>tik <xliff:g id="used">%1$d</xliff:g> sarrera erabilita SIM txartelean</string>
+    <string name="confirm_dialog_title">Ezabatu?</string>
+    <string name="sim_manage_messages_title">SIM txarteleko testu mezuak</string>
+    <string name="refreshing">Eguneratzen\u2026</string>
+    <string name="confirm_delete_selected_messages">Aukeratutako mezua ezabatuko da.</string>
+    <string name="delete">Ezabatu</string>
+    <string name="menu_forward">Birbidali</string>
+    <string name="menu_reply">Erantzun</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Kopiatu tabletaren memoriara</string>
+    <string name="sim_copy_to_phone_memory" product="default">Kopiatu telefonoaren memoriara</string>
+    <string name="selected_all">Hautatu guztiak</string>
+    <string name="deselected_all">Desautatu guztiak</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> hautatuta</string>
+    <string name="yes">Ados</string>
+    <string name="operation_to_card_memory">Kopiatu mezua SIM txartelera</string>
+    <string name="slot1">1. SIMa</string>
+    <string name="slot2">2. SIMa</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Hautatu gailu honetako irudi edo bideoak</string>
+    <string name="mediapicker_audioListChooserDescription">Hautoatu gailu honetako audio fitxategiak</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Ezin izan da bideoa erantsi. Mezuaren gehieneko tamaina gainditu da.</string>
+    <string name="mediapicker_audio_list_title">Aukeratu audioa</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Audioa aukeratuta dago.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Audioa ez dago aukeratuta.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> aukeratuta</string>
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index c06ff82..9d4574a 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -16,49 +16,18 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <string name="pref_unicode_stripping_leave_intact">دست نزدن به نویسه‌ها</string>
-  <string name="pref_unicode_stripping_non_encodable">برداشتن نویسه‌های غیرقابل‌کدگذاری</string>
-  <string name="pref_unicode_stripping_all">برداشتن تمام نویسه‌های یونی‌کد</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">پیام سریع و پاسخ</string>
-  <string name="pref_quickmessage_title">نمایش پیام سریع</string>
-  <string name="pref_quickmessage_summary">بازکردن خودکار بالاپر پیام سریع برای پیامک‌ها</string>
-  <string name="pref_close_all_title">بستن همه</string>
-  <string name="pref_close_all_summary">دکمه بستن تمام پیام‌ها را خواهد بست</string>
-  <string name="message_counter">%1$d از %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">بستن</string>
-  <string name="button_view">مشاهده</string>
-  <string name="button_templates">قالب‌ها</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 -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="pref_unicode_stripping_leave_intact">دست نزدن به نویسه‌ها</string>
+    <string name="pref_unicode_stripping_non_encodable">برداشتن نویسه‌های غیرقابل‌کدگذاری</string>
+    <string name="pref_unicode_stripping_all">برداشتن تمام نویسه‌های یونی‌کد</string>
+    <string name="pref_quickmessage">پیام سریع و پاسخ</string>
+    <string name="pref_quickmessage_title">نمایش پیام سریع</string>
+    <string name="pref_quickmessage_summary">بازکردن خودکار بالاپر پیام سریع برای پیامک‌ها</string>
+    <string name="pref_close_all_title">بستن همه</string>
+    <string name="pref_close_all_summary">دکمه بستن تمام پیام‌ها را خواهد بست</string>
+    <string name="message_counter">%1$d از %2$d</string>
+    <string name="button_close">بستن</string>
+    <string name="button_view">مشاهده</string>
+    <string name="button_templates">قالب‌ها</string>
+    <string name="type_to_reply_text_enter_to_send">برای پاسخ تایپ کنید</string>
+    <string name="toast_sending_message">ارسال پیام\u2026</string>
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 2aeacf8..0b4ae02 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Ilmoita spam-viestiksi palveluun %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Poista unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Älä tee mitään</string>
-  <string name="pref_unicode_stripping_non_encodable">Poista koodaamattomat merkit</string>
-  <string name="pref_unicode_stripping_all">Poista kaikki unicode-merkit</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Voimassaoloaika</string>
-  <string name="validity_period_slot1_pref_title">SIM1:n voimassaoloaika</string>
-  <string name="validity_period_slot2_pref_title">SIM2:n voimassaoloaika</string>
-  <string name="sms_validity_period_not_set">Ei asetettu</string>
-  <string name="sms_validity_period_one_hour">1 tunti</string>
-  <string name="sms_validity_period_six_hours">6 tuntia</string>
-  <string name="sms_validity_period_twelve_hours">12 tuntia</string>
-  <string name="sms_validity_period_one_day">1 päivä</string>
-  <string name="mms_validity_period_two_days">2 päivää</string>
-  <string name="mms_validity_period_one_week">1 viikko</string>
-  <string name="validity_period_maximum">Enimmäismäärä</string>
-  <string name="pref_summary_mms_delivery_reports">Pyydä lähetysraportti jokaisesta lähettämästäsi viestistä</string>
-  <string name="pref_summary_mms_read_reports">Pyydä lukuraportti jokaisesta lähettämästäsi viestistä</string>
-  <string name="delivery_reports_mms_pref_title">Lähetysraportit</string>
-  <string name="read_reports_mms_pref_title">Lukuraportit</string>
-  <string name="status_label">Tila:\u0020</string>
-  <string name="status_read">Lue</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Lähetyksen tärkeys</string>
-  <string name="priority_low">Matala</string>
-  <string name="priority_normal">Normaali</string>
-  <string name="priority_high">Korkea</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Tallennustila</string>
-  <string name="pref_summary_auto_delete">Poista vanhat viestit kun raja ylittyy</string>
-  <string name="auto_delete_pref_title">Poista vanhat viestit</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> viestiä per keskustelu</string>
-  <string name="sms_delete_pref_title">Tekstiviestiraja</string>
-  <string name="mms_delete_pref_title">Multimediaviestien raja</string>
-  <string name="set">Aseta</string>
-  <string name="no">Peruuta</string>
-  <string name="pref_messages_to_save">Aseta tallennettavien viestien määrä</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Poista liu\'uttamalla</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Pyyhkäise oikealle poistaaksesi keskustelun</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">QuickMessage</string>
-  <string name="pref_quickmessage_title">Näytä QuickMessage</string>
-  <string name="pref_quickmessage_summary">Avaa QuickMessage-ponnahdusikkuna automaattisesti saatuasi tekstiviestin</string>
-  <string name="pref_close_all_title">Sulje kaikki</string>
-  <string name="pref_close_all_summary">Sulje-painike sulkee kaikki viestit</string>
-  <string name="message_counter">%1$d/%2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Sulje</string>
-  <string name="button_view">Lue</string>
-  <string name="button_templates">Viestipohjat</string>
-  <string name="qm_button_full_conversation">Koko keskustelu</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Kirjoita vastataksesi</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Lähetetään viestiä\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Pikavastaus</string>
-  <string name="send">Lähetä</string>
-  <string name="compose_message_hint_text">Kirjoita viesti</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Hymiöiden käyttö</string>
-  <string name="show_emoticons_pref_summary">Näytä hymiönäppäin näppäimistöllä</string>
-  <string name="select_phone_account_title">Lähetä käyttäen</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Hallitse SIM-kortin viestejä</string>
-  <string name="pref_title_manage_sim_messages_slot1">Hallitse SIM 1:n viestejä</string>
-  <string name="pref_title_manage_sim_messages_slot2">Hallitse SIM 2:n viestejä</string>
-  <string name="copy_to_sim">Kopioi viesti SIM-kortille</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> viesteistä tallennettu SIM-kortille.</string>
-  <string name="copy_to_sim_fail">Viestin tallennus ei onnistu</string>
-  <string name="copy_to_phone_success">Viesti tallennettu</string>
-  <string name="copy_to_phone_fail">Viestin tallennus ei onnistu</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">Ei viestejä SIM-kortilla.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Lähetä sähköpostia henkilölle <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">Soita numeroon <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">Lisää <xliff:g id="contactEmailOrNumber">%s</xliff:g> Yhteystietoihin</string>
-  <string name="sim_capacity_title">SIM-kortin kapasiteetti</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> SIM-kortista käytössä</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Poista?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">SIM-kortin tekstiviestit</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Päivitetään\u2026</string>
-  <string name="confirm_delete_selected_messages">Valitut viestit poistetaan.</string>
-  <!-- Delete button title -->
-  <string name="delete">Poista</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Lähetä edelleen</string>
-  <string name="menu_reply">Vastaa</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Kopioi tabletin muistiin</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Kopioi puhelimen muistiin</string>
-  <string name="selected_all">Valitse kaikki</string>
-  <string name="deselected_all">Poista valinnat</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> valittu</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">Kopioi viesti SIM-kortille</string>
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Valitse kuvat ja videot tästä laitteesta</string>
-  <string name="mediapicker_audioListChooserDescription">Valitse äänitiedostot tästä laitteesta</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Ei voida liittää videota. Enimmäiskoko ylittynyt.</string>
-  <string name="mediapicker_audio_list_title">Valitse audio</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Audio on valittu.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Audiota ei valittu.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> valittu</string>
+    <string name="report_as_spam_to">Ilmoita spam-viestiksi palveluun %s</string>
+    <string name="unicode_stripping_pref_title">Poista unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Älä tee mitään</string>
+    <string name="pref_unicode_stripping_non_encodable">Poista koodaamattomat merkit</string>
+    <string name="pref_unicode_stripping_all">Poista kaikki unicode-merkit</string>
+    <string name="validity_period_pref_title">Voimassaoloaika</string>
+    <string name="validity_period_slot1_pref_title">SIM1:n voimassaoloaika</string>
+    <string name="validity_period_slot2_pref_title">SIM2:n voimassaoloaika</string>
+    <string name="sms_validity_period_not_set">Ei asetettu</string>
+    <string name="sms_validity_period_one_hour">1 tunti</string>
+    <string name="sms_validity_period_six_hours">6 tuntia</string>
+    <string name="sms_validity_period_twelve_hours">12 tuntia</string>
+    <string name="sms_validity_period_one_day">1 päivä</string>
+    <string name="mms_validity_period_two_days">2 päivää</string>
+    <string name="mms_validity_period_one_week">1 viikko</string>
+    <string name="validity_period_maximum">Enimmäismäärä</string>
+    <string name="pref_summary_mms_delivery_reports">Pyydä lähetysraportti jokaisesta lähettämästäsi viestistä</string>
+    <string name="pref_summary_mms_read_reports">Pyydä lukuraportti jokaisesta lähettämästäsi viestistä</string>
+    <string name="delivery_reports_mms_pref_title">Lähetysraportit</string>
+    <string name="read_reports_mms_pref_title">Lukuraportit</string>
+    <string name="status_label">Tila:\u0020</string>
+    <string name="status_read">Lue</string>
+    <string name="priority_pref_title">Lähetyksen tärkeys</string>
+    <string name="priority_low">Matala</string>
+    <string name="priority_normal">Normaali</string>
+    <string name="priority_high">Korkea</string>
+    <string name="sms_storage_pref_title">Tallennustila</string>
+    <string name="pref_summary_auto_delete">Poista vanhat viestit kun raja ylittyy</string>
+    <string name="auto_delete_pref_title">Poista vanhat viestit</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> viestiä per keskustelu</string>
+    <string name="sms_delete_pref_title">Tekstiviestiraja</string>
+    <string name="mms_delete_pref_title">Multimediaviestien raja</string>
+    <string name="set">Aseta</string>
+    <string name="no">Peruuta</string>
+    <string name="pref_messages_to_save">Aseta tallennettavien viestien määrä</string>
+    <string name="swipe_to_delete_conversation_pref_title">Poista liu\'uttamalla</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Pyyhkäise oikealle poistaaksesi keskustelun</string>
+    <string name="pref_quickmessage">QuickMessage</string>
+    <string name="pref_quickmessage_title">Näytä QuickMessage</string>
+    <string name="pref_quickmessage_summary">Avaa QuickMessage-ponnahdusikkuna automaattisesti saatuasi tekstiviestin</string>
+    <string name="pref_close_all_title">Sulje kaikki</string>
+    <string name="pref_close_all_summary">Sulje-painike sulkee kaikki viestit</string>
+    <string name="message_counter">%1$d/%2$d</string>
+    <string name="button_close">Sulje</string>
+    <string name="button_view">Lue</string>
+    <string name="button_templates">Viestipohjat</string>
+    <string name="qm_button_full_conversation">Koko keskustelu</string>
+    <string name="type_to_reply_text_enter_to_send">Kirjoita vastataksesi</string>
+    <string name="toast_sending_message">Lähetetään viestiä\u2026</string>
+    <string name="qm_quick_reply">Pikavastaus</string>
+    <string name="send">Lähetä</string>
+    <string name="compose_message_hint_text">Kirjoita viesti</string>
+    <string name="show_emoticons_pref_title">Hymiöiden käyttö</string>
+    <string name="show_emoticons_pref_summary">Näytä hymiönäppäin näppäimistöllä</string>
+    <string name="select_phone_account_title">Lähetä käyttäen</string>
+    <string name="pref_title_manage_sim_messages">Hallitse SIM-kortin viestejä</string>
+    <string name="pref_title_manage_sim_messages_slot1">Hallitse SIM 1:n viestejä</string>
+    <string name="pref_title_manage_sim_messages_slot2">Hallitse SIM 2:n viestejä</string>
+    <string name="copy_to_sim">Kopioi viesti SIM-kortille</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> viesteistä tallennettu SIM-kortille.</string>
+    <string name="copy_to_sim_fail">Viestin tallennus ei onnistu</string>
+    <string name="copy_to_phone_success">Viesti tallennettu</string>
+    <string name="copy_to_phone_fail">Viestin tallennus ei onnistu</string>
+    <string name="sim_empty">Ei viestejä SIM-kortilla.</string>
+    <string name="menu_send_email">Lähetä sähköpostia henkilölle <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Soita numeroon <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Lisää <xliff:g id="contactEmailOrNumber">%s</xliff:g> Yhteystietoihin</string>
+    <string name="sim_capacity_title">SIM-kortin kapasiteetti</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> SIM-kortista käytössä</string>
+    <string name="confirm_dialog_title">Poista?</string>
+    <string name="sim_manage_messages_title">SIM-kortin tekstiviestit</string>
+    <string name="refreshing">Päivitetään\u2026</string>
+    <string name="confirm_delete_selected_messages">Valitut viestit poistetaan.</string>
+    <string name="delete">Poista</string>
+    <string name="menu_forward">Lähetä edelleen</string>
+    <string name="menu_reply">Vastaa</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Kopioi tabletin muistiin</string>
+    <string name="sim_copy_to_phone_memory" product="default">Kopioi puhelimen muistiin</string>
+    <string name="selected_all">Valitse kaikki</string>
+    <string name="deselected_all">Poista valinnat</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> valittu</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Kopioi viesti SIM-kortille</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Valitse kuvat ja videot tästä laitteesta</string>
+    <string name="mediapicker_audioListChooserDescription">Valitse äänitiedostot tästä laitteesta</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Ei voida liittää videota. Enimmäiskoko ylittynyt.</string>
+    <string name="mediapicker_audio_list_title">Valitse audio</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Audio on valittu.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Audiota ei valittu.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> valittu</string>
 </resources>
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-fr-rCA/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index f466a0e..90b5849 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Signaler comme spam à %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Enlever l\'Unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Conserver les caractères</string>
-  <string name="pref_unicode_stripping_non_encodable">Enlever les caractères non encodables</string>
-  <string name="pref_unicode_stripping_all">Enlever tous les caractères Unicode</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Durée de validité</string>
-  <string name="validity_period_slot1_pref_title">Durée de validité pour la SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Durée de validité pour la SIM 2</string>
-  <string name="sms_validity_period_not_set">Non définie</string>
-  <string name="sms_validity_period_one_hour">1 heure</string>
-  <string name="sms_validity_period_six_hours">6 heures</string>
-  <string name="sms_validity_period_twelve_hours">12 heures</string>
-  <string name="sms_validity_period_one_day">1 jour</string>
-  <string name="mms_validity_period_two_days">2 jours</string>
-  <string name="mms_validity_period_one_week">1 semaine</string>
-  <string name="validity_period_maximum">Maximale</string>
-  <string name="pref_summary_mms_delivery_reports">Demander un accusé de réception pour chaque message envoyé</string>
-  <string name="pref_summary_mms_read_reports">Demander un accusé de lecture pour chaque message envoyé</string>
-  <string name="delivery_reports_mms_pref_title">Accusés de réception</string>
-  <string name="read_reports_mms_pref_title">Accusés de lecture</string>
-  <string name="status_label">Statut :\u0020</string>
-  <string name="status_read">Lu</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Priorité de l\'envoi</string>
-  <string name="priority_low">Faible</string>
-  <string name="priority_normal">Normale</string>
-  <string name="priority_high">Élevée</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Stockage</string>
-  <string name="pref_summary_auto_delete">Supprimer les anciens messages lorsque les limites sont atteintes</string>
-  <string name="auto_delete_pref_title">Supprimer les anciens messages</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> messages par conversation</string>
-  <string name="sms_delete_pref_title">Limiter l\'émission de SMS</string>
-  <string name="mms_delete_pref_title">Limiter l\'émission de MMS</string>
-  <string name="set">Définir</string>
-  <string name="no">Annuler</string>
-  <string name="pref_messages_to_save">Définir le nombre de messages à sauvegarder</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Balayer pour supprimer</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Balayer vers la droite pour supprimer une conversation</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Message rapide et réponse</string>
-  <string name="pref_quickmessage_title">Afficher Message rapide</string>
-  <string name="pref_quickmessage_summary">Ouvrir automatiquement la fenêtre QuickMessage pour les messages SMS entrants</string>
-  <string name="pref_close_all_title">Tout fermer</string>
-  <string name="pref_close_all_summary">Le bouton Fermer ferme tous les messages</string>
-  <string name="message_counter">%1$d sur %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Fermer</string>
-  <string name="button_view">Afficher</string>
-  <string name="button_templates">Modèles</string>
-  <string name="qm_button_full_conversation">Conversation complète</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Taper une réponse</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Envoi du message\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Réponse rapide</string>
-  <string name="send">Envoyer</string>
-  <string name="compose_message_hint_text">Entrer un message</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Accès aux émoticônes</string>
-  <string name="show_emoticons_pref_summary">Afficher la touche émoticônes sur le clavier</string>
-  <string name="select_phone_account_title">Envoyer avec</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Gérer les messages de la carte SIM</string>
-  <string name="pref_title_manage_sim_messages_slot1">Gérer les messages de la SIM 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Gérer les messages de la SIM 2</string>
-  <string name="copy_to_sim">Copier le message vers la carte SIM</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> messages sur <xliff:g id="total">%2$d</xliff:g> enregistrés sur la carte SIM.</string>
-  <string name="copy_to_sim_fail">Impossible d\'enregistrer le message</string>
-  <string name="copy_to_phone_success">Message enregistré</string>
-  <string name="copy_to_phone_fail">Impossible d\'enregistrer le message</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">Aucun message sur la carte SIM.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Envoyer un courriel à <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">Appeler <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">Ajouter <xliff:g id="contactEmailOrNumber">%s</xliff:g> aux Contacts</string>
-  <string name="sim_capacity_title">Capacité de la SIM</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> entrées sur <xliff:g id="total">%2$d</xliff:g> de la carte SIM sont utilisées</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Supprimer ?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">SMS sur la carte SIM</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Actualisation\u2026</string>
-  <string name="confirm_delete_selected_messages">Les messages sélectionnés seront supprimés.</string>
-  <!-- Delete button title -->
-  <string name="delete">Supprimer</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Transférer</string>
-  <string name="menu_reply">Répondre</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Copier vers la mémoire de la tablette</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Copier vers la mémoire du téléphone</string>
-  <string name="selected_all">Tout sélectionner</string>
-  <string name="deselected_all">Tout désélectionner</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> sélectionné(s)</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">Copier le message vers la carte 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">Choisir des images ou des vidéos depuis cet appareil</string>
-  <string name="mediapicker_audioListChooserDescription">Choisir des fichiers audio depuis cet appareil</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Impossible de joindre ce fichier vidéo. Taille maximale de message dépassée.</string>
-  <string name="mediapicker_audio_list_title">Sélectionner un fichier audio</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Fichier audio sélectionné.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Fichier audio non sélectionné.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> sélectionné(s)</string>
+    <string name="report_as_spam_to">Signaler comme spam à %s</string>
+    <string name="unicode_stripping_pref_title">Enlever l\'Unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Conserver les caractères</string>
+    <string name="pref_unicode_stripping_non_encodable">Enlever les caractères non encodables</string>
+    <string name="pref_unicode_stripping_all">Enlever tous les caractères Unicode</string>
+    <string name="validity_period_pref_title">Durée de validité</string>
+    <string name="validity_period_slot1_pref_title">Durée de validité pour la SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Durée de validité pour la SIM 2</string>
+    <string name="sms_validity_period_not_set">Non définie</string>
+    <string name="sms_validity_period_one_hour">1 heure</string>
+    <string name="sms_validity_period_six_hours">6 heures</string>
+    <string name="sms_validity_period_twelve_hours">12 heures</string>
+    <string name="sms_validity_period_one_day">1 jour</string>
+    <string name="mms_validity_period_two_days">2 jours</string>
+    <string name="mms_validity_period_one_week">1 semaine</string>
+    <string name="validity_period_maximum">Maximale</string>
+    <string name="pref_summary_mms_delivery_reports">Demander un accusé de réception pour chaque message envoyé</string>
+    <string name="pref_summary_mms_read_reports">Demander un accusé de lecture pour chaque message envoyé</string>
+    <string name="delivery_reports_mms_pref_title">Accusés de réception</string>
+    <string name="read_reports_mms_pref_title">Accusés de lecture</string>
+    <string name="status_label">Statut :\u0020</string>
+    <string name="status_read">Lu</string>
+    <string name="priority_pref_title">Priorité de l\'envoi</string>
+    <string name="priority_low">Faible</string>
+    <string name="priority_normal">Normale</string>
+    <string name="priority_high">Élevée</string>
+    <string name="sms_storage_pref_title">Stockage</string>
+    <string name="pref_summary_auto_delete">Supprimer les anciens messages lorsque les limites sont atteintes</string>
+    <string name="auto_delete_pref_title">Supprimer les anciens messages</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> messages par conversation</string>
+    <string name="sms_delete_pref_title">Limiter l\'émission de SMS</string>
+    <string name="mms_delete_pref_title">Limiter l\'émission de MMS</string>
+    <string name="set">Définir</string>
+    <string name="no">Annuler</string>
+    <string name="pref_messages_to_save">Définir le nombre de messages à sauvegarder</string>
+    <string name="swipe_to_delete_conversation_pref_title">Balayer pour supprimer</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Balayer vers la droite pour supprimer une conversation</string>
+    <string name="pref_quickmessage">Message rapide et réponse</string>
+    <string name="pref_quickmessage_title">Afficher Message rapide</string>
+    <string name="pref_quickmessage_summary">Ouvrir automatiquement la fenêtre QuickMessage pour les messages SMS entrants</string>
+    <string name="pref_close_all_title">Tout fermer</string>
+    <string name="pref_close_all_summary">Le bouton Fermer ferme tous les messages</string>
+    <string name="message_counter">%1$d sur %2$d</string>
+    <string name="button_close">Fermer</string>
+    <string name="button_view">Afficher</string>
+    <string name="button_templates">Modèles</string>
+    <string name="qm_button_full_conversation">Conversation complète</string>
+    <string name="type_to_reply_text_enter_to_send">Taper une réponse</string>
+    <string name="toast_sending_message">Envoi du message\u2026</string>
+    <string name="qm_quick_reply">Réponse rapide</string>
+    <string name="send">Envoyer</string>
+    <string name="compose_message_hint_text">Entrer un message</string>
+    <string name="show_emoticons_pref_title">Accès aux émoticônes</string>
+    <string name="show_emoticons_pref_summary">Afficher la touche émoticônes sur le clavier</string>
+    <string name="select_phone_account_title">Envoyer avec</string>
+    <string name="pref_title_manage_sim_messages">Gérer les messages de la carte SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Gérer les messages de la SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Gérer les messages de la SIM 2</string>
+    <string name="copy_to_sim">Copier le message vers la carte SIM</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> messages sur <xliff:g id="total">%2$d</xliff:g> enregistrés sur la carte SIM.</string>
+    <string name="copy_to_sim_fail">Impossible d\'enregistrer le message</string>
+    <string name="copy_to_phone_success">Message enregistré</string>
+    <string name="copy_to_phone_fail">Impossible d\'enregistrer le message</string>
+    <string name="sim_empty">Aucun message sur la carte SIM.</string>
+    <string name="menu_send_email">Envoyer un courriel à <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Appeler <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Ajouter <xliff:g id="contactEmailOrNumber">%s</xliff:g> aux Contacts</string>
+    <string name="sim_capacity_title">Capacité de la SIM</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> entrées sur <xliff:g id="total">%2$d</xliff:g> de la carte SIM sont utilisées</string>
+    <string name="confirm_dialog_title">Supprimer ?</string>
+    <string name="sim_manage_messages_title">SMS sur la carte SIM</string>
+    <string name="refreshing">Actualisation\u2026</string>
+    <string name="confirm_delete_selected_messages">Les messages sélectionnés seront supprimés.</string>
+    <string name="delete">Supprimer</string>
+    <string name="menu_forward">Transférer</string>
+    <string name="menu_reply">Répondre</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Copier vers la mémoire de la tablette</string>
+    <string name="sim_copy_to_phone_memory" product="default">Copier vers la mémoire du téléphone</string>
+    <string name="selected_all">Tout sélectionner</string>
+    <string name="deselected_all">Tout désélectionner</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> sélectionné(s)</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Copier le message vers la carte SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Choisir des images ou des vidéos depuis cet appareil</string>
+    <string name="mediapicker_audioListChooserDescription">Choisir des fichiers audio depuis cet appareil</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Impossible de joindre ce fichier vidéo. Taille maximale de message dépassée.</string>
+    <string name="mediapicker_audio_list_title">Sélectionner un fichier audio</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Fichier audio sélectionné.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Fichier audio non sélectionné.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> sélectionné(s)</string>
 </resources>
diff --git a/res/values-fy-rNL/arrays.xml b/res/values-fy-rNL/arrays.xml
deleted file mode 100644
index f2be096..0000000
--- a/res/values-fy-rNL/arrays.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String to match as no subject and filter out as a subject. For example, if the
-         subject string is "no subject", we won't display that. We'll pretend
-         no subject string was delivered. -->
-  <!-- Choices for quick-reply to message notification. Users with an Android
-    Wear device (e.g. smartwatch) can reply to messages either by speaking their
-    response, or choosing one of these predefined options. -->
-</resources>
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index d7cf535..2dae6f5 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -16,35 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">Rapportearje oan %s as net-winske</string>
+    <string name="unicode_stripping_pref_title">Unikoade-tekens fuortsmite</string>
+    <string name="pref_unicode_stripping_leave_intact">Tekens yntakt litte</string>
+    <string name="pref_unicode_stripping_non_encodable">Net-enkodearbere tekens fuortsmite</string>
+    <string name="pref_unicode_stripping_all">Alle Unikoade-tekens fuortsmite</string>
+    <string name="validity_period_pref_title">Jildichheidsdoer</string>
+    <string name="validity_period_slot1_pref_title">Jildichheidsdoer foar SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Jildichheidsdoer foar SIM 2</string>
+    <string name="sms_validity_period_not_set">Net ynsteld</string>
+    <string name="sms_validity_period_one_hour">1 oer</string>
+    <string name="sms_validity_period_six_hours">6 oeren</string>
+    <string name="sms_validity_period_twelve_hours">12 oeren</string>
+    <string name="sms_validity_period_one_day">1 dei</string>
+    <string name="mms_validity_period_two_days">2 dagen</string>
+    <string name="mms_validity_period_one_week">1 wike</string>
+    <string name="validity_period_maximum">Maksimaal</string>
+    <string name="pref_summary_mms_delivery_reports">Untfangstbefêstiging freegje foar elk ferstjoerd berjocht</string>
+    <string name="pref_summary_mms_read_reports">Lêsbefêstiging freegje foar elk ferstjoerd berjocht</string>
+    <string name="delivery_reports_mms_pref_title">Untfangstbefêstigingen</string>
+    <string name="read_reports_mms_pref_title">Lêsbefêstigingen</string>
+    <string name="status_label">Steat:\u0020</string>
+    <string name="status_read">Lêzen</string>
+    <string name="priority_pref_title">Prioriteit</string>
+    <string name="priority_low">Leech</string>
+    <string name="priority_normal">Normaal</string>
+    <string name="priority_high">Heech</string>
+    <string name="sms_storage_pref_title">Unthâld</string>
+    <string name="pref_summary_auto_delete">Alde berjochten fuortsmite as limyt berikke is</string>
+    <string name="auto_delete_pref_title">Alde berjochten fuortsmite</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> berjochten per petear</string>
+    <string name="sms_delete_pref_title">Limyt sms-berjochten</string>
+    <string name="mms_delete_pref_title">Limyt multimediaberjochten</string>
+    <string name="set">Ynstelle</string>
+    <string name="no">Annulearje</string>
+    <string name="pref_messages_to_save">Oantal berjochten om te bewarjen</string>
+    <string name="swipe_to_delete_conversation_pref_title">Feie om fuort te smiten</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Nei rjochts feie om in petear fuort te smiten</string>
+    <string name="pref_quickmessage">Fluchberjocht en beäntwurdzje</string>
+    <string name="pref_quickmessage_title">Fluchberjocht toane</string>
+    <string name="pref_quickmessage_summary">Automatysk in Fluchberjocht-finster toane by ynkommende sms-berjochten</string>
+    <string name="pref_close_all_title">Alles slute</string>
+    <string name="pref_close_all_summary">Slute-knop slút alle berjochten</string>
+    <string name="message_counter">%1$d fan %2$d</string>
+    <string name="button_close">Slute</string>
+    <string name="button_view">Toane</string>
+    <string name="button_templates">Sjabloanen</string>
+    <string name="qm_button_full_conversation">Folslein petear</string>
+    <string name="type_to_reply_text_enter_to_send">Typ om te beäntwurdzjen</string>
+    <string name="toast_sending_message">Berjocht ferstjoere\u2026</string>
+    <string name="qm_quick_reply">Fluchbeäntwurdzje</string>
+    <string name="send">Ferstjoere</string>
+    <string name="compose_message_hint_text">Berjocht ynfiere</string>
+    <string name="show_emoticons_pref_title">Tagong ta emoticons</string>
+    <string name="show_emoticons_pref_summary">Emoticons-toets op it toetseboerd toane</string>
+    <string name="select_phone_account_title">Ferstjoere mei</string>
+    <string name="pref_title_manage_sim_messages">Berjochten op simkaart beheare</string>
+    <string name="pref_title_manage_sim_messages_slot1">Berjochten op SIM 1 beheare</string>
+    <string name="pref_title_manage_sim_messages_slot2">Berjochten op SIM 2 beheare</string>
+    <string name="copy_to_sim">Berjocht nei simkaart kopiearje</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> van <xliff:g id="total">%2$d</xliff:g> berjochten op simkaart bewarre.</string>
+    <string name="copy_to_sim_fail">Kin berjocht net bewarje</string>
+    <string name="copy_to_phone_success">Berjocht bewarre</string>
+    <string name="copy_to_phone_fail">Kin berjocht net bewarje</string>
+    <string name="sim_empty">Gjin berjochten op simkaart.</string>
+    <string name="menu_send_email">E-mailberjocht ferstjoere nei <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back"><xliff:g id="name">%s</xliff:g> belle</string>
+    <string name="menu_add_address_to_contacts"><xliff:g id="contactEmailOrNumber">%s</xliff:g> oan kontakten tafoegje</string>
+    <string name="sim_capacity_title">Sim-kapasiteit</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> fan <xliff:g id="total">%2$d</xliff:g> plakken op simkaart yn gebrûk</string>
+    <string name="confirm_dialog_title">Fuortsmite?</string>
+    <string name="sim_manage_messages_title">Berjochten op simkaart</string>
+    <string name="refreshing">Fernije\u2026</string>
+    <string name="confirm_delete_selected_messages">Selektearre berjocht wurdt fuortsmiten.</string>
+    <string name="delete">Fuortsmite</string>
+    <string name="menu_forward">Trochstjoere</string>
+    <string name="menu_reply">Beäntwurdzje</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Berjocht kopiearje nei tabletûnthâld</string>
+    <string name="sim_copy_to_phone_memory" product="default">Berjocht kopiearje nei telefoanûnthâld</string>
+    <string name="selected_all">Alles selektearje</string>
+    <string name="deselected_all">Alles deselektearje</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> selektearre</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Berjocht nei simkaart kopiearje</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Ofbyldingen of fideo\'s op dit apparaat selektearje</string>
+    <string name="mediapicker_audioListChooserDescription">Audiobestannen op dit apparaat selektearje</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Kin fideo net tafoegje. Oer maksimale berjochtgrutte hinne.</string>
+    <string name="mediapicker_audio_list_title">Audio selektearje</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Audio is selektearre.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Audio is net selektearre.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selektearre</string>
 </resources>
diff --git a/res/values-fy-rNL/strings.xml b/res/values-fy-rNL/strings.xml
deleted file mode 100644
index d73a67e..0000000
--- a/res/values-fy-rNL/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- The name of the application as it appears under the main Launcher icon and in various activity titles -->
-  <!-- The name of the application as it appears in external share intent dialogs -->
-  <!-- The title when selecting a conversation to share to -->
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <!-- The tab header for the frequently used contacts list -->
-  <!-- The tab header for all contacts list -->
-  <!-- The text on the list item in the contact picker that allows a user to send an SMS directly
-         to a number that he/she typed. eg. "Send to 650-555-1234" -->
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <!-- Abbreviated message to express that something occurred some number of hours in the past (e.g., 5 hours ago). -->
-  <!-- Abbreviated message to express that something occurred some number of days in the past (e.g., 5 days ago). -->
-  <!--
-        Plurals used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <!-- Title of the class-0 message activity. -->
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <!-- Title for SMS storage low notification and dialog. Must match the framework's notification title, i.e. //frameworks/base/core/res/res/values/strings.xml#low_internal_storage_view_title -->
-  <!-- Text for SMS storage low notification and dialog -->
-  <!-- Ticker for SMS storage low notification -->
-  <!-- Title for asking the user to enter their phone number -->
-  <!-- Text for asking the user to enter their phone number -->
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <!-- Free SMS storage actions -->
-  <!-- Free SMS storage action confirm dialog message -->
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <!-- While sending a message display this message. -->
-  <!-- When sending a message failed display this message. -->
-  <!-- When retrying sending for a message. -->
-  <!-- When showing resend action display this message. -->
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <!-- When showing resend action, display this message. -->
-  <!-- Title line for an MMS requiring manual download. -->
-  <!-- Title line for an MMS auto-downloading. -->
-  <!-- Title line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which is selected. -->
-  <!-- Timestamp line to display while downloading a message. -->
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <!-- Display this info line with an MMS notification -->
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for download failed -->
-  <!-- notification line 1 for multiple downloads failed -->
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <!-- Notification content when emergency SMS fails to send -->
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <!-- Content description text for Back button on the action bar -->
-  <!-- Action menu title for showing archived conversations -->
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <!-- An enumeration comma for separating multiple names in notifications. [CHAR LIMIT=2] -->
-  <!-- Separator between parts of a notification in each line of an inboxStyle notification. [CHAR LIMIT=2] -->
-  <!-- Separator between title and content in notification ticker -->
-  <!-- Separator between title and content in notifications -->
-  <!-- Shown in notifications when there's a picture. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <!-- Shown in the Android Wear conversation log as the sender for outgoing messages,
-         when we don't know the user's real name (e.g. no "Me" contact on the phone). -->
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <!-- Accessibility announcement for an incoming message -->
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <!-- Accessibility description for conversation list for group conversations -->
-  <!-- Accessibility description for conversation list for failed messages -->
-  <!-- Accessibility name for a group conversation -->
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <!-- Title for the preferences/settings activity -->
-  <!-- Title for the archived conversations activity -->
-  <!-- Action title: Close -->
-  <!-- Preference category: MMS messaging -->
-  <!-- Preference category: Advanced -->
-  <!-- Preference category: Debug -->
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <!-- Title for the notification sound preference -->
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <!-- Preference summary: Current default SMS app -->
-  <!-- Preference title: MMS phone number -->
-  <!-- Display text for phone number preference when the number is unknown -->
-  <!-- Title for the preference for playing a message send sound -->
-  <!-- Strings for dump sms/mms dialog -->
-  <!-- Title of long press menu on an individual message. -->
-  <!-- Menu item to copy message text -->
-  <!-- Title of long press menu for details about an individual message. -->
-  <!-- Title of long press menu for deleting an individual message. -->
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <!-- Title of "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <!-- Sender to be used if the sender address has been hidden -->
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <!-- Notifies the user when an attachment fails to load -->
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <!-- Title for the "People and Options" activity -->
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <!-- Title for the phone call button in the action bar that lets the user call a participant in an SMS conversation -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <!-- The hint text shown in the message compose input box when photo(s) is attached -->
-  <!-- The hint text shown in the message compose input box when audio recording(s) is attached -->
-  <!-- The hint text shown in the message compose input box when video(s) is attached -->
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <!-- Announcement after the user adds or removes an attachment -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <!-- The format of the subtitle of the help activity. -->
-  <!--  Action menu title to let users view open source license -->
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <!-- Reached MMS message attachment limit -->
-  <!-- Message attachment load failed -->
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- When there's a subject in an mms, the subject + message are shown in a notification -->
-  <!-- Text shown on contact VCard when it's being loaded -->
-  <!-- Text shown on contact VCard when it failed to load -->
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <!-- Title for the activity that shows details of VCards -->
-  <!-- VCard label for displaying birthdays -->
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <!-- Title for the message forwarding dialog -->
-  <!-- Title for the message reply dialog -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <!-- Dialog button text that closes the application. -->
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <!-- A message in conversation list view to indicate that the snipit text and preview is from an unsent draft. -->
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <!-- Indicates that the current message will be sent via MMS -->
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <!-- Title of block confirmation dialog -->
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <!-- The title of the list of blocked contacts -->
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <!-- Accessibility toast shown when a message is sending. -->
-  <!-- Accessibility toast shown when a message is sent. -->
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <!-- Accessibility : content description for numbers -->
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <!-- Text prepended to the subject of a forwarded message -->
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <!-- The notification toast text and action button label shown at bottom of screen, for when a new message comes in while the user
-         is in that conversation, but the message list is not scrolled to the bottom -->
-  <!-- Content description for the message images in a conversation or for the image preview in the conversation list if the lastest message in that conversation contains an image-->
-  <!-- Text for a toast message notifying the user that we can't find an appropriate application to handle their request -->
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Screen title after user selects APNs setting option -->
-  <!-- Edit access point label summary text when no value has been set -->
-  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
-  <!-- Edit access point labels: The actual access point name-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The type of APN -->
-  <!-- Edit access point screen menu option to delete this APN -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <!-- APNs screen menu option to reset default APN settings -->
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <!-- Title for Access Point Names settings -->
-  <!-- Title for Access Point Names settings activity -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <!-- The title for general settings section in the settings activity  -->
-  <!-- The title for advanced settings section in the settings activity  -->
-  <!-- The title for general settings activity  -->
-  <!-- The title for advanced settings activity  -->
-  <!-- The title for sim_specific settings  -->
-  <!-- The group MMS choices in settings -->
-  <!-- SIM number shown in the settings when the number is not known -->
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <!-- Content description for the SIM selector button in the conversation -->
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <!-- Content description for the audio record view -->
-  <!-- Content description for new conversation button in desktop widget -->
-  <!-- Content description for widget title -->
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <!-- Content description for new message button in desktop widget -->
-  <!-- Content description for conversation list button in desktop widget -->
-  <!-- Shown when loading conversations in the widget -->
-  <!-- Shown when loading messages in the widget -->
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <!-- Toast message telling the user that someone was blocked -->
-  <!-- Toast message telling the user that someone was unblocked -->
-  <!-- Title for attachment chooser activity -->
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message load failed -->
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <!-- When converting html to text link urls are inlined.  This specifies how the link should be
-    displayed.  For example, a link "click here" which navigates to "www.google.com" would have
-    text="click here" and url="www.google.com", using the below format to create "click here (www.google.com)" -->
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
-</resources>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 0fecdcf..39e48d3 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Reportar como lixo perante %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Quitar unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Manter os caracteres intactos</string>
-  <string name="pref_unicode_stripping_non_encodable">Eliminar caracteres non codificábeis</string>
-  <string name="pref_unicode_stripping_all">Substituír todos os caracteres unicode</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Período de validez</string>
-  <string name="validity_period_slot1_pref_title">Período de validez para a SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Período de validez para a SIM 2</string>
-  <string name="sms_validity_period_not_set">Sen definir</string>
-  <string name="sms_validity_period_one_hour">1 hora</string>
-  <string name="sms_validity_period_six_hours">6 horas</string>
-  <string name="sms_validity_period_twelve_hours">12 horas</string>
-  <string name="sms_validity_period_one_day">1 día</string>
-  <string name="mms_validity_period_two_days">2 días</string>
-  <string name="mms_validity_period_one_week">1 semana</string>
-  <string name="validity_period_maximum">Máximo</string>
-  <string name="pref_summary_mms_delivery_reports">Solicitar un informe de recepción para cada mensaxe que envíe</string>
-  <string name="pref_summary_mms_read_reports">Pedir confirmación de lectura para cada mensaxe enviada</string>
-  <string name="delivery_reports_mms_pref_title">Informes de entrega</string>
-  <string name="read_reports_mms_pref_title">Ler informes</string>
-  <string name="status_label">Estado:\u0020</string>
-  <string name="status_read">Lido</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Prioridade do envío</string>
-  <string name="priority_low">Baixa</string>
-  <string name="priority_normal">Enerxía normal</string>
-  <string name="priority_high">Alta</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Almacenamento</string>
-  <string name="pref_summary_auto_delete">Eliminar mensaxes antigos ao chegar aso límites</string>
-  <string name="auto_delete_pref_title">Eliminar mensaxes antigos</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mensaxes por conversación</string>
-  <string name="sms_delete_pref_title">Límite de mensaxes de texto</string>
-  <string name="mms_delete_pref_title">Límite de mensaxes multimedia</string>
-  <string name="set">Definir</string>
-  <string name="no">Cancelar</string>
-  <string name="pref_messages_to_save">Estableza o número de mensaxes a gardar</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Esvarar para eliminar</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Esvarar cara a dereita para eliminar unha conversa</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Mensaxe rápida e contestar</string>
-  <string name="pref_quickmessage_title">Amosar mensaxe rápida</string>
-  <string name="pref_quickmessage_summary">Abrir a xanela emerxente de Mensaxe rápida cando chegue unha mensaxe SMS</string>
-  <string name="pref_close_all_title">Pechar todo</string>
-  <string name="pref_close_all_summary">Que o botón de pechar peche todas as mensaxes</string>
-  <string name="message_counter">%1$d de %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Pechar</string>
-  <string name="button_view">Ver</string>
-  <string name="button_templates">Modelos</string>
-  <string name="qm_button_full_conversation">Toda a conversa</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Escriba para responder</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Enviando a mensaxe\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Reposta rápida</string>
-  <string name="send">Enviar</string>
-  <string name="compose_message_hint_text">Escriba a mensaxe</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Acceso ás emoticonas</string>
-  <string name="show_emoticons_pref_summary">Amosar a tecla das emoticonas no teclado</string>
-  <string name="select_phone_account_title">Enviar con</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Xestionar as mensaxes da tarxeta SIM</string>
-  <string name="pref_title_manage_sim_messages_slot1">Xestionar as mensaxes da SIM 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Xestionar as mensaxes da SIM 2</string>
-  <string name="copy_to_sim">Copiar a mensaxe na tarxeta SIM</string>
-  <string name="copy_to_sim_success">Gardáronse na tarxeta SIM <xliff:g id="count">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> mensaxes.</string>
-  <string name="copy_to_sim_fail">Non se pode gardar a mensaxe</string>
-  <string name="copy_to_phone_success">Mensaxe gardada</string>
-  <string name="copy_to_phone_fail">Non se pode gardar a mensaxe</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">Sen mensaxes na tarxeta SIM.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Enviar correo a <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">Chamar a <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">Engadir <xliff:g id="contactEmailOrNumber">%s</xliff:g> aos Contactos</string>
-  <string name="sim_capacity_title">Capacidade da SIM</string>
-  <string name="sim_capacity">Usáronse <xliff:g id="used">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> entradas da tarxeta SIM</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Eliminar?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Mensaxes na tarxeta SIM</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Actualizando\u2026</string>
-  <string name="confirm_delete_selected_messages">Eliminarase a mensaxe seleccionada.</string>
-  <!-- Delete button title -->
-  <string name="delete">Eliminar</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Reenviar</string>
-  <string name="menu_reply">Responder</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Copiar á memoria da tableta</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Copiar á memoria do teléfono</string>
-  <string name="selected_all">Seleccionar todas</string>
-  <string name="deselected_all">Deseleccionar todas</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> seleccionada(s)</string>
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <string name="yes">ACEPTAR</string>
-  <!-- Copy message to sim -->
-  <string name="operation_to_card_memory">Copiar a mensaxe na tarxeta 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">Escolle imaxes ou vídeos deste dispositivo</string>
-  <string name="mediapicker_audioListChooserDescription">Elixa arquivos de audio deste dispositivo</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Non é posíble anexar o vídeo. O tamaño máximo da mensaxe foi excedido.</string>
-  <string name="mediapicker_audio_list_title">Escoller audio</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">O audio está seleccionado.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">O audio non está seleccionado.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> sleccionado</string>
+    <string name="report_as_spam_to">Reportar como lixo perante %s</string>
+    <string name="unicode_stripping_pref_title">Quitar unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Manter os caracteres intactos</string>
+    <string name="pref_unicode_stripping_non_encodable">Eliminar caracteres non codificábeis</string>
+    <string name="pref_unicode_stripping_all">Substituír todos os caracteres unicode</string>
+    <string name="validity_period_pref_title">Período de validez</string>
+    <string name="validity_period_slot1_pref_title">Período de validez para a SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Período de validez para a SIM 2</string>
+    <string name="sms_validity_period_not_set">Sen definir</string>
+    <string name="sms_validity_period_one_hour">1 hora</string>
+    <string name="sms_validity_period_six_hours">6 horas</string>
+    <string name="sms_validity_period_twelve_hours">12 horas</string>
+    <string name="sms_validity_period_one_day">1 día</string>
+    <string name="mms_validity_period_two_days">2 días</string>
+    <string name="mms_validity_period_one_week">1 semana</string>
+    <string name="validity_period_maximum">Máximo</string>
+    <string name="pref_summary_mms_delivery_reports">Solicitar un informe de recepción para cada mensaxe que envíe</string>
+    <string name="pref_summary_mms_read_reports">Pedir confirmación de lectura para cada mensaxe enviada</string>
+    <string name="delivery_reports_mms_pref_title">Informes de entrega</string>
+    <string name="read_reports_mms_pref_title">Ler informes</string>
+    <string name="status_label">Estado:\u0020</string>
+    <string name="status_read">Lido</string>
+    <string name="priority_pref_title">Prioridade do envío</string>
+    <string name="priority_low">Baixa</string>
+    <string name="priority_normal">Enerxía normal</string>
+    <string name="priority_high">Alta</string>
+    <string name="sms_storage_pref_title">Almacenamento</string>
+    <string name="pref_summary_auto_delete">Eliminar mensaxes antigos ao chegar aso límites</string>
+    <string name="auto_delete_pref_title">Eliminar mensaxes antigos</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mensaxes por conversación</string>
+    <string name="sms_delete_pref_title">Límite de mensaxes de texto</string>
+    <string name="mms_delete_pref_title">Límite de mensaxes multimedia</string>
+    <string name="set">Definir</string>
+    <string name="no">Cancelar</string>
+    <string name="pref_messages_to_save">Estableza o número de mensaxes a gardar</string>
+    <string name="swipe_to_delete_conversation_pref_title">Esvarar para eliminar</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Esvarar cara a dereita para eliminar unha conversa</string>
+    <string name="pref_quickmessage">Mensaxe rápida e contestar</string>
+    <string name="pref_quickmessage_title">Amosar mensaxe rápida</string>
+    <string name="pref_quickmessage_summary">Abrir a xanela emerxente de Mensaxe rápida cando chegue unha mensaxe SMS</string>
+    <string name="pref_close_all_title">Pechar todo</string>
+    <string name="pref_close_all_summary">Que o botón de pechar peche todas as mensaxes</string>
+    <string name="message_counter">%1$d de %2$d</string>
+    <string name="button_close">Pechar</string>
+    <string name="button_view">Ver</string>
+    <string name="button_templates">Modelos</string>
+    <string name="qm_button_full_conversation">Toda a conversa</string>
+    <string name="type_to_reply_text_enter_to_send">Escriba para responder</string>
+    <string name="toast_sending_message">Enviando a mensaxe\u2026</string>
+    <string name="qm_quick_reply">Reposta rápida</string>
+    <string name="send">Enviar</string>
+    <string name="compose_message_hint_text">Escriba a mensaxe</string>
+    <string name="show_emoticons_pref_title">Acceso ás emoticonas</string>
+    <string name="show_emoticons_pref_summary">Amosar a tecla das emoticonas no teclado</string>
+    <string name="select_phone_account_title">Enviar con</string>
+    <string name="pref_title_manage_sim_messages">Xestionar as mensaxes da tarxeta SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Xestionar as mensaxes da SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Xestionar as mensaxes da SIM 2</string>
+    <string name="copy_to_sim">Copiar a mensaxe na tarxeta SIM</string>
+    <string name="copy_to_sim_success">Gardáronse na tarxeta SIM <xliff:g id="count">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> mensaxes.</string>
+    <string name="copy_to_sim_fail">Non se pode gardar a mensaxe</string>
+    <string name="copy_to_phone_success">Mensaxe gardada</string>
+    <string name="copy_to_phone_fail">Non se pode gardar a mensaxe</string>
+    <string name="sim_empty">Sen mensaxes na tarxeta SIM.</string>
+    <string name="menu_send_email">Enviar correo a <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Chamar a <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Engadir <xliff:g id="contactEmailOrNumber">%s</xliff:g> aos Contactos</string>
+    <string name="sim_capacity_title">Capacidade da SIM</string>
+    <string name="sim_capacity">Usáronse <xliff:g id="used">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> entradas da tarxeta SIM</string>
+    <string name="confirm_dialog_title">Eliminar?</string>
+    <string name="sim_manage_messages_title">Mensaxes na tarxeta SIM</string>
+    <string name="refreshing">Actualizando\u2026</string>
+    <string name="confirm_delete_selected_messages">Eliminarase a mensaxe seleccionada.</string>
+    <string name="delete">Eliminar</string>
+    <string name="menu_forward">Reenviar</string>
+    <string name="menu_reply">Responder</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Copiar á memoria da tableta</string>
+    <string name="sim_copy_to_phone_memory" product="default">Copiar á memoria do teléfono</string>
+    <string name="selected_all">Seleccionar todas</string>
+    <string name="deselected_all">Deseleccionar todas</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> seleccionada(s)</string>
+    <string name="yes">ACEPTAR</string>
+    <string name="operation_to_card_memory">Copiar a mensaxe na tarxeta SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Escolle imaxes ou vídeos deste dispositivo</string>
+    <string name="mediapicker_audioListChooserDescription">Elixa arquivos de audio deste dispositivo</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Non é posíble anexar o vídeo. O tamaño máximo da mensaxe foi excedido.</string>
+    <string name="mediapicker_audio_list_title">Escoller audio</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">O audio está seleccionado.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">O audio non está seleccionado.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> sleccionado</string>
 </resources>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 9e1ffa4..2b003f4 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -16,60 +16,29 @@
     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">સ્ટ્રિપ યુનિકોડ</string>
-  <string name="pref_unicode_stripping_leave_intact">વર્ણો અખંડ રાખો</string>
-  <string name="pref_unicode_stripping_non_encodable">એનકોડ ન થઈ શકે તેવા વર્ણો સ્ટ્રિપ કરો</string>
-  <string name="pref_unicode_stripping_all">તમામ યુનિકોડ વર્ણો સ્ટ્રિપ કરો</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- 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">ઇનકમિંગ SMS સંદેશાઓ માટે સ્વયંચાલિત રીતે કિવિકમેસેજ પોપ-અપ ખોલો</string>
-  <string name="pref_close_all_title">તમામ બંધ કરો</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 -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">%sને સ્પામ તરીકે રિપોર્ટ કરો</string>
+    <string name="unicode_stripping_pref_title">સ્ટ્રિપ યુનિકોડ</string>
+    <string name="pref_unicode_stripping_leave_intact">વર્ણો અખંડ રાખો</string>
+    <string name="pref_unicode_stripping_non_encodable">એનકોડ ન થઈ શકે તેવા વર્ણો સ્ટ્રિપ કરો</string>
+    <string name="pref_unicode_stripping_all">તમામ યુનિકોડ વર્ણો સ્ટ્રિપ કરો</string>
+    <string name="swipe_to_delete_conversation_pref_title">હટાવા માટે સ્વાઇપ કરો</string>
+    <string name="swipe_to_delete_conversation_pref_summary">વાતચીત કાઢી નાખવા જમણી બાજુ સ્વાઇપ કરો</string>
+    <string name="pref_quickmessage">ક્વિકમેસેજ અને જવાબ આપો</string>
+    <string name="pref_quickmessage_title">ક્વિકમેસેજ દર્શાવો</string>
+    <string name="pref_quickmessage_summary">ઇનકમિંગ SMS સંદેશાઓ માટે સ્વયંચાલિત રીતે કિવિકમેસેજ પોપ-અપ ખોલો</string>
+    <string name="pref_close_all_title">તમામ બંધ કરો</string>
+    <string name="pref_close_all_summary">બંધ બટન તમામ સંદેશા બંધ કરે છે</string>
+    <string name="message_counter">%2$d નું %1$d</string>
+    <string name="button_close">બંધ કરો</string>
+    <string name="button_view">જુઓ</string>
+    <string name="button_templates">ટેમ્પ્લેટ્સ</string>
+    <string name="qm_button_full_conversation">સંપૂર્ણ વાર્તાલાપ</string>
+    <string name="type_to_reply_text_enter_to_send">જવાબ આપવા ટાઇપ કરો</string>
+    <string name="toast_sending_message">સંદેશ મોકલવો\u2026</string>
+    <string name="qm_quick_reply">ઝડપી જવાબ</string>
+    <string name="send">મોકલો</string>
+    <string name="compose_message_hint_text">સંદેશ દાખલ કરો</string>
+    <string name="show_emoticons_pref_title">ઇમોટિકન્સ વપરાશ</string>
+    <string name="show_emoticons_pref_summary">કીબોર્ડ પર લાગણીઓ કી દેખાડો</string>
+    <string name="select_phone_account_title">આની સાથે મોકલો</string>
 </resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 83b879f..b5e0de9 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -16,49 +16,18 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <string name="pref_unicode_stripping_leave_intact">वर्णों को साबुत छोड़ें</string>
-  <string name="pref_unicode_stripping_non_encodable">ग़ैर-यूनीकोड वर्णों को स्ट्रिप करें</string>
-  <string name="pref_unicode_stripping_all">सभी यूनीकोड वर्णों को स्ट्रिप करें</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">तेज़संदेश और उत्तर</string>
-  <string name="pref_quickmessage_title">तेज़संदेश दिखाएँ</string>
-  <string name="pref_quickmessage_summary">आवक एसएमएस संदेशों के लिए अपने आप ही तेज़संदेश पॉपअप को खोलें</string>
-  <string name="pref_close_all_title">सबको बंद करें</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>
-  <!-- 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 -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="pref_unicode_stripping_leave_intact">वर्णों को साबुत छोड़ें</string>
+    <string name="pref_unicode_stripping_non_encodable">ग़ैर-यूनीकोड वर्णों को स्ट्रिप करें</string>
+    <string name="pref_unicode_stripping_all">सभी यूनीकोड वर्णों को स्ट्रिप करें</string>
+    <string name="pref_quickmessage">तेज़संदेश और उत्तर</string>
+    <string name="pref_quickmessage_title">तेज़संदेश दिखाएँ</string>
+    <string name="pref_quickmessage_summary">आवक एसएमएस संदेशों के लिए अपने आप ही तेज़संदेश पॉपअप को खोलें</string>
+    <string name="pref_close_all_title">सबको बंद करें</string>
+    <string name="pref_close_all_summary">बंद करें बटन सब संदेशों को बंद करता है</string>
+    <string name="message_counter">%2$d का %1$d</string>
+    <string name="button_close">बंद करें</string>
+    <string name="button_view">देखें</string>
+    <string name="button_templates">टेंप्लेट</string>
+    <string name="type_to_reply_text_enter_to_send">उत्तर देने के लिए टाइप करें</string>
+    <string name="toast_sending_message">संदेश भेज रहे हैं\u2026</string>
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 487a30c..e758bb1 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Prijavi kao neželjenu poštu %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Nacrtaj unikod</string>
-  <string name="pref_unicode_stripping_leave_intact">Ostavi znakove netaknute</string>
-  <string name="pref_unicode_stripping_non_encodable">Montiraj ne-kodirane znakove</string>
-  <string name="pref_unicode_stripping_all">Montiraj sve unikod znakove</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Rok valjanosti</string>
-  <string name="validity_period_slot1_pref_title">Rok valjanosti za SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Rok valjanosti za SIM 2</string>
-  <string name="sms_validity_period_not_set">Nije postavljeno</string>
-  <string name="sms_validity_period_one_hour">1 sat</string>
-  <string name="sms_validity_period_six_hours">6 sati</string>
-  <string name="sms_validity_period_twelve_hours">12 sati</string>
-  <string name="sms_validity_period_one_day">1 dan</string>
-  <string name="mms_validity_period_two_days">2 dana</string>
-  <string name="mms_validity_period_one_week">1 tjedan</string>
-  <string name="validity_period_maximum">Maksimalno</string>
-  <string name="pref_summary_mms_delivery_reports">Zahtjevaj potvrdu isporuke za svaku poslanu poruku</string>
-  <string name="pref_summary_mms_read_reports">Zatraži potvrdu čitanja za svaku poslanu poruku</string>
-  <string name="delivery_reports_mms_pref_title">Izvješća o isporuci</string>
-  <string name="read_reports_mms_pref_title">Čitaj izvještaje</string>
-  <string name="status_label">Stanje:\u0020</string>
-  <string name="status_read">Čitanje</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Prioritet slanja</string>
-  <string name="priority_low">Nizak</string>
-  <string name="priority_normal">Normalan</string>
-  <string name="priority_high">Visok</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Pohrana</string>
-  <string name="pref_summary_auto_delete">Izbrišite stare poruke kada se dosegne ograničenje</string>
-  <string name="auto_delete_pref_title">Izbriši stare poruke</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> poruka po razgovoru</string>
-  <string name="sms_delete_pref_title">Ograničenje SMS poruka</string>
-  <string name="mms_delete_pref_title">Ograničenje za multimedijske poruke</string>
-  <string name="set">Postavi</string>
-  <string name="no">Poništi</string>
-  <string name="pref_messages_to_save">Postavi broj poruka za spremanje</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Prijeđite prstom da biste izbrisali</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Prstom prijeđite udesno da biste izbrisali razgovor</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">BrzaPoruka i Odgovor</string>
-  <string name="pref_quickmessage_title">Pokaži BrzuPoruku</string>
-  <string name="pref_quickmessage_summary">Automatski otvori skočni prozor Brze poruke za dolazeće SMS poruke</string>
-  <string name="pref_close_all_title">Zatvori sve</string>
-  <string name="pref_close_all_summary">Zatvori tipka zatvara sve poruke</string>
-  <string name="message_counter">%1$d od %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Zatvori</string>
-  <string name="button_view">Pogledaj</string>
-  <string name="button_templates">Predlošci</string>
-  <string name="qm_button_full_conversation">Cijeli razgovor</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Napišite odgovor</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Slanje poruke\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Brze Poruke</string>
-  <string name="send">Pošalji</string>
-  <string name="compose_message_hint_text">Unesite poruku</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Pristup emotikonima</string>
-  <string name="show_emoticons_pref_summary">Pokaži tipku emotikona na tipkovnici</string>
-  <string name="select_phone_account_title">Pošalji s</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Upravljanje porukama SIM kartice</string>
-  <string name="pref_title_manage_sim_messages_slot1">Upravljanje porukama SIM 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Upravljanje porukama SIM 2</string>
-  <string name="copy_to_sim">Kopiraj poruku na SIM karticu</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> od <xliff:g id="total">%2$d</xliff:g> poruka spremljeno na SIM karticu.</string>
-  <string name="copy_to_sim_fail">Nije moguće spremiti poruku</string>
-  <string name="copy_to_phone_success">Poruka spremljena</string>
-  <string name="copy_to_phone_fail">Nije moguće spremiti poruku</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">Nema poruka na SIM kartici.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Pošalji e-poštu 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">Nazovi <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">Dodaj <xliff:g id="contactEmailOrNumber">%s </xliff:g> u Osobe</string>
-  <string name="sim_capacity_title">SIM kapacitet</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> od <xliff:g id="total">%2$d</xliff:g> unosa SIM kartice iskorišteno</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Izbrisati?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Tekstualne poruke na SIM kartici</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Osvježavanje\u2026</string>
-  <string name="confirm_delete_selected_messages">Odabrane poruke će biti izbrisane.</string>
-  <!-- Delete button title -->
-  <string name="delete">Izbriši</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Proslijedi</string>
-  <string name="menu_reply">Odgovori</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Kopiraj u memoriju tableta</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Kopiraj u memoriju telefona</string>
-  <string name="selected_all">Odaberi sve</string>
-  <string name="deselected_all">Poništi odabir</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> odabrano</string>
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <string name="yes">U redu</string>
-  <!-- Copy message to sim -->
-  <string name="operation_to_card_memory">Kopiraj poruku na SIM karticu</string>
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Odaberite slike ili videozapise s ovog uređaja</string>
-  <string name="mediapicker_audioListChooserDescription">Odaberite audio datoteke s ovog uređaja</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Ne mogu priložiti videozapis. Premašena maks. veličina poruke.</string>
-  <string name="mediapicker_audio_list_title">Odaberite audio</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Audio je odabran.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Audio nije odabran.</string>
-  <string name="mediapicker_audio_list_title_selection">Odabrano <xliff:g id="count">%d</xliff:g></string>
+    <string name="report_as_spam_to">Prijavi kao neželjenu poštu %s</string>
+    <string name="unicode_stripping_pref_title">Nacrtaj unikod</string>
+    <string name="pref_unicode_stripping_leave_intact">Ostavi znakove netaknute</string>
+    <string name="pref_unicode_stripping_non_encodable">Montiraj ne-kodirane znakove</string>
+    <string name="pref_unicode_stripping_all">Montiraj sve unikod znakove</string>
+    <string name="validity_period_pref_title">Rok valjanosti</string>
+    <string name="validity_period_slot1_pref_title">Rok valjanosti za SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Rok valjanosti za SIM 2</string>
+    <string name="sms_validity_period_not_set">Nije postavljeno</string>
+    <string name="sms_validity_period_one_hour">1 sat</string>
+    <string name="sms_validity_period_six_hours">6 sati</string>
+    <string name="sms_validity_period_twelve_hours">12 sati</string>
+    <string name="sms_validity_period_one_day">1 dan</string>
+    <string name="mms_validity_period_two_days">2 dana</string>
+    <string name="mms_validity_period_one_week">1 tjedan</string>
+    <string name="validity_period_maximum">Maksimalno</string>
+    <string name="pref_summary_mms_delivery_reports">Zahtjevaj potvrdu isporuke za svaku poslanu poruku</string>
+    <string name="pref_summary_mms_read_reports">Zatraži potvrdu čitanja za svaku poslanu poruku</string>
+    <string name="delivery_reports_mms_pref_title">Izvješća o isporuci</string>
+    <string name="read_reports_mms_pref_title">Čitaj izvještaje</string>
+    <string name="status_label">Stanje:\u0020</string>
+    <string name="status_read">Čitanje</string>
+    <string name="priority_pref_title">Prioritet slanja</string>
+    <string name="priority_low">Nizak</string>
+    <string name="priority_normal">Normalan</string>
+    <string name="priority_high">Visok</string>
+    <string name="sms_storage_pref_title">Pohrana</string>
+    <string name="pref_summary_auto_delete">Izbrišite stare poruke kada se dosegne ograničenje</string>
+    <string name="auto_delete_pref_title">Izbriši stare poruke</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> poruka po razgovoru</string>
+    <string name="sms_delete_pref_title">Ograničenje SMS poruka</string>
+    <string name="mms_delete_pref_title">Ograničenje za multimedijske poruke</string>
+    <string name="set">Postavi</string>
+    <string name="no">Poništi</string>
+    <string name="pref_messages_to_save">Postavi broj poruka za spremanje</string>
+    <string name="swipe_to_delete_conversation_pref_title">Prijeđite prstom da biste izbrisali</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Prstom prijeđite udesno da biste izbrisali razgovor</string>
+    <string name="pref_quickmessage">BrzaPoruka i Odgovor</string>
+    <string name="pref_quickmessage_title">Pokaži BrzuPoruku</string>
+    <string name="pref_quickmessage_summary">Automatski otvori skočni prozor Brze poruke za dolazeće SMS poruke</string>
+    <string name="pref_close_all_title">Zatvori sve</string>
+    <string name="pref_close_all_summary">Zatvori tipka zatvara sve poruke</string>
+    <string name="message_counter">%1$d od %2$d</string>
+    <string name="button_close">Zatvori</string>
+    <string name="button_view">Pogledaj</string>
+    <string name="button_templates">Predlošci</string>
+    <string name="qm_button_full_conversation">Cijeli razgovor</string>
+    <string name="type_to_reply_text_enter_to_send">Napišite odgovor</string>
+    <string name="toast_sending_message">Slanje poruke\u2026</string>
+    <string name="qm_quick_reply">Brze Poruke</string>
+    <string name="send">Pošalji</string>
+    <string name="compose_message_hint_text">Unesite poruku</string>
+    <string name="show_emoticons_pref_title">Pristup emotikonima</string>
+    <string name="show_emoticons_pref_summary">Pokaži tipku emotikona na tipkovnici</string>
+    <string name="select_phone_account_title">Pošalji s</string>
+    <string name="pref_title_manage_sim_messages">Upravljanje porukama SIM kartice</string>
+    <string name="pref_title_manage_sim_messages_slot1">Upravljanje porukama SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Upravljanje porukama SIM 2</string>
+    <string name="copy_to_sim">Kopiraj poruku na SIM karticu</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> od <xliff:g id="total">%2$d</xliff:g> poruka spremljeno na SIM karticu.</string>
+    <string name="copy_to_sim_fail">Nije moguće spremiti poruku</string>
+    <string name="copy_to_phone_success">Poruka spremljena</string>
+    <string name="copy_to_phone_fail">Nije moguće spremiti poruku</string>
+    <string name="sim_empty">Nema poruka na SIM kartici.</string>
+    <string name="menu_send_email">Pošalji e-poštu na <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Nazovi <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Dodaj <xliff:g id="contactEmailOrNumber">%s </xliff:g> u Osobe</string>
+    <string name="sim_capacity_title">SIM kapacitet</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> od <xliff:g id="total">%2$d</xliff:g> unosa SIM kartice iskorišteno</string>
+    <string name="confirm_dialog_title">Izbrisati?</string>
+    <string name="sim_manage_messages_title">Tekstualne poruke na SIM kartici</string>
+    <string name="refreshing">Osvježavanje\u2026</string>
+    <string name="confirm_delete_selected_messages">Odabrane poruke će biti izbrisane.</string>
+    <string name="delete">Izbriši</string>
+    <string name="menu_forward">Proslijedi</string>
+    <string name="menu_reply">Odgovori</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Kopiraj u memoriju tableta</string>
+    <string name="sim_copy_to_phone_memory" product="default">Kopiraj u memoriju telefona</string>
+    <string name="selected_all">Odaberi sve</string>
+    <string name="deselected_all">Poništi odabir</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> odabrano</string>
+    <string name="yes">U redu</string>
+    <string name="operation_to_card_memory">Kopiraj poruku na SIM karticu</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Odaberite slike ili videozapise s ovog uređaja</string>
+    <string name="mediapicker_audioListChooserDescription">Odaberite audio datoteke s ovog uređaja</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Ne mogu priložiti videozapis. Premašena maks. veličina poruke.</string>
+    <string name="mediapicker_audio_list_title">Odaberite audio</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Audio je odabran.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Audio nije odabran.</string>
+    <string name="mediapicker_audio_list_title_selection">Odabrano <xliff:g id="count">%d</xliff:g></string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 4eaab2d..d55de32 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Spamként jelent: %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Unicode beállítások</string>
-  <string name="pref_unicode_stripping_leave_intact">Ne módosítsa a karaktereket</string>
-  <string name="pref_unicode_stripping_non_encodable">Helyettesítse a nem kódolható karaktereket</string>
-  <string name="pref_unicode_stripping_all">Helyettesítse az összes unicode karaktert</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Érvényességi idő</string>
-  <string name="validity_period_slot1_pref_title">SIM 1 érvényességi idő</string>
-  <string name="validity_period_slot2_pref_title">SIM 2 érvényességi idő</string>
-  <string name="sms_validity_period_not_set">Nincs beállítva</string>
-  <string name="sms_validity_period_one_hour">1 óra</string>
-  <string name="sms_validity_period_six_hours">6 óra</string>
-  <string name="sms_validity_period_twelve_hours">12 óra</string>
-  <string name="sms_validity_period_one_day">1 nap</string>
-  <string name="mms_validity_period_two_days">2 nap</string>
-  <string name="mms_validity_period_one_week">1 hét</string>
-  <string name="validity_period_maximum">Maximum</string>
-  <string name="pref_summary_mms_delivery_reports">Kézbesítési jelentés kérése minden elküldött üzenet után</string>
-  <string name="pref_summary_mms_read_reports">Olvasási jelentés kérése minden elküldött üzenet után</string>
-  <string name="delivery_reports_mms_pref_title">Kézbesítési jelentések</string>
-  <string name="read_reports_mms_pref_title">Olvasási jelentések</string>
-  <string name="status_label">Állapot:\u0020</string>
-  <string name="status_read">Elolvasva</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Küldési prioritás</string>
-  <string name="priority_low">Alacsony</string>
-  <string name="priority_normal">Normál</string>
-  <string name="priority_high">Magas</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Tároló</string>
-  <string name="pref_summary_auto_delete">Régi üzenetek törlése a korlát elérésekor</string>
-  <string name="auto_delete_pref_title">Régi üzenetek törlése</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> üzenet beszélgetésenként</string>
-  <string name="sms_delete_pref_title">Szöveges üzenet korlátja</string>
-  <string name="mms_delete_pref_title">Multimédia üzenet korlátja</string>
-  <string name="set">Beállítás</string>
-  <string name="no">Elvet</string>
-  <string name="pref_messages_to_save">Menteni kívánt üzenetek számának beállítása</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Törléshez csúsztassa az ujját</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Húzza jobbra a beszélgetés törléséhez</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Gyors üzenetek és válaszok</string>
-  <string name="pref_quickmessage_title">Gyors üzenetek megjelenítése</string>
-  <string name="pref_quickmessage_summary">Automatikusan nyissa meg a Gyors üzenetek felugró ablakot bejövő üzenetek esetén</string>
-  <string name="pref_close_all_title">Összes bezárása</string>
-  <string name="pref_close_all_summary">A bezárás gomb az összes üzenetet zárja be</string>
-  <string name="message_counter">%1$d / %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Bezárás</string>
-  <string name="button_view">Megtekintés</string>
-  <string name="button_templates">Sablonok</string>
-  <string name="qm_button_full_conversation">Teljes beszélgetés</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Írja be az üzenetet</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Üzenet küldése\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Gyors válasz</string>
-  <string name="send">Küldés</string>
-  <string name="compose_message_hint_text">Üzenet megadása</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Hangulatjel hozzáférés</string>
-  <string name="show_emoticons_pref_summary">Hangulatjel gomb megjelenítése a billentyűzeten</string>
-  <string name="select_phone_account_title">Küldés a következővel</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">SIM-kártya üzenetek kezelése</string>
-  <string name="pref_title_manage_sim_messages_slot1">SIM 1 üzenetek kezelése</string>
-  <string name="pref_title_manage_sim_messages_slot2">SIM 2 üzenetek kezelése</string>
-  <string name="copy_to_sim">Üzenet másolása SIM-kártyára</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> üzenet SIM-kártyára másolva.</string>
-  <string name="copy_to_sim_fail">Nem lehet menteni az üzenetet</string>
-  <string name="copy_to_phone_success">Üzenet mentve</string>
-  <string name="copy_to_phone_fail">Nem lehet menteni az üzenetet</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">Nincsenek üzenetek a SIM-kártyán.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">E-mail küldése: <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"><xliff:g id="name">%s</xliff:g> hívása</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> hozzáadása a Személyekhez</string>
-  <string name="sim_capacity_title">SIM-kapacitás</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> SIM-kártya bejegyzés használva</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Biztosan törli?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Szöveges üzenetek a SIM-kártyán</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Frissítés\u2026</string>
-  <string name="confirm_delete_selected_messages">Kijelölt üzenet törlésre kerül.</string>
-  <!-- Delete button title -->
-  <string name="delete">Törlés</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Továbbítás</string>
-  <string name="menu_reply">Válasz</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Másolás a táblagép memóriájába</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Másolás a telefon memóriájába</string>
-  <string name="selected_all">Összes kijelölése</string>
-  <string name="deselected_all">Kijelölés elvetése</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> kiválasztva</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">Üzenet másolása SIM-kártyára</string>
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Képek vagy videók kiválasztása az eszközről</string>
-  <string name="mediapicker_audioListChooserDescription">Hangfájlok kiválasztása az eszközről</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Nem sikerült csatolni a videót. Maximális méret túllépve.</string>
-  <string name="mediapicker_audio_list_title">Válasszon hangot</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Hang kiválasztva.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Nincs hang kiválasztva.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="COUNT">%d</xliff:g> kiválasztva</string>
+    <string name="report_as_spam_to">Spamként jelent: %s</string>
+    <string name="unicode_stripping_pref_title">Unicode beállítások</string>
+    <string name="pref_unicode_stripping_leave_intact">Ne módosítsa a karaktereket</string>
+    <string name="pref_unicode_stripping_non_encodable">Helyettesítse a nem kódolható karaktereket</string>
+    <string name="pref_unicode_stripping_all">Helyettesítse az összes unicode karaktert</string>
+    <string name="validity_period_pref_title">Érvényességi idő</string>
+    <string name="validity_period_slot1_pref_title">SIM 1 érvényességi idő</string>
+    <string name="validity_period_slot2_pref_title">SIM 2 érvényességi idő</string>
+    <string name="sms_validity_period_not_set">Nincs beállítva</string>
+    <string name="sms_validity_period_one_hour">1 óra</string>
+    <string name="sms_validity_period_six_hours">6 óra</string>
+    <string name="sms_validity_period_twelve_hours">12 óra</string>
+    <string name="sms_validity_period_one_day">1 nap</string>
+    <string name="mms_validity_period_two_days">2 nap</string>
+    <string name="mms_validity_period_one_week">1 hét</string>
+    <string name="validity_period_maximum">Maximum</string>
+    <string name="pref_summary_mms_delivery_reports">Kézbesítési jelentés kérése minden elküldött üzenet után</string>
+    <string name="pref_summary_mms_read_reports">Olvasási jelentés kérése minden elküldött üzenet után</string>
+    <string name="delivery_reports_mms_pref_title">Kézbesítési jelentések</string>
+    <string name="read_reports_mms_pref_title">Olvasási jelentések</string>
+    <string name="status_label">Állapot:\u0020</string>
+    <string name="status_read">Elolvasva</string>
+    <string name="priority_pref_title">Küldési prioritás</string>
+    <string name="priority_low">Alacsony</string>
+    <string name="priority_normal">Normál</string>
+    <string name="priority_high">Magas</string>
+    <string name="sms_storage_pref_title">Tároló</string>
+    <string name="pref_summary_auto_delete">Régi üzenetek törlése a korlát elérésekor</string>
+    <string name="auto_delete_pref_title">Régi üzenetek törlése</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> üzenet beszélgetésenként</string>
+    <string name="sms_delete_pref_title">Szöveges üzenet korlátja</string>
+    <string name="mms_delete_pref_title">Multimédia üzenet korlátja</string>
+    <string name="set">Beállítás</string>
+    <string name="no">Elvet</string>
+    <string name="pref_messages_to_save">Menteni kívánt üzenetek számának beállítása</string>
+    <string name="swipe_to_delete_conversation_pref_title">Törléshez csúsztassa az ujját</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Húzza jobbra a beszélgetés törléséhez</string>
+    <string name="pref_quickmessage">Gyors üzenetek és válaszok</string>
+    <string name="pref_quickmessage_title">Gyors üzenetek megjelenítése</string>
+    <string name="pref_quickmessage_summary">Automatikusan nyissa meg a Gyors üzenetek felugró ablakot bejövő üzenetek esetén</string>
+    <string name="pref_close_all_title">Összes bezárása</string>
+    <string name="pref_close_all_summary">A bezárás gomb az összes üzenetet zárja be</string>
+    <string name="message_counter">%1$d / %2$d</string>
+    <string name="button_close">Bezárás</string>
+    <string name="button_view">Megtekintés</string>
+    <string name="button_templates">Sablonok</string>
+    <string name="qm_button_full_conversation">Teljes beszélgetés</string>
+    <string name="type_to_reply_text_enter_to_send">Írja be az üzenetet</string>
+    <string name="toast_sending_message">Üzenet küldése\u2026</string>
+    <string name="qm_quick_reply">Gyors válasz</string>
+    <string name="send">Küldés</string>
+    <string name="compose_message_hint_text">Üzenet megadása</string>
+    <string name="show_emoticons_pref_title">Hangulatjel hozzáférés</string>
+    <string name="show_emoticons_pref_summary">Hangulatjel gomb megjelenítése a billentyűzeten</string>
+    <string name="select_phone_account_title">Küldés a következővel</string>
+    <string name="pref_title_manage_sim_messages">SIM-kártya üzenetek kezelése</string>
+    <string name="pref_title_manage_sim_messages_slot1">SIM 1 üzenetek kezelése</string>
+    <string name="pref_title_manage_sim_messages_slot2">SIM 2 üzenetek kezelése</string>
+    <string name="copy_to_sim">Üzenet másolása SIM-kártyára</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> üzenet SIM-kártyára másolva.</string>
+    <string name="copy_to_sim_fail">Nem lehet menteni az üzenetet</string>
+    <string name="copy_to_phone_success">Üzenet mentve</string>
+    <string name="copy_to_phone_fail">Nem lehet menteni az üzenetet</string>
+    <string name="sim_empty">Nincsenek üzenetek a SIM-kártyán.</string>
+    <string name="menu_send_email">E-mail küldése: <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back"><xliff:g id="name">%s</xliff:g> hívása</string>
+    <string name="menu_add_address_to_contacts"><xliff:g id="contactEmailOrNumber">%s</xliff:g> hozzáadása a Személyekhez</string>
+    <string name="sim_capacity_title">SIM-kapacitás</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> SIM-kártya bejegyzés használva</string>
+    <string name="confirm_dialog_title">Biztosan törli?</string>
+    <string name="sim_manage_messages_title">Szöveges üzenetek a SIM-kártyán</string>
+    <string name="refreshing">Frissítés\u2026</string>
+    <string name="confirm_delete_selected_messages">Kijelölt üzenet törlésre kerül.</string>
+    <string name="delete">Törlés</string>
+    <string name="menu_forward">Továbbítás</string>
+    <string name="menu_reply">Válasz</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Másolás a táblagép memóriájába</string>
+    <string name="sim_copy_to_phone_memory" product="default">Másolás a telefon memóriájába</string>
+    <string name="selected_all">Összes kijelölése</string>
+    <string name="deselected_all">Kijelölés elvetése</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> kiválasztva</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Üzenet másolása SIM-kártyára</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Képek vagy videók kiválasztása az eszközről</string>
+    <string name="mediapicker_audioListChooserDescription">Hangfájlok kiválasztása az eszközről</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Nem sikerült csatolni a videót. Maximális méret túllépve.</string>
+    <string name="mediapicker_audio_list_title">Válasszon hangot</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Hang kiválasztva.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Nincs hang kiválasztva.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="COUNT">%d</xliff:g> kiválasztva</string>
 </resources>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-hy-rAM/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 88f02ca..809b039 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Laporkan spam ke %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Buang unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Abaikan karakter utuh</string>
-  <string name="pref_unicode_stripping_non_encodable">Buang karakter non-encodable</string>
-  <string name="pref_unicode_stripping_all">Buang semua karakter unicode</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Masa berlaku</string>
-  <string name="validity_period_slot1_pref_title">Masa berlaku untuk SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Masa berlaku untuk SIM 2</string>
-  <string name="sms_validity_period_not_set">Tidak diatur</string>
-  <string name="sms_validity_period_one_hour">1 jam</string>
-  <string name="sms_validity_period_six_hours">6 jam</string>
-  <string name="sms_validity_period_twelve_hours">12 jam</string>
-  <string name="sms_validity_period_one_day">1 hari</string>
-  <string name="mms_validity_period_two_days">2 hari</string>
-  <string name="mms_validity_period_one_week">1 minggu</string>
-  <string name="validity_period_maximum">Maksimum</string>
-  <string name="pref_summary_mms_delivery_reports">Minta laporan penerimaan untuk setiap pesan yang dikirim</string>
-  <string name="pref_summary_mms_read_reports">Minta laporan sudah dibaca untuk setiap pesan yang dikirim</string>
-  <string name="delivery_reports_mms_pref_title">Laporan penerimaan</string>
-  <string name="read_reports_mms_pref_title">Laporan sudah dibaca</string>
-  <string name="status_label">Status:\u0020</string>
-  <string name="status_read">Baca</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Prioritas pengiriman</string>
-  <string name="priority_low">Rendah</string>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">Tinggi</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Penyimpanan</string>
-  <string name="pref_summary_auto_delete">Hapus pesan lama sewaktu batas-batas tercapai</string>
-  <string name="auto_delete_pref_title">Hapus pesan lama</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> pesan per percakapan</string>
-  <string name="sms_delete_pref_title">Batas pesan SMS</string>
-  <string name="mms_delete_pref_title">Batas pesan multimedia</string>
-  <string name="set">Atur</string>
-  <string name="no">Batalkan</string>
-  <string name="pref_messages_to_save">Atur jumlah pesan untuk disimpan</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Usap untuk menghapus</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Usap ke kanan untuk menghapus percakapan</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">QuickMessage dan Balas</string>
-  <string name="pref_quickmessage_title">Tampilkan QuickMessage</string>
-  <string name="pref_quickmessage_summary">Buka munculan QuickMessage secara otomatis untuk pesan SMS yang masuk</string>
-  <string name="pref_close_all_title">Tutup semua</string>
-  <string name="pref_close_all_summary">Menutup tombol menutup semua pesan</string>
-  <string name="message_counter">%1$d dari %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Tutup</string>
-  <string name="button_view">Lihat</string>
-  <string name="button_templates">Templat</string>
-  <string name="qm_button_full_conversation">Percakapan penuh</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Ketik untuk membalas</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Mengirim pesan\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Balas cepat</string>
-  <string name="send">Kirim</string>
-  <string name="compose_message_hint_text">Masukkan pesan</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Emoticon akses</string>
-  <string name="show_emoticons_pref_summary">Tampilkan tombol emoticon di keyboard</string>
-  <string name="select_phone_account_title">Kirim dengan</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Kelola pesan kartu SIM</string>
-  <string name="pref_title_manage_sim_messages_slot1">Kelola pesan SIM 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Kelola pesan SIM 2</string>
-  <string name="copy_to_sim">Salin pesan ke kartu SIM</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> dari <xliff:g id="total">%2$d</xliff:g> pesan disimpan ke kartu SIM.</string>
-  <string name="copy_to_sim_fail">Tidak dapat menyimpan pesan</string>
-  <string name="copy_to_phone_success">Pesan tersimpan</string>
-  <string name="copy_to_phone_fail">Tidak dapat menyimpan pesan</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">Tidak ada pesan di kartu SIM.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Kirim email ke <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">Panggil <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">Tambah <xliff:g id="contactEmailOrNumber">%s</xliff:g> ke orang</string>
-  <string name="sim_capacity_title">Kapasitas SIM</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> dari <xliff:g id="total">%2$d</xliff:g> kartu SIM digunakan</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Hapus?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Pesan teks di kartu SIM</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Menyegarkan\u2026</string>
-  <string name="confirm_delete_selected_messages">Pesan yang dipilih akan dihapus.</string>
-  <!-- Delete button title -->
-  <string name="delete">Hapus</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Teruskan</string>
-  <string name="menu_reply">Balas</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Salin ke memori 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">Salin ke memori telepon</string>
-  <string name="selected_all">Pilih semua</string>
-  <string name="deselected_all">Tidak pilih semua</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> terpilih</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">Salin pesan ke 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">Pilih gambar atau video dari perangkat ini</string>
-  <string name="mediapicker_audioListChooserDescription">Pilih berkas audio dari perangkat ini</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Tidak dapat melampirkan video. Ukuran melebihi batas maksimal.</string>
-  <string name="mediapicker_audio_list_title">Pilih audio</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Audio yang dipilih.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Audio yang tidak dipilih.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> terpilih</string>
+    <string name="report_as_spam_to">Laporkan spam ke %s</string>
+    <string name="unicode_stripping_pref_title">Buang unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Abaikan karakter utuh</string>
+    <string name="pref_unicode_stripping_non_encodable">Buang karakter non-encodable</string>
+    <string name="pref_unicode_stripping_all">Buang semua karakter unicode</string>
+    <string name="validity_period_pref_title">Masa berlaku</string>
+    <string name="validity_period_slot1_pref_title">Masa berlaku untuk SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Masa berlaku untuk SIM 2</string>
+    <string name="sms_validity_period_not_set">Tidak diatur</string>
+    <string name="sms_validity_period_one_hour">1 jam</string>
+    <string name="sms_validity_period_six_hours">6 jam</string>
+    <string name="sms_validity_period_twelve_hours">12 jam</string>
+    <string name="sms_validity_period_one_day">1 hari</string>
+    <string name="mms_validity_period_two_days">2 hari</string>
+    <string name="mms_validity_period_one_week">1 minggu</string>
+    <string name="validity_period_maximum">Maksimum</string>
+    <string name="pref_summary_mms_delivery_reports">Minta laporan penerimaan untuk setiap pesan yang dikirim</string>
+    <string name="pref_summary_mms_read_reports">Minta laporan sudah dibaca untuk setiap pesan yang dikirim</string>
+    <string name="delivery_reports_mms_pref_title">Laporan penerimaan</string>
+    <string name="read_reports_mms_pref_title">Laporan sudah dibaca</string>
+    <string name="status_label">Status:\u0020</string>
+    <string name="status_read">Baca</string>
+    <string name="priority_pref_title">Prioritas pengiriman</string>
+    <string name="priority_low">Rendah</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">Tinggi</string>
+    <string name="sms_storage_pref_title">Penyimpanan</string>
+    <string name="pref_summary_auto_delete">Hapus pesan lama sewaktu batas-batas tercapai</string>
+    <string name="auto_delete_pref_title">Hapus pesan lama</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> pesan per percakapan</string>
+    <string name="sms_delete_pref_title">Batas pesan SMS</string>
+    <string name="mms_delete_pref_title">Batas pesan multimedia</string>
+    <string name="set">Atur</string>
+    <string name="no">Batalkan</string>
+    <string name="pref_messages_to_save">Atur jumlah pesan untuk disimpan</string>
+    <string name="swipe_to_delete_conversation_pref_title">Usap untuk menghapus</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Usap ke kanan untuk menghapus percakapan</string>
+    <string name="pref_quickmessage">QuickMessage dan Balas</string>
+    <string name="pref_quickmessage_title">Tampilkan QuickMessage</string>
+    <string name="pref_quickmessage_summary">Buka munculan QuickMessage secara otomatis untuk pesan SMS yang masuk</string>
+    <string name="pref_close_all_title">Tutup semua</string>
+    <string name="pref_close_all_summary">Menutup tombol menutup semua pesan</string>
+    <string name="message_counter">%1$d dari %2$d</string>
+    <string name="button_close">Tutup</string>
+    <string name="button_view">Lihat</string>
+    <string name="button_templates">Templat</string>
+    <string name="qm_button_full_conversation">Percakapan penuh</string>
+    <string name="type_to_reply_text_enter_to_send">Ketik untuk membalas</string>
+    <string name="toast_sending_message">Mengirim pesan\u2026</string>
+    <string name="qm_quick_reply">Balas cepat</string>
+    <string name="send">Kirim</string>
+    <string name="compose_message_hint_text">Masukkan pesan</string>
+    <string name="show_emoticons_pref_title">Emoticon akses</string>
+    <string name="show_emoticons_pref_summary">Tampilkan tombol emoticon di keyboard</string>
+    <string name="select_phone_account_title">Kirim dengan</string>
+    <string name="pref_title_manage_sim_messages">Kelola pesan kartu SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Kelola pesan SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Kelola pesan SIM 2</string>
+    <string name="copy_to_sim">Salin pesan ke kartu SIM</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> dari <xliff:g id="total">%2$d</xliff:g> pesan disimpan ke kartu SIM.</string>
+    <string name="copy_to_sim_fail">Tidak dapat menyimpan pesan</string>
+    <string name="copy_to_phone_success">Pesan tersimpan</string>
+    <string name="copy_to_phone_fail">Tidak dapat menyimpan pesan</string>
+    <string name="sim_empty">Tidak ada pesan di kartu SIM.</string>
+    <string name="menu_send_email">Kirim email ke <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Panggil <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Tambah <xliff:g id="contactEmailOrNumber">%s</xliff:g> ke orang</string>
+    <string name="sim_capacity_title">Kapasitas SIM</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> dari <xliff:g id="total">%2$d</xliff:g> kartu SIM digunakan</string>
+    <string name="confirm_dialog_title">Hapus?</string>
+    <string name="sim_manage_messages_title">Pesan teks di kartu SIM</string>
+    <string name="refreshing">Menyegarkan\u2026</string>
+    <string name="confirm_delete_selected_messages">Pesan yang dipilih akan dihapus.</string>
+    <string name="delete">Hapus</string>
+    <string name="menu_forward">Teruskan</string>
+    <string name="menu_reply">Balas</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Salin ke memori tablet</string>
+    <string name="sim_copy_to_phone_memory" product="default">Salin ke memori telepon</string>
+    <string name="selected_all">Pilih semua</string>
+    <string name="deselected_all">Tidak pilih semua</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> terpilih</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Salin pesan ke kartu SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Pilih gambar atau video dari perangkat ini</string>
+    <string name="mediapicker_audioListChooserDescription">Pilih berkas audio dari perangkat ini</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Tidak dapat melampirkan video. Ukuran melebihi batas maksimal.</string>
+    <string name="mediapicker_audio_list_title">Pilih audio</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Audio yang dipilih.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Audio yang tidak dipilih.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> terpilih</string>
 </resources>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-is-rIS/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index f551cc1..1b6d24e 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Segnala come spam a %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Rimuovi unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Lascia caratteri intatti</string>
-  <string name="pref_unicode_stripping_non_encodable">Rimuovi caratteri non codificabili</string>
-  <string name="pref_unicode_stripping_all">Rimuovi tutti i caratteri unicode</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Periodo validità</string>
-  <string name="validity_period_slot1_pref_title">Periodo validità SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Periodo validità SIM 2</string>
-  <string name="sms_validity_period_not_set">Non impostato</string>
-  <string name="sms_validity_period_one_hour">1 ora</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 giorno</string>
-  <string name="mms_validity_period_two_days">2 giorni</string>
-  <string name="mms_validity_period_one_week">1 settimana</string>
-  <string name="validity_period_maximum">Massimo</string>
-  <string name="pref_summary_mms_delivery_reports">Richiedi un rapporto di consegna per ogni messaggio inviato</string>
-  <string name="pref_summary_mms_read_reports">Richiedi un rapporto di lettura per ogni messaggio inviato</string>
-  <string name="delivery_reports_mms_pref_title">Rapporti di consegna</string>
-  <string name="read_reports_mms_pref_title">Rapporti lettura</string>
-  <string name="status_label">Stato:\u0020</string>
-  <string name="status_read">Letto</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Priorità invio</string>
-  <string name="priority_low">Bassa</string>
-  <string name="priority_normal">Normale</string>
-  <string name="priority_high">Alta</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Archivio</string>
-  <string name="pref_summary_auto_delete">Elimina messaggi vecchi quando raggiungi i limiti</string>
-  <string name="auto_delete_pref_title">Elimina messaggi vecchi</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> messaggi per conversazione</string>
-  <string name="sms_delete_pref_title">Limite messaggi di testo</string>
-  <string name="mms_delete_pref_title">Limite messaggi multimediali</string>
-  <string name="set">Imposta</string>
-  <string name="no">Annulla</string>
-  <string name="pref_messages_to_save">Imposta il numero di messaggi da tenere</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Scorri per eliminare</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Scorri verso destra per cancellare una conversazione</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Risposte rapide</string>
-  <string name="pref_quickmessage_title">Mostra \"Risposte rapide\"</string>
-  <string name="pref_quickmessage_summary">Apri automaticamente la finestra \"Risposte rapide\" per i messaggi SMS in arrivo</string>
-  <string name="pref_close_all_title">Chiudi tutto</string>
-  <string name="pref_close_all_summary">Il pulsante \'Chiudi\' chiude tutti i messaggi</string>
-  <string name="message_counter">%1$d di %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Chiudi</string>
-  <string name="button_view">Visualizza</string>
-  <string name="button_templates">Modelli</string>
-  <string name="qm_button_full_conversation">Conversazione completa</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Digita per rispondere</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Invio messaggio\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Risposta rapida</string>
-  <string name="send">Invia</string>
-  <string name="compose_message_hint_text">Scrivi messaggio</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Accesso alle emoticon</string>
-  <string name="show_emoticons_pref_summary">Mostra il pulsante delle emoticon sulla tastiera</string>
-  <string name="select_phone_account_title">Invia con</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Gestisci i contatti della SIM</string>
-  <string name="pref_title_manage_sim_messages_slot1">Gestisci i messaggi della SIM 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Gestisci i messaggi della SIM 2</string>
-  <string name="copy_to_sim">Copia il messaggio nella scheda SIM</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> di <xliff:g id="total">%2$d</xliff:g> messaggi salvati sulla scheda SIM.</string>
-  <string name="copy_to_sim_fail">Impossibile salvare il messaggio</string>
-  <string name="copy_to_phone_success">Messaggio salvato</string>
-  <string name="copy_to_phone_fail">Impossibile salvare il messaggio</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">Nessun messaggio sulla SIM.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Invia email a <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">Chiama <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">Aggiungi <xliff:g id="contactEmailOrNumber">%s</xliff:g> ai contatti</string>
-  <string name="sim_capacity_title">Capacità SIM</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> su<xliff:g id="total">%2$d</xliff:g> elementi utilizzati sulla SIM</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Eliminare?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Messaggi sulla SIM</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Aggiornamento\u2026</string>
-  <string name="confirm_delete_selected_messages">I messaggi selezionati verranno eliminati.</string>
-  <!-- Delete button title -->
-  <string name="delete">Elimina</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Inoltra</string>
-  <string name="menu_reply">Rispondi</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 nella memoria del 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">Copia nella memoria del telefono</string>
-  <string name="selected_all">Seleziona tutti</string>
-  <string name="deselected_all">Deseleziona tutti</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> selezionati</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 il messaggio nella scheda 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">Scegli immagini o video da questo dispositivo</string>
-  <string name="mediapicker_audioListChooserDescription">Scegli file audio da questo dispositivo</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Impossibile allegare video. Dimensione massima del messaggio superata.</string>
-  <string name="mediapicker_audio_list_title">Scegli audio</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">L\'audio è selezionato.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">L\'audio non è selezionato.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selezionati</string>
+    <string name="report_as_spam_to">Segnala come spam a %s</string>
+    <string name="unicode_stripping_pref_title">Rimuovi unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Lascia caratteri intatti</string>
+    <string name="pref_unicode_stripping_non_encodable">Rimuovi caratteri non codificabili</string>
+    <string name="pref_unicode_stripping_all">Rimuovi tutti i caratteri unicode</string>
+    <string name="validity_period_pref_title">Periodo validità</string>
+    <string name="validity_period_slot1_pref_title">Periodo validità SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Periodo validità SIM 2</string>
+    <string name="sms_validity_period_not_set">Non impostato</string>
+    <string name="sms_validity_period_one_hour">1 ora</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 giorno</string>
+    <string name="mms_validity_period_two_days">2 giorni</string>
+    <string name="mms_validity_period_one_week">1 settimana</string>
+    <string name="validity_period_maximum">Massimo</string>
+    <string name="pref_summary_mms_delivery_reports">Richiedi un rapporto di consegna per ogni messaggio inviato</string>
+    <string name="pref_summary_mms_read_reports">Richiedi un rapporto di lettura per ogni messaggio inviato</string>
+    <string name="delivery_reports_mms_pref_title">Rapporti di consegna</string>
+    <string name="read_reports_mms_pref_title">Rapporti lettura</string>
+    <string name="status_label">Stato:\u0020</string>
+    <string name="status_read">Letto</string>
+    <string name="priority_pref_title">Priorità invio</string>
+    <string name="priority_low">Bassa</string>
+    <string name="priority_normal">Normale</string>
+    <string name="priority_high">Alta</string>
+    <string name="sms_storage_pref_title">Archivio</string>
+    <string name="pref_summary_auto_delete">Elimina messaggi vecchi quando raggiungi i limiti</string>
+    <string name="auto_delete_pref_title">Elimina messaggi vecchi</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> messaggi per conversazione</string>
+    <string name="sms_delete_pref_title">Limite messaggi di testo</string>
+    <string name="mms_delete_pref_title">Limite messaggi multimediali</string>
+    <string name="set">Imposta</string>
+    <string name="no">Annulla</string>
+    <string name="pref_messages_to_save">Imposta il numero di messaggi da tenere</string>
+    <string name="swipe_to_delete_conversation_pref_title">Scorri per eliminare</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Scorri verso destra per cancellare una conversazione</string>
+    <string name="pref_quickmessage">Risposte rapide</string>
+    <string name="pref_quickmessage_title">Mostra \"Risposte rapide\"</string>
+    <string name="pref_quickmessage_summary">Apri automaticamente la finestra \"Risposte rapide\" per i messaggi SMS in arrivo</string>
+    <string name="pref_close_all_title">Chiudi tutto</string>
+    <string name="pref_close_all_summary">Il pulsante \'Chiudi\' chiude tutti i messaggi</string>
+    <string name="message_counter">%1$d di %2$d</string>
+    <string name="button_close">Chiudi</string>
+    <string name="button_view">Visualizza</string>
+    <string name="button_templates">Modelli</string>
+    <string name="qm_button_full_conversation">Conversazione completa</string>
+    <string name="type_to_reply_text_enter_to_send">Digita per rispondere</string>
+    <string name="toast_sending_message">Invio messaggio\u2026</string>
+    <string name="qm_quick_reply">Risposta rapida</string>
+    <string name="send">Invia</string>
+    <string name="compose_message_hint_text">Scrivi messaggio</string>
+    <string name="show_emoticons_pref_title">Accesso alle emoticon</string>
+    <string name="show_emoticons_pref_summary">Mostra il pulsante delle emoticon sulla tastiera</string>
+    <string name="select_phone_account_title">Invia con</string>
+    <string name="pref_title_manage_sim_messages">Gestisci i contatti della SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Gestisci i messaggi della SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Gestisci i messaggi della SIM 2</string>
+    <string name="copy_to_sim">Copia il messaggio nella scheda SIM</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> di <xliff:g id="total">%2$d</xliff:g> messaggi salvati sulla scheda SIM.</string>
+    <string name="copy_to_sim_fail">Impossibile salvare il messaggio</string>
+    <string name="copy_to_phone_success">Messaggio salvato</string>
+    <string name="copy_to_phone_fail">Impossibile salvare il messaggio</string>
+    <string name="sim_empty">Nessun messaggio sulla SIM.</string>
+    <string name="menu_send_email">Invia email a <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Chiama <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Aggiungi <xliff:g id="contactEmailOrNumber">%s</xliff:g> ai contatti</string>
+    <string name="sim_capacity_title">Capacità SIM</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> su<xliff:g id="total">%2$d</xliff:g> elementi utilizzati sulla SIM</string>
+    <string name="confirm_dialog_title">Eliminare?</string>
+    <string name="sim_manage_messages_title">Messaggi sulla SIM</string>
+    <string name="refreshing">Aggiornamento\u2026</string>
+    <string name="confirm_delete_selected_messages">I messaggi selezionati verranno eliminati.</string>
+    <string name="delete">Elimina</string>
+    <string name="menu_forward">Inoltra</string>
+    <string name="menu_reply">Rispondi</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Copia nella memoria del tablet</string>
+    <string name="sim_copy_to_phone_memory" product="default">Copia nella memoria del telefono</string>
+    <string name="selected_all">Seleziona tutti</string>
+    <string name="deselected_all">Deseleziona tutti</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> selezionati</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Copia il messaggio nella scheda SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Scegli immagini o video da questo dispositivo</string>
+    <string name="mediapicker_audioListChooserDescription">Scegli file audio da questo dispositivo</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Impossibile allegare video. Dimensione massima del messaggio superata.</string>
+    <string name="mediapicker_audio_list_title">Scegli audio</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">L\'audio è selezionato.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">L\'audio non è selezionato.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selezionati</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 5721c83..a35d9f8 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -16,127 +16,96 @@
     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">שעה אחת</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">יום אחד</string>
-  <string name="mms_validity_period_two_days">יומיים</string>
-  <string name="mms_validity_period_one_week">שבוע אחד</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">פתח אוטומטית חלון \"הודעה מהירה\" קופץ למענה מהיר עבור הודעות SMS נכנסות</string>
-  <string name="pref_close_all_title">סגור הכול</string>
-  <string name="pref_close_all_summary">לחצן הסגירה סוגר את כל ההודעות הקופצות</string>
-  <string name="message_counter">%1$d מתוך %2$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="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>
-  <!-- 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="name">%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"><xliff:g id="used">%1$d</xliff:g> מתוך <xliff:g id="total">%2$d</xliff:g> מקומות בשימוש בכרטיס ה-SIM</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>
+    <string name="report_as_spam_to">דווח כזבל אל %s</string>
+    <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>
+    <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">שעה אחת</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">יום אחד</string>
+    <string name="mms_validity_period_two_days">יומיים</string>
+    <string name="mms_validity_period_one_week">שבוע אחד</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>
+    <string name="priority_pref_title">עדיפות משלוח</string>
+    <string name="priority_low">נמוכה</string>
+    <string name="priority_normal">רגילה</string>
+    <string name="priority_high">גבוהה</string>
+    <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>
+    <string name="swipe_to_delete_conversation_pref_title">החלק כדי למחוק</string>
+    <string name="swipe_to_delete_conversation_pref_summary">החלק ימינה כדי למחוק שיחה</string>
+    <string name="pref_quickmessage">\"הודעה מהירה\" ותגובה</string>
+    <string name="pref_quickmessage_title">הצג \"הודעה מהירה\"</string>
+    <string name="pref_quickmessage_summary">פתח אוטומטית חלון \"הודעה מהירה\" קופץ למענה מהיר עבור הודעות SMS נכנסות</string>
+    <string name="pref_close_all_title">סגור הכול</string>
+    <string name="pref_close_all_summary">לחצן הסגירה סוגר את כל ההודעות הקופצות</string>
+    <string name="message_counter">%1$d מתוך %2$d</string>
+    <string name="button_close">סגור</string>
+    <string name="button_view">הצג</string>
+    <string name="button_templates">תבניות</string>
+    <string name="qm_button_full_conversation">שיחה מלאה</string>
+    <string name="type_to_reply_text_enter_to_send">הקלד כדי להגיב</string>
+    <string name="toast_sending_message">שולח הודעה\u2026</string>
+    <string name="qm_quick_reply">תגובה מהירה</string>
+    <string name="send">שלח</string>
+    <string name="compose_message_hint_text">הכנס הודעה</string>
+    <string name="show_emoticons_pref_title">גישה לרגישונים</string>
+    <string name="show_emoticons_pref_summary">הצג את לחצן הרגישונים במקלדת</string>
+    <string name="select_phone_account_title">שלח באמצעות</string>
+    <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="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>
+    <string name="sim_empty">אין הודעות על כרטיס ה-SIM.</string>
+    <string name="menu_send_email">שלך דוא\"ל אל <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">התקשר אל <xliff:g id="name">%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"><xliff:g id="used">%1$d</xliff:g> מתוך <xliff:g id="total">%2$d</xliff:g> מקומות בשימוש בכרטיס ה-SIM</string>
+    <string name="confirm_dialog_title">למחוק?</string>
+    <string name="sim_manage_messages_title">הודעות על כרטיס ה-SIM</string>
+    <string name="refreshing">מרענן\u2026</string>
+    <string name="confirm_delete_selected_messages">ההודעה שנבחרה תמחק.</string>
+    <string name="delete">מחיקה</string>
+    <string name="menu_forward">העברה</string>
+    <string name="menu_reply">תגובה</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">העתקה לזכרון הטאבלט</string>
+    <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>
+    <string name="yes">אישור</string>
+    <string name="operation_to_card_memory">העתק הודעה לכרטיס SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <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>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 5207172..353d579 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -16,127 +16,96 @@
     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">SMSメッセージ受信時にクイックメッセージのポップアップを自動的に開く</string>
-  <string name="pref_close_all_title">すべて閉じる</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">メッセージを送信中...</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="name">%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"><xliff:g id="total">%2$d</xliff:g>中<xliff:g id="used">%1$d</xliff:g>のSIMカードのエントリが使用されています</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">更新中...</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">OK</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>
+    <string name="report_as_spam_to">%sに迷惑メッセージとして報告</string>
+    <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>
+    <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>
+    <string name="priority_pref_title">送信の優先順位</string>
+    <string name="priority_low">低</string>
+    <string name="priority_normal">標準</string>
+    <string name="priority_high">高</string>
+    <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>
+    <string name="swipe_to_delete_conversation_pref_title">スワイプして削除</string>
+    <string name="swipe_to_delete_conversation_pref_summary">右にスワイプしてスレッドを削除する</string>
+    <string name="pref_quickmessage">クイックメッセージと返信</string>
+    <string name="pref_quickmessage_title">クイックメッセージを表示</string>
+    <string name="pref_quickmessage_summary">SMSメッセージ受信時にクイックメッセージのポップアップを自動的に開く</string>
+    <string name="pref_close_all_title">すべて閉じる</string>
+    <string name="pref_close_all_summary">閉じるボタンですべてのメッセージを閉じる</string>
+    <string name="message_counter">%2$d通中%1$d通目</string>
+    <string name="button_close">閉じる</string>
+    <string name="button_view">表示</string>
+    <string name="button_templates">テンプレート</string>
+    <string name="qm_button_full_conversation">すべてのスレッド</string>
+    <string name="type_to_reply_text_enter_to_send">返信の種類</string>
+    <string name="toast_sending_message">メッセージを送信中...</string>
+    <string name="qm_quick_reply">クイック返信</string>
+    <string name="send">送信</string>
+    <string name="compose_message_hint_text">メッセージを入力</string>
+    <string name="show_emoticons_pref_title">絵文字アクセス</string>
+    <string name="show_emoticons_pref_summary">キーボードに絵文字キーを表示する</string>
+    <string name="select_phone_account_title">送信方法</string>
+    <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>
+    <string name="sim_empty">SIMカードにメッセージがありません。</string>
+    <string name="menu_send_email"><xliff:g id="name">%s</xliff:g>にメールを送信</string>
+    <string name="menu_call_back"><xliff:g id="name">%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"><xliff:g id="total">%2$d</xliff:g>中<xliff:g id="used">%1$d</xliff:g>のSIMカードのエントリが使用されています</string>
+    <string name="confirm_dialog_title">削除しますか？</string>
+    <string name="sim_manage_messages_title">SIMカードのテキストメッセージ</string>
+    <string name="refreshing">更新中...</string>
+    <string name="confirm_delete_selected_messages">選択したメッセージは削除されます。</string>
+    <string name="delete">削除</string>
+    <string name="menu_forward">転送</string>
+    <string name="menu_reply">返信</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">端末のメモリにコピー</string>
+    <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>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">メッセージをSIMカードにコピー</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <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>
 </resources>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index d7cf535..e12cb6b 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -16,35 +16,6 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="pref_quickmessage_title">სწრაფი შეტყობინების ჩვენება</string>
+    <string name="yes">კარგი</string>
 </resources>
diff --git a/res/values-kab-rDZ/arrays.xml b/res/values-kab-rDZ/arrays.xml
deleted file mode 100644
index f2be096..0000000
--- a/res/values-kab-rDZ/arrays.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String to match as no subject and filter out as a subject. For example, if the
-         subject string is "no subject", we won't display that. We'll pretend
-         no subject string was delivered. -->
-  <!-- Choices for quick-reply to message notification. Users with an Android
-    Wear device (e.g. smartwatch) can reply to messages either by speaking their
-    response, or choosing one of these predefined options. -->
-</resources>
diff --git a/res/values-kab-rDZ/cm_strings.xml b/res/values-kab-rDZ/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-kab-rDZ/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-kab-rDZ/strings.xml b/res/values-kab-rDZ/strings.xml
deleted file mode 100644
index d73a67e..0000000
--- a/res/values-kab-rDZ/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- The name of the application as it appears under the main Launcher icon and in various activity titles -->
-  <!-- The name of the application as it appears in external share intent dialogs -->
-  <!-- The title when selecting a conversation to share to -->
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <!-- The tab header for the frequently used contacts list -->
-  <!-- The tab header for all contacts list -->
-  <!-- The text on the list item in the contact picker that allows a user to send an SMS directly
-         to a number that he/she typed. eg. "Send to 650-555-1234" -->
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <!-- Abbreviated message to express that something occurred some number of hours in the past (e.g., 5 hours ago). -->
-  <!-- Abbreviated message to express that something occurred some number of days in the past (e.g., 5 days ago). -->
-  <!--
-        Plurals used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <!-- Title of the class-0 message activity. -->
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <!-- Title for SMS storage low notification and dialog. Must match the framework's notification title, i.e. //frameworks/base/core/res/res/values/strings.xml#low_internal_storage_view_title -->
-  <!-- Text for SMS storage low notification and dialog -->
-  <!-- Ticker for SMS storage low notification -->
-  <!-- Title for asking the user to enter their phone number -->
-  <!-- Text for asking the user to enter their phone number -->
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <!-- Free SMS storage actions -->
-  <!-- Free SMS storage action confirm dialog message -->
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <!-- While sending a message display this message. -->
-  <!-- When sending a message failed display this message. -->
-  <!-- When retrying sending for a message. -->
-  <!-- When showing resend action display this message. -->
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <!-- When showing resend action, display this message. -->
-  <!-- Title line for an MMS requiring manual download. -->
-  <!-- Title line for an MMS auto-downloading. -->
-  <!-- Title line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which is selected. -->
-  <!-- Timestamp line to display while downloading a message. -->
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <!-- Display this info line with an MMS notification -->
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for download failed -->
-  <!-- notification line 1 for multiple downloads failed -->
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <!-- Notification content when emergency SMS fails to send -->
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <!-- Content description text for Back button on the action bar -->
-  <!-- Action menu title for showing archived conversations -->
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <!-- An enumeration comma for separating multiple names in notifications. [CHAR LIMIT=2] -->
-  <!-- Separator between parts of a notification in each line of an inboxStyle notification. [CHAR LIMIT=2] -->
-  <!-- Separator between title and content in notification ticker -->
-  <!-- Separator between title and content in notifications -->
-  <!-- Shown in notifications when there's a picture. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <!-- Shown in the Android Wear conversation log as the sender for outgoing messages,
-         when we don't know the user's real name (e.g. no "Me" contact on the phone). -->
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <!-- Accessibility announcement for an incoming message -->
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <!-- Accessibility description for conversation list for group conversations -->
-  <!-- Accessibility description for conversation list for failed messages -->
-  <!-- Accessibility name for a group conversation -->
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <!-- Title for the preferences/settings activity -->
-  <!-- Title for the archived conversations activity -->
-  <!-- Action title: Close -->
-  <!-- Preference category: MMS messaging -->
-  <!-- Preference category: Advanced -->
-  <!-- Preference category: Debug -->
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <!-- Title for the notification sound preference -->
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <!-- Preference summary: Current default SMS app -->
-  <!-- Preference title: MMS phone number -->
-  <!-- Display text for phone number preference when the number is unknown -->
-  <!-- Title for the preference for playing a message send sound -->
-  <!-- Strings for dump sms/mms dialog -->
-  <!-- Title of long press menu on an individual message. -->
-  <!-- Menu item to copy message text -->
-  <!-- Title of long press menu for details about an individual message. -->
-  <!-- Title of long press menu for deleting an individual message. -->
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <!-- Title of "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <!-- Sender to be used if the sender address has been hidden -->
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <!-- Notifies the user when an attachment fails to load -->
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <!-- Title for the "People and Options" activity -->
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <!-- Title for the phone call button in the action bar that lets the user call a participant in an SMS conversation -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <!-- The hint text shown in the message compose input box when photo(s) is attached -->
-  <!-- The hint text shown in the message compose input box when audio recording(s) is attached -->
-  <!-- The hint text shown in the message compose input box when video(s) is attached -->
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <!-- Announcement after the user adds or removes an attachment -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <!-- The format of the subtitle of the help activity. -->
-  <!--  Action menu title to let users view open source license -->
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <!-- Reached MMS message attachment limit -->
-  <!-- Message attachment load failed -->
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- When there's a subject in an mms, the subject + message are shown in a notification -->
-  <!-- Text shown on contact VCard when it's being loaded -->
-  <!-- Text shown on contact VCard when it failed to load -->
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <!-- Title for the activity that shows details of VCards -->
-  <!-- VCard label for displaying birthdays -->
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <!-- Title for the message forwarding dialog -->
-  <!-- Title for the message reply dialog -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <!-- Dialog button text that closes the application. -->
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <!-- A message in conversation list view to indicate that the snipit text and preview is from an unsent draft. -->
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <!-- Indicates that the current message will be sent via MMS -->
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <!-- Title of block confirmation dialog -->
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <!-- The title of the list of blocked contacts -->
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <!-- Accessibility toast shown when a message is sending. -->
-  <!-- Accessibility toast shown when a message is sent. -->
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <!-- Accessibility : content description for numbers -->
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <!-- Text prepended to the subject of a forwarded message -->
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <!-- The notification toast text and action button label shown at bottom of screen, for when a new message comes in while the user
-         is in that conversation, but the message list is not scrolled to the bottom -->
-  <!-- Content description for the message images in a conversation or for the image preview in the conversation list if the lastest message in that conversation contains an image-->
-  <!-- Text for a toast message notifying the user that we can't find an appropriate application to handle their request -->
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Screen title after user selects APNs setting option -->
-  <!-- Edit access point label summary text when no value has been set -->
-  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
-  <!-- Edit access point labels: The actual access point name-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The type of APN -->
-  <!-- Edit access point screen menu option to delete this APN -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <!-- APNs screen menu option to reset default APN settings -->
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <!-- Title for Access Point Names settings -->
-  <!-- Title for Access Point Names settings activity -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <!-- The title for general settings section in the settings activity  -->
-  <!-- The title for advanced settings section in the settings activity  -->
-  <!-- The title for general settings activity  -->
-  <!-- The title for advanced settings activity  -->
-  <!-- The title for sim_specific settings  -->
-  <!-- The group MMS choices in settings -->
-  <!-- SIM number shown in the settings when the number is not known -->
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <!-- Content description for the SIM selector button in the conversation -->
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <!-- Content description for the audio record view -->
-  <!-- Content description for new conversation button in desktop widget -->
-  <!-- Content description for widget title -->
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <!-- Content description for new message button in desktop widget -->
-  <!-- Content description for conversation list button in desktop widget -->
-  <!-- Shown when loading conversations in the widget -->
-  <!-- Shown when loading messages in the widget -->
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <!-- Toast message telling the user that someone was blocked -->
-  <!-- Toast message telling the user that someone was unblocked -->
-  <!-- Title for attachment chooser activity -->
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message load failed -->
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <!-- When converting html to text link urls are inlined.  This specifies how the link should be
-    displayed.  For example, a link "click here" which navigates to "www.google.com" would have
-    text="click here" and url="www.google.com", using the below format to create "click here (www.google.com)" -->
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
-</resources>
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-kk-rKZ/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-km-rKH/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 5409a24..00ab8f0 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -16,60 +16,28 @@
     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">ಸ್ಟ್ರಿಪ್ ಯುನಿಕೋಡ್</string>
-  <string name="pref_unicode_stripping_leave_intact">ಅಕ್ಷರಗಳನ್ನು ಹಾಗೇ ಬಿಡಿ</string>
-  <string name="pref_unicode_stripping_non_encodable">ಎನ್‌ಕೋಡೇಬಲ್ ಅಲ್ಲದ ಅಕ್ಷರಗಳನ್ನು ಸ್ಟ್ರಿಪ್ ಮಾಡಿ</string>
-  <string name="pref_unicode_stripping_all">ಎಲ್ಲಾ ಯುನಿಕೋಡ್ ಅಕ್ಷರಗಳನ್ನು ಸ್ಟ್ರಿಪ್ ಮಾಡಿ</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- 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">ಒಳಬರುವ SMS ಸಂದೇಶಗಳಿಗಾಗಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ತ್ವರಿತ ಸಂದೇಶ ಪಾಪ್-ಅಪ್ ತೆರೆ</string>
-  <string name="pref_close_all_title">ಎಲ್ಲವನ್ನೂ ಮುಚ್ಚು</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 -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">%s ಗೆ ಸ್ಪಾಮ್ ಎಂಬುದಾಗಿ ವರದಿ ಮಾಡಿ</string>
+    <string name="unicode_stripping_pref_title">ಸ್ಟ್ರಿಪ್ ಯುನಿಕೋಡ್</string>
+    <string name="pref_unicode_stripping_leave_intact">ಅಕ್ಷರಗಳನ್ನು ಹಾಗೇ ಬಿಡಿ</string>
+    <string name="pref_unicode_stripping_non_encodable">ಎನ್‌ಕೋಡೇಬಲ್ ಅಲ್ಲದ ಅಕ್ಷರಗಳನ್ನು ಸ್ಟ್ರಿಪ್ ಮಾಡಿ</string>
+    <string name="pref_unicode_stripping_all">ಎಲ್ಲಾ ಯುನಿಕೋಡ್ ಅಕ್ಷರಗಳನ್ನು ಸ್ಟ್ರಿಪ್ ಮಾಡಿ</string>
+    <string name="swipe_to_delete_conversation_pref_title">ಅಳಿಸಲು ಸ್ವೈಪ್ ಮಾಡಿ</string>
+    <string name="swipe_to_delete_conversation_pref_summary">ಒಂದು ಸಂವಾದವನ್ನು ಅಳಿಸಲು ಬಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ</string>
+    <string name="pref_quickmessage">ತ್ವರಿತ ಸಂದೇಶ ಮತ್ತು ಪ್ರತಿಕ್ರಿಯೆ</string>
+    <string name="pref_quickmessage_title">ತ್ವರಿತ ಸಂದೇಶ ತೋರಿಸು</string>
+    <string name="pref_quickmessage_summary">ಒಳಬರುವ SMS ಸಂದೇಶಗಳಿಗಾಗಿ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ತ್ವರಿತ ಸಂದೇಶ ಪಾಪ್-ಅಪ್ ತೆರೆ</string>
+    <string name="pref_close_all_title">ಎಲ್ಲವನ್ನೂ ಮುಚ್ಚು</string>
+    <string name="pref_close_all_summary">ಮುಚ್ಚಿದ ಬಟನ್ ಎಲ್ಲಾ ಸಂದೇಶಗಳನ್ನು ಮುಚ್ಚುತ್ತದೆ</string>
+    <string name="message_counter">%2$dನ %1$d</string>
+    <string name="button_close">ಮುಚ್ಚು</string>
+    <string name="button_view">ವೀಕ್ಷಿಸಿ</string>
+    <string name="button_templates">ಟೆಂಪ್ಲೇಟ್‌ಗಳು</string>
+    <string name="qm_button_full_conversation">ಸಂಪೂರ್ಣ ಸಂಭಾಷಣೆ</string>
+    <string name="type_to_reply_text_enter_to_send">ಪ್ರತಿಕ್ರಿಯೆಗೆ ವಿಧ</string>
+    <string name="toast_sending_message">ಸಂದೇಶ ಕಳುಹಿಸುತ್ತಿದೆ\u2026</string>
+    <string name="qm_quick_reply">ಕ್ಷಿಪ್ರ ಪ್ರತಿಕ್ರಿಯೆ</string>
+    <string name="send">ಕಳುಹಿಸು</string>
+    <string name="compose_message_hint_text">ಸಂದೇಶ ನಮೂದಿಸಿ</string>
+    <string name="show_emoticons_pref_summary">ಕೀಬೋರ್ಡ್ ಮೇಲೆ ಭಾವನೆಗಳ ಪ್ರಮುಖ ತೋರಿಸಿ</string>
+    <string name="select_phone_account_title">ಇದರಿಂದ ಕಳುಹಿಸಿ</string>
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index b17f456..0315c4b 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -16,127 +16,96 @@
     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">유니코드 제거</string>
-  <string name="pref_unicode_stripping_leave_intact">문자 인코딩 유지</string>
-  <string name="pref_unicode_stripping_non_encodable">인코딩할 수 없는 문자 제거</string>
-  <string name="pref_unicode_stripping_all">모든 유니코드 문자 제거</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">QuickMessage와 답장</string>
-  <string name="pref_quickmessage_title">QuickMessage 보기</string>
-  <string name="pref_quickmessage_summary">SMS메시지를 받으면 자동으로 QuickMessage 보이기</string>
-  <string name="pref_close_all_title">전부 닫기</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="name">%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"><xliff:g id="total">%2$d</xliff:g> 중 <xliff:g id="used">%1$d</xliff:g>의 SIM카드 저장소가 사용됨</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>
+    <string name="report_as_spam_to">%s에 스팸으로 신고</string>
+    <string name="unicode_stripping_pref_title">유니코드 제거</string>
+    <string name="pref_unicode_stripping_leave_intact">문자 인코딩 유지</string>
+    <string name="pref_unicode_stripping_non_encodable">인코딩할 수 없는 문자 제거</string>
+    <string name="pref_unicode_stripping_all">모든 유니코드 문자 제거</string>
+    <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>
+    <string name="priority_pref_title">전송 우선 순위</string>
+    <string name="priority_low">낮음</string>
+    <string name="priority_normal">중간</string>
+    <string name="priority_high">높음</string>
+    <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>
+    <string name="swipe_to_delete_conversation_pref_title">스와이프하여 삭제</string>
+    <string name="swipe_to_delete_conversation_pref_summary">오른쪽으로 스와이프하여 대화 삭제</string>
+    <string name="pref_quickmessage">QuickMessage와 답장</string>
+    <string name="pref_quickmessage_title">QuickMessage 보기</string>
+    <string name="pref_quickmessage_summary">SMS메시지를 받으면 자동으로 QuickMessage 보이기</string>
+    <string name="pref_close_all_title">전부 닫기</string>
+    <string name="pref_close_all_summary">닫기 버튼으로 모든 메시지를 닫습니다</string>
+    <string name="message_counter">%2$d건 중 %1$d건</string>
+    <string name="button_close">닫기</string>
+    <string name="button_view">표시</string>
+    <string name="button_templates">템플릿</string>
+    <string name="qm_button_full_conversation">전체 대화</string>
+    <string name="type_to_reply_text_enter_to_send">답장을 입력하세요</string>
+    <string name="toast_sending_message">메시지 전송 중\u2026</string>
+    <string name="qm_quick_reply">빠른 답장</string>
+    <string name="send">전송</string>
+    <string name="compose_message_hint_text">메시지 입력</string>
+    <string name="show_emoticons_pref_title">이모티콘 표시</string>
+    <string name="show_emoticons_pref_summary">키보드에 이모티콘 키를 표시합니다</string>
+    <string name="select_phone_account_title">다른 앱으로 보내기</string>
+    <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>
+    <string name="sim_empty">SIM 카드에 메시지가 없습니다.</string>
+    <string name="menu_send_email"><xliff:g id="name">%s</xliff:g>에게 이메일 보내기</string>
+    <string name="menu_call_back"><xliff:g id="name">%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"><xliff:g id="total">%2$d</xliff:g> 중 <xliff:g id="used">%1$d</xliff:g>의 SIM카드 저장소가 사용됨</string>
+    <string name="confirm_dialog_title">삭제할까요?</string>
+    <string name="sim_manage_messages_title">SIM 카드에 있는 문자 메시지</string>
+    <string name="refreshing">새로 고치는 중\u2026</string>
+    <string name="confirm_delete_selected_messages">선택된 메시지가 삭제됩니다.</string>
+    <string name="delete">삭제</string>
+    <string name="menu_forward">전달</string>
+    <string name="menu_reply">답장</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">태블릿 메모리에 복사</string>
+    <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>
+    <string name="yes">확인</string>
+    <string name="operation_to_card_memory">메시지를 SIM 카드에 복사</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <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>
 </resources>
diff --git a/res/values-ku/arrays.xml b/res/values-ku/arrays.xml
deleted file mode 100644
index f2be096..0000000
--- a/res/values-ku/arrays.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String to match as no subject and filter out as a subject. For example, if the
-         subject string is "no subject", we won't display that. We'll pretend
-         no subject string was delivered. -->
-  <!-- Choices for quick-reply to message notification. Users with an Android
-    Wear device (e.g. smartwatch) can reply to messages either by speaking their
-    response, or choosing one of these predefined options. -->
-</resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 79ea95d..597771a 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -16,41 +16,10 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_close_all_title">داخستنی هەمووی</string>
-  <string name="pref_close_all_summary">داخستنی دوگمه‌ بۆ هه‌موو نامه‌کان</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">داخستن</string>
-  <string name="button_view">پیشاندان</string>
-  <string name="button_templates">قاڵبەکان</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">جۆری وەڵامدانەوە</string>
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="pref_close_all_title">داخستنی هەمووی</string>
+    <string name="pref_close_all_summary">داخستنی دوگمه‌ بۆ هه‌موو نامه‌کان</string>
+    <string name="button_close">داخستن</string>
+    <string name="button_view">پیشاندان</string>
+    <string name="button_templates">قاڵبەکان</string>
+    <string name="type_to_reply_text_enter_to_send">جۆری وەڵامدانەوە</string>
 </resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
deleted file mode 100644
index d73a67e..0000000
--- a/res/values-ku/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- The name of the application as it appears under the main Launcher icon and in various activity titles -->
-  <!-- The name of the application as it appears in external share intent dialogs -->
-  <!-- The title when selecting a conversation to share to -->
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <!-- The tab header for the frequently used contacts list -->
-  <!-- The tab header for all contacts list -->
-  <!-- The text on the list item in the contact picker that allows a user to send an SMS directly
-         to a number that he/she typed. eg. "Send to 650-555-1234" -->
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <!-- Abbreviated message to express that something occurred some number of hours in the past (e.g., 5 hours ago). -->
-  <!-- Abbreviated message to express that something occurred some number of days in the past (e.g., 5 days ago). -->
-  <!--
-        Plurals used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <!-- Title of the class-0 message activity. -->
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <!-- Title for SMS storage low notification and dialog. Must match the framework's notification title, i.e. //frameworks/base/core/res/res/values/strings.xml#low_internal_storage_view_title -->
-  <!-- Text for SMS storage low notification and dialog -->
-  <!-- Ticker for SMS storage low notification -->
-  <!-- Title for asking the user to enter their phone number -->
-  <!-- Text for asking the user to enter their phone number -->
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <!-- Free SMS storage actions -->
-  <!-- Free SMS storage action confirm dialog message -->
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <!-- While sending a message display this message. -->
-  <!-- When sending a message failed display this message. -->
-  <!-- When retrying sending for a message. -->
-  <!-- When showing resend action display this message. -->
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <!-- When showing resend action, display this message. -->
-  <!-- Title line for an MMS requiring manual download. -->
-  <!-- Title line for an MMS auto-downloading. -->
-  <!-- Title line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which is selected. -->
-  <!-- Timestamp line to display while downloading a message. -->
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <!-- Display this info line with an MMS notification -->
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for download failed -->
-  <!-- notification line 1 for multiple downloads failed -->
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <!-- Notification content when emergency SMS fails to send -->
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <!-- Content description text for Back button on the action bar -->
-  <!-- Action menu title for showing archived conversations -->
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <!-- An enumeration comma for separating multiple names in notifications. [CHAR LIMIT=2] -->
-  <!-- Separator between parts of a notification in each line of an inboxStyle notification. [CHAR LIMIT=2] -->
-  <!-- Separator between title and content in notification ticker -->
-  <!-- Separator between title and content in notifications -->
-  <!-- Shown in notifications when there's a picture. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <!-- Shown in the Android Wear conversation log as the sender for outgoing messages,
-         when we don't know the user's real name (e.g. no "Me" contact on the phone). -->
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <!-- Accessibility announcement for an incoming message -->
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <!-- Accessibility description for conversation list for group conversations -->
-  <!-- Accessibility description for conversation list for failed messages -->
-  <!-- Accessibility name for a group conversation -->
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <!-- Title for the preferences/settings activity -->
-  <!-- Title for the archived conversations activity -->
-  <!-- Action title: Close -->
-  <!-- Preference category: MMS messaging -->
-  <!-- Preference category: Advanced -->
-  <!-- Preference category: Debug -->
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <!-- Title for the notification sound preference -->
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <!-- Preference summary: Current default SMS app -->
-  <!-- Preference title: MMS phone number -->
-  <!-- Display text for phone number preference when the number is unknown -->
-  <!-- Title for the preference for playing a message send sound -->
-  <!-- Strings for dump sms/mms dialog -->
-  <!-- Title of long press menu on an individual message. -->
-  <!-- Menu item to copy message text -->
-  <!-- Title of long press menu for details about an individual message. -->
-  <!-- Title of long press menu for deleting an individual message. -->
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <!-- Title of "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <!-- Sender to be used if the sender address has been hidden -->
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <!-- Notifies the user when an attachment fails to load -->
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <!-- Title for the "People and Options" activity -->
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <!-- Title for the phone call button in the action bar that lets the user call a participant in an SMS conversation -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <!-- The hint text shown in the message compose input box when photo(s) is attached -->
-  <!-- The hint text shown in the message compose input box when audio recording(s) is attached -->
-  <!-- The hint text shown in the message compose input box when video(s) is attached -->
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <!-- Announcement after the user adds or removes an attachment -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <!-- The format of the subtitle of the help activity. -->
-  <!--  Action menu title to let users view open source license -->
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <!-- Reached MMS message attachment limit -->
-  <!-- Message attachment load failed -->
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- When there's a subject in an mms, the subject + message are shown in a notification -->
-  <!-- Text shown on contact VCard when it's being loaded -->
-  <!-- Text shown on contact VCard when it failed to load -->
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <!-- Title for the activity that shows details of VCards -->
-  <!-- VCard label for displaying birthdays -->
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <!-- Title for the message forwarding dialog -->
-  <!-- Title for the message reply dialog -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <!-- Dialog button text that closes the application. -->
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <!-- A message in conversation list view to indicate that the snipit text and preview is from an unsent draft. -->
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <!-- Indicates that the current message will be sent via MMS -->
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <!-- Title of block confirmation dialog -->
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <!-- The title of the list of blocked contacts -->
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <!-- Accessibility toast shown when a message is sending. -->
-  <!-- Accessibility toast shown when a message is sent. -->
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <!-- Accessibility : content description for numbers -->
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <!-- Text prepended to the subject of a forwarded message -->
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <!-- The notification toast text and action button label shown at bottom of screen, for when a new message comes in while the user
-         is in that conversation, but the message list is not scrolled to the bottom -->
-  <!-- Content description for the message images in a conversation or for the image preview in the conversation list if the lastest message in that conversation contains an image-->
-  <!-- Text for a toast message notifying the user that we can't find an appropriate application to handle their request -->
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Screen title after user selects APNs setting option -->
-  <!-- Edit access point label summary text when no value has been set -->
-  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
-  <!-- Edit access point labels: The actual access point name-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The type of APN -->
-  <!-- Edit access point screen menu option to delete this APN -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <!-- APNs screen menu option to reset default APN settings -->
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <!-- Title for Access Point Names settings -->
-  <!-- Title for Access Point Names settings activity -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <!-- The title for general settings section in the settings activity  -->
-  <!-- The title for advanced settings section in the settings activity  -->
-  <!-- The title for general settings activity  -->
-  <!-- The title for advanced settings activity  -->
-  <!-- The title for sim_specific settings  -->
-  <!-- The group MMS choices in settings -->
-  <!-- SIM number shown in the settings when the number is not known -->
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <!-- Content description for the SIM selector button in the conversation -->
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <!-- Content description for the audio record view -->
-  <!-- Content description for new conversation button in desktop widget -->
-  <!-- Content description for widget title -->
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <!-- Content description for new message button in desktop widget -->
-  <!-- Content description for conversation list button in desktop widget -->
-  <!-- Shown when loading conversations in the widget -->
-  <!-- Shown when loading messages in the widget -->
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <!-- Toast message telling the user that someone was blocked -->
-  <!-- Toast message telling the user that someone was unblocked -->
-  <!-- Title for attachment chooser activity -->
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message load failed -->
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <!-- When converting html to text link urls are inlined.  This specifies how the link should be
-    displayed.  For example, a link "click here" which navigates to "www.google.com" would have
-    text="click here" and url="www.google.com", using the below format to create "click here (www.google.com)" -->
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
-</resources>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-ky-rKG/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-lb/arrays.xml b/res/values-lb/arrays.xml
index 7b25cf9..7778f1a 100644
--- a/res/values-lb/arrays.xml
+++ b/res/values-lb/arrays.xml
@@ -16,27 +16,21 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String to match as no subject and filter out as a subject. For example, if the
-         subject string is "no subject", we won't display that. We'll pretend
-         no subject string was delivered. -->
-  <string-array name="empty_subject_strings">
-    <item>kee Sujet</item>
-    <item>nosubject</item>
-  </string-array>
-  <!-- Choices for quick-reply to message notification. Users with an Android
-    Wear device (e.g. smartwatch) can reply to messages either by speaking their
-    response, or choosing one of these predefined options. -->
-  <string-array name="notification_reply_choices">
-    <item>Jo</item>
-    <item>Nee</item>
-    <item>OK</item>
-    <item>Hehe</item>
-    <item>Merci</item>
-    <item>Ech sinn averstanen</item>
-    <item>Wonnerbar</item>
-    <item>Sinn ënnerwee</item>
-    <item>OK, ech melle mech</item>
-    <item>:)</item>
-    <item>:(</item>
-  </string-array>
+    <string-array name="empty_subject_strings">
+        <item>kee Sujet</item>
+        <item>nosubject</item>
+    </string-array>
+    <string-array name="notification_reply_choices">
+        <item>Jo</item>
+        <item>Nee</item>
+        <item>OK</item>
+        <item>Hehe</item>
+        <item>Merci</item>
+        <item>Ech sinn averstanen</item>
+        <item>Wonnerbar</item>
+        <item>Sinn ënnerwee</item>
+        <item>OK, ech melle mech</item>
+        <item>:)</item>
+        <item>:(</item>
+    </string-array>
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 9d43f11..7dc1189 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Als Spam mellen un %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Unicode-Behandlung</string>
-  <string name="pref_unicode_stripping_leave_intact">Zeechen onverännert loossen</string>
-  <string name="pref_unicode_stripping_non_encodable">Onkodéierbar Zeeche läschen</string>
-  <string name="pref_unicode_stripping_all">All Unicode-Zeeche läschen</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Validitéitsperiod</string>
-  <string name="validity_period_slot1_pref_title">Validitéitsperiod fir d\'SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Validitéitsperiod fir d\'SIM 2</string>
-  <string name="sms_validity_period_not_set">Net gesat</string>
-  <string name="sms_validity_period_one_hour">1 Stonn</string>
-  <string name="sms_validity_period_six_hours">6 Stonnen</string>
-  <string name="sms_validity_period_twelve_hours">12 Stonnen</string>
-  <string name="sms_validity_period_one_day">1 Dag</string>
-  <string name="mms_validity_period_two_days">2 Deeg</string>
-  <string name="mms_validity_period_one_week">1 Woch</string>
-  <string name="validity_period_maximum">Maximum</string>
-  <string name="pref_summary_mms_delivery_reports">Eng Empfangsbestätegung ufroe fir all Message deen s de verschécks</string>
-  <string name="pref_summary_mms_read_reports">Eng Liesbestätegung ufroe fir all Message deen s de verschécks</string>
-  <string name="delivery_reports_mms_pref_title">Empfangsbestätegungen</string>
-  <string name="read_reports_mms_pref_title">Berichter liesen</string>
-  <string name="status_label">Status:\u0020</string>
-  <string name="status_read">Gelies</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Sendeprioritéit</string>
-  <string name="priority_low">Niddreg</string>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">Héich</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Späicher</string>
-  <string name="pref_summary_auto_delete">Déi al Messagë beim Erreeche vun der Limitt läschen</string>
-  <string name="auto_delete_pref_title">Al Messagë läschen</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> Messagë pro Konversatioun</string>
-  <string name="sms_delete_pref_title">SMS-Limitt</string>
-  <string name="mms_delete_pref_title">MMS-Limitt</string>
-  <string name="set">Setzen</string>
-  <string name="no">Ofbriechen</string>
-  <string name="pref_messages_to_save">Unzuel vun de gespäicherte Messagë festleeën</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Wësche fir ze läschen</string>
-  <string name="swipe_to_delete_conversation_pref_summary">No riets Wësche fir eng Konversatioun ze läschen</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Séier Messagen an Äntwerten</string>
-  <string name="pref_quickmessage_title">Séier Messagen uweisen</string>
-  <string name="pref_quickmessage_summary">Automatesch de Pop-Up mat de séiere Messagë bei erakommenden SMS-Messagen opmaachen</string>
-  <string name="pref_close_all_title">All zoumaachen</string>
-  <string name="pref_close_all_summary">De Knäppchen \"Zoumaachen\" mécht all d\'Messagen zou</string>
-  <string name="message_counter">%1$d / %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Zoumaachen</string>
-  <string name="button_view">Ukucken</string>
-  <string name="button_templates">Virlagen</string>
-  <string name="qm_button_full_conversation">Komplett Konversatioun</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Message aginn</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Message gëtt geschéckt\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Séier äntweren</string>
-  <string name="send">Schécken</string>
-  <string name="compose_message_hint_text">Message aginn</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Zougrëff op Smileyen</string>
-  <string name="show_emoticons_pref_summary">Smiley-Tast op der Tastatur uweisen</string>
-  <string name="select_phone_account_title">Schécke mat</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">SIM-Messagë verwalten</string>
-  <string name="pref_title_manage_sim_messages_slot1">Messagë vun der SIM 1 geréieren</string>
-  <string name="pref_title_manage_sim_messages_slot2">Messagë vun der SIM 2 geréieren</string>
-  <string name="copy_to_sim">Message op d\'SIM-Kaart kopéieren</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> Messagen op d\'SIM-Kaart gespäichert.</string>
-  <string name="copy_to_sim_fail">Konnt de Message net späicheren</string>
-  <string name="copy_to_phone_success">Message gespäichert</string>
-  <string name="copy_to_phone_fail">Konnt de Message net späicheren</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">Keng Messagen op der SIM-Kaart.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">E-Mail u(n) <xliff:g id="name">%s</xliff:g> schécken</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> uruffen</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> bei d\'Kontakter dobäisetzen</string>
-  <string name="sim_capacity_title">SIM-Capacitéit</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> SIM-Kaartenaschreiwunge gi benotzt</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Läschen?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">SMSen op der SIM-Kaart</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Gëtt opgefrëscht\u2026</string>
-  <string name="confirm_delete_selected_messages">Den ausgewielte Message gëtt geläscht.</string>
-  <!-- Delete button title -->
-  <string name="delete">Läschen</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Weiderleeden</string>
-  <string name="menu_reply">Äntweren</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">An den Tabletspäicher kopéieren</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">An den Telefonsspäicher kopéieren</string>
-  <string name="selected_all">All auswielen</string>
-  <string name="deselected_all">Auswiel ophiewen</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> ausgewielt</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">Message op d\'SIM-Kaart kopéieren</string>
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Wiel Biller oder Videoe vun dësem Apparat</string>
-  <string name="mediapicker_audioListChooserDescription">Wiel Toun-Fichiere vun dësem Apparat</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Video konnt net ugehaange ginn. Maximal Gréisst iwwerschratt.</string>
-  <string name="mediapicker_audio_list_title">Toun auswielen</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Toun ausgewielt.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Toun net méi ausgewielt.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> ausgewielt</string>
+    <string name="report_as_spam_to">Als Spam mellen un %s</string>
+    <string name="unicode_stripping_pref_title">Unicode-Behandlung</string>
+    <string name="pref_unicode_stripping_leave_intact">Zeechen onverännert loossen</string>
+    <string name="pref_unicode_stripping_non_encodable">Onkodéierbar Zeeche läschen</string>
+    <string name="pref_unicode_stripping_all">All Unicode-Zeeche läschen</string>
+    <string name="validity_period_pref_title">Validitéitsperiod</string>
+    <string name="validity_period_slot1_pref_title">Validitéitsperiod fir d\'SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Validitéitsperiod fir d\'SIM 2</string>
+    <string name="sms_validity_period_not_set">Net gesat</string>
+    <string name="sms_validity_period_one_hour">1 Stonn</string>
+    <string name="sms_validity_period_six_hours">6 Stonnen</string>
+    <string name="sms_validity_period_twelve_hours">12 Stonnen</string>
+    <string name="sms_validity_period_one_day">1 Dag</string>
+    <string name="mms_validity_period_two_days">2 Deeg</string>
+    <string name="mms_validity_period_one_week">1 Woch</string>
+    <string name="validity_period_maximum">Maximum</string>
+    <string name="pref_summary_mms_delivery_reports">Eng Empfangsbestätegung ufroe fir all Message deen s de verschécks</string>
+    <string name="pref_summary_mms_read_reports">Eng Liesbestätegung ufroe fir all Message deen s de verschécks</string>
+    <string name="delivery_reports_mms_pref_title">Empfangsbestätegungen</string>
+    <string name="read_reports_mms_pref_title">Berichter liesen</string>
+    <string name="status_label">Status:\u0020</string>
+    <string name="status_read">Gelies</string>
+    <string name="priority_pref_title">Sendeprioritéit</string>
+    <string name="priority_low">Niddreg</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">Héich</string>
+    <string name="sms_storage_pref_title">Späicher</string>
+    <string name="pref_summary_auto_delete">Déi al Messagë beim Erreeche vun der Limitt läschen</string>
+    <string name="auto_delete_pref_title">Al Messagë läschen</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> Messagë pro Konversatioun</string>
+    <string name="sms_delete_pref_title">SMS-Limitt</string>
+    <string name="mms_delete_pref_title">MMS-Limitt</string>
+    <string name="set">Setzen</string>
+    <string name="no">Ofbriechen</string>
+    <string name="pref_messages_to_save">Unzuel vun de gespäicherte Messagë festleeën</string>
+    <string name="swipe_to_delete_conversation_pref_title">Wësche fir ze läschen</string>
+    <string name="swipe_to_delete_conversation_pref_summary">No riets Wësche fir eng Konversatioun ze läschen</string>
+    <string name="pref_quickmessage">Séier Messagen an Äntwerten</string>
+    <string name="pref_quickmessage_title">Séier Messagen uweisen</string>
+    <string name="pref_quickmessage_summary">Automatesch de Pop-Up mat de séiere Messagë bei erakommenden SMS-Messagen opmaachen</string>
+    <string name="pref_close_all_title">All zoumaachen</string>
+    <string name="pref_close_all_summary">De Knäppchen \"Zoumaachen\" mécht all d\'Messagen zou</string>
+    <string name="message_counter">%1$d / %2$d</string>
+    <string name="button_close">Zoumaachen</string>
+    <string name="button_view">Ukucken</string>
+    <string name="button_templates">Virlagen</string>
+    <string name="qm_button_full_conversation">Komplett Konversatioun</string>
+    <string name="type_to_reply_text_enter_to_send">Message aginn</string>
+    <string name="toast_sending_message">Message gëtt geschéckt\u2026</string>
+    <string name="qm_quick_reply">Séier äntweren</string>
+    <string name="send">Schécken</string>
+    <string name="compose_message_hint_text">Message aginn</string>
+    <string name="show_emoticons_pref_title">Zougrëff op Smileyen</string>
+    <string name="show_emoticons_pref_summary">Smiley-Tast op der Tastatur uweisen</string>
+    <string name="select_phone_account_title">Schécke mat</string>
+    <string name="pref_title_manage_sim_messages">SIM-Messagë verwalten</string>
+    <string name="pref_title_manage_sim_messages_slot1">Messagë vun der SIM 1 geréieren</string>
+    <string name="pref_title_manage_sim_messages_slot2">Messagë vun der SIM 2 geréieren</string>
+    <string name="copy_to_sim">Message op d\'SIM-Kaart kopéieren</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> Messagen op d\'SIM-Kaart gespäichert.</string>
+    <string name="copy_to_sim_fail">Konnt de Message net späicheren</string>
+    <string name="copy_to_phone_success">Message gespäichert</string>
+    <string name="copy_to_phone_fail">Konnt de Message net späicheren</string>
+    <string name="sim_empty">Keng Messagen op der SIM-Kaart.</string>
+    <string name="menu_send_email">E-Mail u(n) <xliff:g id="name">%s</xliff:g> schécken</string>
+    <string name="menu_call_back"><xliff:g id="name">%s</xliff:g> uruffen</string>
+    <string name="menu_add_address_to_contacts"><xliff:g id="contactEmailOrNumber">%s</xliff:g> bei d\'Kontakter dobäisetzen</string>
+    <string name="sim_capacity_title">SIM-Capacitéit</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> SIM-Kaartenaschreiwunge gi benotzt</string>
+    <string name="confirm_dialog_title">Läschen?</string>
+    <string name="sim_manage_messages_title">SMSen op der SIM-Kaart</string>
+    <string name="refreshing">Gëtt opgefrëscht\u2026</string>
+    <string name="confirm_delete_selected_messages">Den ausgewielte Message gëtt geläscht.</string>
+    <string name="delete">Läschen</string>
+    <string name="menu_forward">Weiderleeden</string>
+    <string name="menu_reply">Äntweren</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">An den Tabletspäicher kopéieren</string>
+    <string name="sim_copy_to_phone_memory" product="default">An den Telefonsspäicher kopéieren</string>
+    <string name="selected_all">All auswielen</string>
+    <string name="deselected_all">Auswiel ophiewen</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> ausgewielt</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Message op d\'SIM-Kaart kopéieren</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Wiel Biller oder Videoe vun dësem Apparat</string>
+    <string name="mediapicker_audioListChooserDescription">Wiel Toun-Fichiere vun dësem Apparat</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Video konnt net ugehaange ginn. Maximal Gréisst iwwerschratt.</string>
+    <string name="mediapicker_audio_list_title">Toun auswielen</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Toun ausgewielt.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Toun net méi ausgewielt.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> ausgewielt</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
deleted file mode 100644
index d73a67e..0000000
--- a/res/values-lb/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- The name of the application as it appears under the main Launcher icon and in various activity titles -->
-  <!-- The name of the application as it appears in external share intent dialogs -->
-  <!-- The title when selecting a conversation to share to -->
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <!-- The tab header for the frequently used contacts list -->
-  <!-- The tab header for all contacts list -->
-  <!-- The text on the list item in the contact picker that allows a user to send an SMS directly
-         to a number that he/she typed. eg. "Send to 650-555-1234" -->
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <!-- Abbreviated message to express that something occurred some number of hours in the past (e.g., 5 hours ago). -->
-  <!-- Abbreviated message to express that something occurred some number of days in the past (e.g., 5 days ago). -->
-  <!--
-        Plurals used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <!-- Title of the class-0 message activity. -->
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <!-- Title for SMS storage low notification and dialog. Must match the framework's notification title, i.e. //frameworks/base/core/res/res/values/strings.xml#low_internal_storage_view_title -->
-  <!-- Text for SMS storage low notification and dialog -->
-  <!-- Ticker for SMS storage low notification -->
-  <!-- Title for asking the user to enter their phone number -->
-  <!-- Text for asking the user to enter their phone number -->
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <!-- Free SMS storage actions -->
-  <!-- Free SMS storage action confirm dialog message -->
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <!-- While sending a message display this message. -->
-  <!-- When sending a message failed display this message. -->
-  <!-- When retrying sending for a message. -->
-  <!-- When showing resend action display this message. -->
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <!-- When showing resend action, display this message. -->
-  <!-- Title line for an MMS requiring manual download. -->
-  <!-- Title line for an MMS auto-downloading. -->
-  <!-- Title line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which is selected. -->
-  <!-- Timestamp line to display while downloading a message. -->
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <!-- Display this info line with an MMS notification -->
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for download failed -->
-  <!-- notification line 1 for multiple downloads failed -->
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <!-- Notification content when emergency SMS fails to send -->
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <!-- Content description text for Back button on the action bar -->
-  <!-- Action menu title for showing archived conversations -->
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <!-- An enumeration comma for separating multiple names in notifications. [CHAR LIMIT=2] -->
-  <!-- Separator between parts of a notification in each line of an inboxStyle notification. [CHAR LIMIT=2] -->
-  <!-- Separator between title and content in notification ticker -->
-  <!-- Separator between title and content in notifications -->
-  <!-- Shown in notifications when there's a picture. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <!-- Shown in the Android Wear conversation log as the sender for outgoing messages,
-         when we don't know the user's real name (e.g. no "Me" contact on the phone). -->
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <!-- Accessibility announcement for an incoming message -->
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <!-- Accessibility description for conversation list for group conversations -->
-  <!-- Accessibility description for conversation list for failed messages -->
-  <!-- Accessibility name for a group conversation -->
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <!-- Title for the preferences/settings activity -->
-  <!-- Title for the archived conversations activity -->
-  <!-- Action title: Close -->
-  <!-- Preference category: MMS messaging -->
-  <!-- Preference category: Advanced -->
-  <!-- Preference category: Debug -->
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <!-- Title for the notification sound preference -->
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <!-- Preference summary: Current default SMS app -->
-  <!-- Preference title: MMS phone number -->
-  <!-- Display text for phone number preference when the number is unknown -->
-  <!-- Title for the preference for playing a message send sound -->
-  <!-- Strings for dump sms/mms dialog -->
-  <!-- Title of long press menu on an individual message. -->
-  <!-- Menu item to copy message text -->
-  <!-- Title of long press menu for details about an individual message. -->
-  <!-- Title of long press menu for deleting an individual message. -->
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <!-- Title of "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <!-- Sender to be used if the sender address has been hidden -->
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <!-- Notifies the user when an attachment fails to load -->
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <!-- Title for the "People and Options" activity -->
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <!-- Title for the phone call button in the action bar that lets the user call a participant in an SMS conversation -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <!-- The hint text shown in the message compose input box when photo(s) is attached -->
-  <!-- The hint text shown in the message compose input box when audio recording(s) is attached -->
-  <!-- The hint text shown in the message compose input box when video(s) is attached -->
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <!-- Announcement after the user adds or removes an attachment -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <!-- The format of the subtitle of the help activity. -->
-  <!--  Action menu title to let users view open source license -->
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <!-- Reached MMS message attachment limit -->
-  <!-- Message attachment load failed -->
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- When there's a subject in an mms, the subject + message are shown in a notification -->
-  <!-- Text shown on contact VCard when it's being loaded -->
-  <!-- Text shown on contact VCard when it failed to load -->
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <!-- Title for the activity that shows details of VCards -->
-  <!-- VCard label for displaying birthdays -->
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <!-- Title for the message forwarding dialog -->
-  <!-- Title for the message reply dialog -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <!-- Dialog button text that closes the application. -->
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <!-- A message in conversation list view to indicate that the snipit text and preview is from an unsent draft. -->
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <!-- Indicates that the current message will be sent via MMS -->
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <!-- Title of block confirmation dialog -->
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <!-- The title of the list of blocked contacts -->
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <!-- Accessibility toast shown when a message is sending. -->
-  <!-- Accessibility toast shown when a message is sent. -->
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <!-- Accessibility : content description for numbers -->
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <!-- Text prepended to the subject of a forwarded message -->
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <!-- The notification toast text and action button label shown at bottom of screen, for when a new message comes in while the user
-         is in that conversation, but the message list is not scrolled to the bottom -->
-  <!-- Content description for the message images in a conversation or for the image preview in the conversation list if the lastest message in that conversation contains an image-->
-  <!-- Text for a toast message notifying the user that we can't find an appropriate application to handle their request -->
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Screen title after user selects APNs setting option -->
-  <!-- Edit access point label summary text when no value has been set -->
-  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
-  <!-- Edit access point labels: The actual access point name-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The type of APN -->
-  <!-- Edit access point screen menu option to delete this APN -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <!-- APNs screen menu option to reset default APN settings -->
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <!-- Title for Access Point Names settings -->
-  <!-- Title for Access Point Names settings activity -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <!-- The title for general settings section in the settings activity  -->
-  <!-- The title for advanced settings section in the settings activity  -->
-  <!-- The title for general settings activity  -->
-  <!-- The title for advanced settings activity  -->
-  <!-- The title for sim_specific settings  -->
-  <!-- The group MMS choices in settings -->
-  <!-- SIM number shown in the settings when the number is not known -->
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <!-- Content description for the SIM selector button in the conversation -->
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <!-- Content description for the audio record view -->
-  <!-- Content description for new conversation button in desktop widget -->
-  <!-- Content description for widget title -->
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <!-- Content description for new message button in desktop widget -->
-  <!-- Content description for conversation list button in desktop widget -->
-  <!-- Shown when loading conversations in the widget -->
-  <!-- Shown when loading messages in the widget -->
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <!-- Toast message telling the user that someone was blocked -->
-  <!-- Toast message telling the user that someone was unblocked -->
-  <!-- Title for attachment chooser activity -->
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message load failed -->
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <!-- When converting html to text link urls are inlined.  This specifies how the link should be
-    displayed.  For example, a link "click here" which navigates to "www.google.com" would have
-    text="click here" and url="www.google.com", using the below format to create "click here (www.google.com)" -->
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
-</resources>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-lo-rLA/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 0acde18..e957f4d 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -16,49 +16,18 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <string name="pref_unicode_stripping_leave_intact">Palikti simbolius nepaliestus</string>
-  <string name="pref_unicode_stripping_non_encodable">Pašalinti nekoduojamus simbolius</string>
-  <string name="pref_unicode_stripping_all">Pašalinti visus unikodo simbolius</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Greitasis pranešimas ir atsakymas</string>
-  <string name="pref_quickmessage_title">Rodyti greitąjį pranešimą</string>
-  <string name="pref_quickmessage_summary">Automatiškai atidaryti iššokančiuosius greituosius pranešimus gaunamiems SMS pranešimams</string>
-  <string name="pref_close_all_title">Uždaryti viską</string>
-  <string name="pref_close_all_summary">Mygtukas „Uždaryti“ uždaro visus pranešimus</string>
-  <string name="message_counter">%1$d iš %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Uždaryti</string>
-  <string name="button_view">Žiūrėti</string>
-  <string name="button_templates">Šablonai</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Rašykite, kad atsakytumėte</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Siunčiamas pranešimas\u2026</string>
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="pref_unicode_stripping_leave_intact">Palikti simbolius nepaliestus</string>
+    <string name="pref_unicode_stripping_non_encodable">Pašalinti nekoduojamus simbolius</string>
+    <string name="pref_unicode_stripping_all">Pašalinti visus unikodo simbolius</string>
+    <string name="pref_quickmessage">Greitasis pranešimas ir atsakymas</string>
+    <string name="pref_quickmessage_title">Rodyti greitąjį pranešimą</string>
+    <string name="pref_quickmessage_summary">Automatiškai atidaryti iššokančiuosius greituosius pranešimus gaunamiems SMS pranešimams</string>
+    <string name="pref_close_all_title">Uždaryti viską</string>
+    <string name="pref_close_all_summary">Mygtukas „Uždaryti“ uždaro visus pranešimus</string>
+    <string name="message_counter">%1$d iš %2$d</string>
+    <string name="button_close">Uždaryti</string>
+    <string name="button_view">Žiūrėti</string>
+    <string name="button_templates">Šablonai</string>
+    <string name="type_to_reply_text_enter_to_send">Rašykite, kad atsakytumėte</string>
+    <string name="toast_sending_message">Siunčiamas pranešimas\u2026</string>
 </resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index f147bbc..23152fa 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -16,41 +16,10 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_close_all_title">Aizvērt visu</string>
-  <string name="pref_close_all_summary">\'Aizvērt\' poga aizver visus ziņojumus</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Aizvērt</string>
-  <string name="button_view">Skatīt</string>
-  <string name="button_templates">Sagataves</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Rakstiet atbildi</string>
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="pref_close_all_title">Aizvērt visu</string>
+    <string name="pref_close_all_summary">\'Aizvērt\' poga aizver visus ziņojumus</string>
+    <string name="button_close">Aizvērt</string>
+    <string name="button_view">Skatīt</string>
+    <string name="button_templates">Sagataves</string>
+    <string name="type_to_reply_text_enter_to_send">Rakstiet atbildi</string>
 </resources>
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-mk-rMK/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index db3da42..b46223b 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -16,60 +16,29 @@
     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">യൂണിക്കോഡ് സ്ട്രിപ്</string>
-  <string name="pref_unicode_stripping_leave_intact">അക്ഷരങ്ങള്‍ ശരിയായി വിടുക</string>
-  <string name="pref_unicode_stripping_non_encodable">എന്‍കോഡ് ചെയ്യാനാവാത്ത അക്ഷരങ്ങൾ സ്ട്രിപ് ചെയ്യുക</string>
-  <string name="pref_unicode_stripping_all">എല്ലാ യൂണിക്കോഡ് അക്ഷരങ്ങളും സ്ട്രിപ് ചെയ്യുക</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- 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">ഇൻകമിംഗ് SMS സന്ദേശങ്ങൾക്കായി ക്വിക്ക്മെസേജ് പോപ്പ്-അപ്പ് സ്വമേധയാ തുറക്കുക</string>
-  <string name="pref_close_all_title">എല്ലാം അടയ്ക്കുക</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 -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">%s ലേക്ക് സ്പാം ആയി റിപ്പോർട്ട് ചെയ്യുക</string>
+    <string name="unicode_stripping_pref_title">യൂണിക്കോഡ് സ്ട്രിപ്</string>
+    <string name="pref_unicode_stripping_leave_intact">അക്ഷരങ്ങള്‍ ശരിയായി വിടുക</string>
+    <string name="pref_unicode_stripping_non_encodable">എന്‍കോഡ് ചെയ്യാനാവാത്ത അക്ഷരങ്ങൾ സ്ട്രിപ് ചെയ്യുക</string>
+    <string name="pref_unicode_stripping_all">എല്ലാ യൂണിക്കോഡ് അക്ഷരങ്ങളും സ്ട്രിപ് ചെയ്യുക</string>
+    <string name="swipe_to_delete_conversation_pref_title">ഇല്ലാതാക്കാൻ സ്വൈപ്പുചെയ്യുക</string>
+    <string name="swipe_to_delete_conversation_pref_summary">ഒരു സംഭാഷണം ഇല്ലാതാക്കാന്‍ വലതുവശത്തെക്ക് സ്വൈപ്ചെയ്യുക</string>
+    <string name="pref_quickmessage">ക്വിക്ക്മെസേജും മറുപടിയും</string>
+    <string name="pref_quickmessage_title">ക്വിക്ക്മെസേജ് കാണിക്കുക</string>
+    <string name="pref_quickmessage_summary">ഇൻകമിംഗ് SMS സന്ദേശങ്ങൾക്കായി ക്വിക്ക്മെസേജ് പോപ്പ്-അപ്പ് സ്വമേധയാ തുറക്കുക</string>
+    <string name="pref_close_all_title">എല്ലാം അടയ്ക്കുക</string>
+    <string name="pref_close_all_summary">ക്ലോസ് ബട്ടൺ എല്ലാ സന്ദേശങ്ങളും അടയ്ക്കുന്നു</string>
+    <string name="message_counter">%2$d ല്‍ %1$d</string>
+    <string name="button_close">അടയ്‌ക്കുക</string>
+    <string name="button_view">കാണുക</string>
+    <string name="button_templates">ടെംപ്ലേറ്റുകൾ</string>
+    <string name="qm_button_full_conversation">പൂർണ്ണ സംഭാഷണം</string>
+    <string name="type_to_reply_text_enter_to_send">മറുപടിയ്ക്കായി ടൈപ്പുചെയ്യുക</string>
+    <string name="toast_sending_message">സന്ദേശം അയയ്ക്കുന്നു\u2026</string>
+    <string name="qm_quick_reply">പെട്ടെന്നുള്ള മറുപടി</string>
+    <string name="send">അയയ്‌ക്കുക</string>
+    <string name="compose_message_hint_text">സന്ദേശം നല്‍കുക</string>
+    <string name="show_emoticons_pref_title">ഇമോട്ടിക്കോൺ ആക്സസ്</string>
+    <string name="show_emoticons_pref_summary">കീബോർഡിലെ ഇമോഷനുകളുടെ കീ കാണിക്കുക</string>
+    <string name="select_phone_account_title">ഒപ്പം അയയ്ക്കുക</string>
 </resources>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-mn-rMN/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 1a0e8a7..70340b8 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -16,60 +16,29 @@
     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">युनिकोड स्ट्रिप करा</string>
-  <string name="pref_unicode_stripping_leave_intact">वर्ण टिकवून ठेवा</string>
-  <string name="pref_unicode_stripping_non_encodable">एनकोड न करता येणारे वर्ण स्ट्रिप करा</string>
-  <string name="pref_unicode_stripping_all">सर्व युनिकोड वर्ण स्ट्रिप करा</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- 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">इनकमिंग SMS संदेशांसाठी स्वयंचलितपणे जलद संदेश पॉप-अप उघडा</string>
-  <string name="pref_close_all_title">सर्व बंद करा</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">संदेश पाठवित आहे…</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 -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">%sकडे स्पॅम म्हणून रिपोर्ट करा</string>
+    <string name="unicode_stripping_pref_title">युनिकोड स्ट्रिप करा</string>
+    <string name="pref_unicode_stripping_leave_intact">वर्ण टिकवून ठेवा</string>
+    <string name="pref_unicode_stripping_non_encodable">एनकोड न करता येणारे वर्ण स्ट्रिप करा</string>
+    <string name="pref_unicode_stripping_all">सर्व युनिकोड वर्ण स्ट्रिप करा</string>
+    <string name="swipe_to_delete_conversation_pref_title">हटवण्यासाठी स्वाइप करा</string>
+    <string name="swipe_to_delete_conversation_pref_summary">संभाषण हटवन्यासाठी उजविकडे स्वाइप करा</string>
+    <string name="pref_quickmessage">जलद संदेश आणि प्रतिसाद</string>
+    <string name="pref_quickmessage_title">जलद संदेश दर्शवा</string>
+    <string name="pref_quickmessage_summary">इनकमिंग SMS संदेशांसाठी स्वयंचलितपणे जलद संदेश पॉप-अप उघडा</string>
+    <string name="pref_close_all_title">सर्व बंद करा</string>
+    <string name="pref_close_all_summary">बंद बटण सर्व संदेश बंद करते</string>
+    <string name="message_counter">%2$d चे %1$d</string>
+    <string name="button_close">बंद करा</string>
+    <string name="button_view">पहा</string>
+    <string name="button_templates">प्रारूप</string>
+    <string name="qm_button_full_conversation">संपूर्ण संभाषण</string>
+    <string name="type_to_reply_text_enter_to_send">प्रतिसाद देण्यासाठी टाईप करा</string>
+    <string name="toast_sending_message">संदेश पाठवित आहे…</string>
+    <string name="qm_quick_reply">जलद प्रतिसाद</string>
+    <string name="send">पाठवा</string>
+    <string name="compose_message_hint_text">संदेश प्रविष्ठ करा</string>
+    <string name="show_emoticons_pref_title">इमोटीकन्स अॅक्सेस</string>
+    <string name="show_emoticons_pref_summary">किबोर्ड वरील इमोटीकन्स कि दाखवा</string>
+    <string name="select_phone_account_title">या बरोबर पाठवा</string>
 </resources>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-ms-rMY/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-my-rMM/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 55c591b..6e16256 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Rapporter som søppelpost til %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Fjern unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Forlat tegn intakt</string>
-  <string name="pref_unicode_stripping_non_encodable">Fjern ikke-kodbare tegn</string>
-  <string name="pref_unicode_stripping_all">Fjern alle unicode-tegn</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Gyldighetsperiode</string>
-  <string name="validity_period_slot1_pref_title">Gyldighetsperiode for SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Gyldighetsperiode for SIM 2</string>
-  <string name="sms_validity_period_not_set">Ikke satt</string>
-  <string name="sms_validity_period_one_hour">1 time</string>
-  <string name="sms_validity_period_six_hours">6 timer</string>
-  <string name="sms_validity_period_twelve_hours">12 timer</string>
-  <string name="sms_validity_period_one_day">1 dag</string>
-  <string name="mms_validity_period_two_days">2 dager</string>
-  <string name="mms_validity_period_one_week">1 uke</string>
-  <string name="validity_period_maximum">Maksimum</string>
-  <string name="pref_summary_mms_delivery_reports">Spør om en leveringsrapport for hver melding du sender</string>
-  <string name="pref_summary_mms_read_reports">Spør om en lesingsrapport for hver melding du sender</string>
-  <string name="delivery_reports_mms_pref_title">Leveranse rapporter</string>
-  <string name="read_reports_mms_pref_title">Les rapporter</string>
-  <string name="status_label">Status:\u0020</string>
-  <string name="status_read">Lese</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Sende prioritet</string>
-  <string name="priority_low">Lav</string>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">Høy</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Lagring</string>
-  <string name="pref_summary_auto_delete">Slett gamle meldinger hvis grenser blir nådd</string>
-  <string name="auto_delete_pref_title">Slett gamle meldinger</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> meldinger per samtale</string>
-  <string name="sms_delete_pref_title">Tekstmeldingsgrense</string>
-  <string name="mms_delete_pref_title">MMS meldingsgrense</string>
-  <string name="set">Sett</string>
-  <string name="no">Avbryt</string>
-  <string name="pref_messages_to_save">Sett antall meldinger som skal lagres</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Dra for å slette</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Sveip til høyre for å slette en samtale</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Hurtigsvar og svar</string>
-  <string name="pref_quickmessage_title">Vis Hurtigsvars-dialog</string>
-  <string name="pref_quickmessage_summary">Åpne automatisk Hurtigsvars-dialog for innkommende SMS-meldinger</string>
-  <string name="pref_close_all_title">Lukk alle</string>
-  <string name="pref_close_all_summary">Lukk-knappen lukker alle meldinger</string>
-  <string name="message_counter">%1$d av %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Lukk</string>
-  <string name="button_view">Vis</string>
-  <string name="button_templates">Maler</string>
-  <string name="qm_button_full_conversation">Full samtale</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Skriv for å svare</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Sender melding\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Hurtigsvar</string>
-  <string name="send">Send</string>
-  <string name="compose_message_hint_text">Skriv inn melding</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Uttrykksikoners tilgang</string>
-  <string name="show_emoticons_pref_summary">Vis uttrykksikoner-tasten på tastaturet</string>
-  <string name="select_phone_account_title">Send med</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Administrer SIM-kort meldinger</string>
-  <string name="pref_title_manage_sim_messages_slot1">Administrer SIM 1 meldinger</string>
-  <string name="pref_title_manage_sim_messages_slot2">Administrer SIM 2 meldinger</string>
-  <string name="copy_to_sim">Kopier melding til SIM-kortet</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> av <xliff:g id="total">%2$d</xliff:g> meldinger lagret på SIM-kortet.</string>
-  <string name="copy_to_sim_fail">Kan ikke lagre meldingen</string>
-  <string name="copy_to_phone_success">Meldingen er lagret</string>
-  <string name="copy_to_phone_fail">Kan ikke lagre meldingen</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">Ingen meldinger på SIM-kortet.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Send e-post til <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">Ring <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">Legg <xliff:g id="contactEmailOrNumber">%s</xliff:g> til i Folk</string>
-  <string name="sim_capacity_title">SIM kapasitet</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d </xliff:g> av <xliff:g id="total">%2$d </xliff:g> SIM card oppføringer brukes</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Slett?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Tekstmeldinger på SIM-kortet</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Oppdaterer\u2026</string>
-  <string name="confirm_delete_selected_messages">Valgt melding vil bli slettet.</string>
-  <!-- Delete button title -->
-  <string name="delete">Slett</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Videresend</string>
-  <string name="menu_reply">Svar</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Kopier til nettbrettminne</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Kopier til telefonminne</string>
-  <string name="selected_all">Velg alle</string>
-  <string name="deselected_all">Fjern alle valg</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> valgt</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">Kopier melding til SIM-kort</string>
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Velg bilder eller videoer fra denne enheten</string>
-  <string name="mediapicker_audioListChooserDescription">Velg lydfiler fra denne enheten</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Kan ikke legge til video. Meldingstørrelse grense er nådd.</string>
-  <string name="mediapicker_audio_list_title">Velg lyd</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Lyden er valgt.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Lyden er ikke valgt.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> valgt</string>
+    <string name="report_as_spam_to">Rapporter som søppelpost til %s</string>
+    <string name="unicode_stripping_pref_title">Fjern unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Forlat tegn intakt</string>
+    <string name="pref_unicode_stripping_non_encodable">Fjern ikke-kodbare tegn</string>
+    <string name="pref_unicode_stripping_all">Fjern alle unicode-tegn</string>
+    <string name="validity_period_pref_title">Gyldighetsperiode</string>
+    <string name="validity_period_slot1_pref_title">Gyldighetsperiode for SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Gyldighetsperiode for SIM 2</string>
+    <string name="sms_validity_period_not_set">Ikke satt</string>
+    <string name="sms_validity_period_one_hour">1 time</string>
+    <string name="sms_validity_period_six_hours">6 timer</string>
+    <string name="sms_validity_period_twelve_hours">12 timer</string>
+    <string name="sms_validity_period_one_day">1 dag</string>
+    <string name="mms_validity_period_two_days">2 dager</string>
+    <string name="mms_validity_period_one_week">1 uke</string>
+    <string name="validity_period_maximum">Maksimum</string>
+    <string name="pref_summary_mms_delivery_reports">Spør om en leveringsrapport for hver melding du sender</string>
+    <string name="pref_summary_mms_read_reports">Spør om en lesingsrapport for hver melding du sender</string>
+    <string name="delivery_reports_mms_pref_title">Leveranse rapporter</string>
+    <string name="read_reports_mms_pref_title">Les rapporter</string>
+    <string name="status_label">Status:\u0020</string>
+    <string name="status_read">Lese</string>
+    <string name="priority_pref_title">Sende prioritet</string>
+    <string name="priority_low">Lav</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">Høy</string>
+    <string name="sms_storage_pref_title">Lagring</string>
+    <string name="pref_summary_auto_delete">Slett gamle meldinger hvis grenser blir nådd</string>
+    <string name="auto_delete_pref_title">Slett gamle meldinger</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> meldinger per samtale</string>
+    <string name="sms_delete_pref_title">Tekstmeldingsgrense</string>
+    <string name="mms_delete_pref_title">MMS meldingsgrense</string>
+    <string name="set">Sett</string>
+    <string name="no">Avbryt</string>
+    <string name="pref_messages_to_save">Sett antall meldinger som skal lagres</string>
+    <string name="swipe_to_delete_conversation_pref_title">Dra for å slette</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Sveip til høyre for å slette en samtale</string>
+    <string name="pref_quickmessage">Hurtigsvar og svar</string>
+    <string name="pref_quickmessage_title">Vis Hurtigsvars-dialog</string>
+    <string name="pref_quickmessage_summary">Åpne automatisk Hurtigsvars-dialog for innkommende SMS-meldinger</string>
+    <string name="pref_close_all_title">Lukk alle</string>
+    <string name="pref_close_all_summary">Lukk-knappen lukker alle meldinger</string>
+    <string name="message_counter">%1$d av %2$d</string>
+    <string name="button_close">Lukk</string>
+    <string name="button_view">Vis</string>
+    <string name="button_templates">Maler</string>
+    <string name="qm_button_full_conversation">Full samtale</string>
+    <string name="type_to_reply_text_enter_to_send">Skriv for å svare</string>
+    <string name="toast_sending_message">Sender melding\u2026</string>
+    <string name="qm_quick_reply">Hurtigsvar</string>
+    <string name="send">Send</string>
+    <string name="compose_message_hint_text">Skriv inn melding</string>
+    <string name="show_emoticons_pref_title">Uttrykksikoners tilgang</string>
+    <string name="show_emoticons_pref_summary">Vis uttrykksikoner-tasten på tastaturet</string>
+    <string name="select_phone_account_title">Send med</string>
+    <string name="pref_title_manage_sim_messages">Administrer SIM-kort meldinger</string>
+    <string name="pref_title_manage_sim_messages_slot1">Administrer SIM 1 meldinger</string>
+    <string name="pref_title_manage_sim_messages_slot2">Administrer SIM 2 meldinger</string>
+    <string name="copy_to_sim">Kopier melding til SIM-kortet</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> av <xliff:g id="total">%2$d</xliff:g> meldinger lagret på SIM-kortet.</string>
+    <string name="copy_to_sim_fail">Kan ikke lagre meldingen</string>
+    <string name="copy_to_phone_success">Meldingen er lagret</string>
+    <string name="copy_to_phone_fail">Kan ikke lagre meldingen</string>
+    <string name="sim_empty">Ingen meldinger på SIM-kortet.</string>
+    <string name="menu_send_email">Send e-post til <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Ring <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Legg <xliff:g id="contactEmailOrNumber">%s</xliff:g> til i Folk</string>
+    <string name="sim_capacity_title">SIM kapasitet</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d </xliff:g> av <xliff:g id="total">%2$d </xliff:g> SIM card oppføringer brukes</string>
+    <string name="confirm_dialog_title">Slett?</string>
+    <string name="sim_manage_messages_title">Tekstmeldinger på SIM-kortet</string>
+    <string name="refreshing">Oppdaterer\u2026</string>
+    <string name="confirm_delete_selected_messages">Valgt melding vil bli slettet.</string>
+    <string name="delete">Slett</string>
+    <string name="menu_forward">Videresend</string>
+    <string name="menu_reply">Svar</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Kopier til nettbrettminne</string>
+    <string name="sim_copy_to_phone_memory" product="default">Kopier til telefonminne</string>
+    <string name="selected_all">Velg alle</string>
+    <string name="deselected_all">Fjern alle valg</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> valgt</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Kopier melding til SIM-kort</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Velg bilder eller videoer fra denne enheten</string>
+    <string name="mediapicker_audioListChooserDescription">Velg lydfiler fra denne enheten</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Kan ikke legge til video. Meldingstørrelse grense er nådd.</string>
+    <string name="mediapicker_audio_list_title">Velg lyd</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Lyden er valgt.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Lyden er ikke valgt.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> valgt</string>
 </resources>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-ne-rNP/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index f03b8bc..58796c7 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Rapporteren als ongewenst aan %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Unicode-tekens verwijderen</string>
-  <string name="pref_unicode_stripping_leave_intact">Tekens intact laten</string>
-  <string name="pref_unicode_stripping_non_encodable">Niet-encodeerbare tekens verwijderen</string>
-  <string name="pref_unicode_stripping_all">Alle Unicode-tekens verwijderen</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Geldigheidsduur</string>
-  <string name="validity_period_slot1_pref_title">Geldigheidsduur voor SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Geldigheidsduur voor SIM 2</string>
-  <string name="sms_validity_period_not_set">Niet ingesteld</string>
-  <string name="sms_validity_period_one_hour">1 uur</string>
-  <string name="sms_validity_period_six_hours">6 uur</string>
-  <string name="sms_validity_period_twelve_hours">12 uur</string>
-  <string name="sms_validity_period_one_day">1 dag</string>
-  <string name="mms_validity_period_two_days">2 dagen</string>
-  <string name="mms_validity_period_one_week">1 week</string>
-  <string name="validity_period_maximum">Maximaal</string>
-  <string name="pref_summary_mms_delivery_reports">Ontvangstbevestiging vragen voor elk verzonden bericht</string>
-  <string name="pref_summary_mms_read_reports">Leesbevestiging vragen voor elk verzonden bericht</string>
-  <string name="delivery_reports_mms_pref_title">Ontvangstbevestigingen</string>
-  <string name="read_reports_mms_pref_title">Leesbevestigingen</string>
-  <string name="status_label">Status:\u0020</string>
-  <string name="status_read">Gelezen</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Prioriteit</string>
-  <string name="priority_low">Laag</string>
-  <string name="priority_normal">Normaal</string>
-  <string name="priority_high">Hoog</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Opslag</string>
-  <string name="pref_summary_auto_delete">Oude berichten verwijderen wanneer limiet bereikt is</string>
-  <string name="auto_delete_pref_title">Oude berichten verwijderen</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> berichten per gesprek</string>
-  <string name="sms_delete_pref_title">Limiet sms-berichten</string>
-  <string name="mms_delete_pref_title">Limiet multimediaberichten</string>
-  <string name="set">Instellen</string>
-  <string name="no">Annuleren</string>
-  <string name="pref_messages_to_save">Aantal berichten om te bewaren</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Vegen om te verwijderen</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Naar rechts vegen om een gesprek te verwijderen</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Snelbericht en -beantwoorden</string>
-  <string name="pref_quickmessage_title">Snelbericht weergeven</string>
-  <string name="pref_quickmessage_summary">Automatisch een Snelbericht-venster weergeven bij inkomende sms-berichten</string>
-  <string name="pref_close_all_title">Alles sluiten</string>
-  <string name="pref_close_all_summary">Sluiten-knop sluit alle berichten</string>
-  <string name="message_counter">%1$d van %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Sluiten</string>
-  <string name="button_view">Tonen</string>
-  <string name="button_templates">Sjablonen</string>
-  <string name="qm_button_full_conversation">Volledig gesprek</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Typ om te beantwoorden</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Bericht verzenden\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Snelbeantwoorden</string>
-  <string name="send">Verzenden</string>
-  <string name="compose_message_hint_text">Bericht invoeren</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Toegang tot emoticons</string>
-  <string name="show_emoticons_pref_summary">Emoticons-toets op het toetsenbord weergeven</string>
-  <string name="select_phone_account_title">Verzenden met</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Berichten op simkaart beheren</string>
-  <string name="pref_title_manage_sim_messages_slot1">Berichten op SIM 1 beheren</string>
-  <string name="pref_title_manage_sim_messages_slot2">Berichten op SIM 2 beheren</string>
-  <string name="copy_to_sim">Bericht kopiëren naar simkaart</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> van <xliff:g id="total">%2$d</xliff:g> berichten opgeslagen op simkaart.</string>
-  <string name="copy_to_sim_fail">Kan bericht niet opslaan</string>
-  <string name="copy_to_phone_success">Bericht opgeslagen</string>
-  <string name="copy_to_phone_fail">Kan bericht niet opslaan</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">Geen berichten op simkaart.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">E-mail verzenden naar <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"><xliff:g id="name">%s</xliff:g> bellen</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> aan contacten toevoegen</string>
-  <string name="sim_capacity_title">SIM-capaciteit</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> van <xliff:g id="total">%2$d</xliff:g> plekken op simkaart in gebruik</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Verwijderen?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Berichten op simkaart</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Vernieuwen\u2026</string>
-  <string name="confirm_delete_selected_messages">Geselecteerd bericht wordt verwijderd.</string>
-  <!-- Delete button title -->
-  <string name="delete">Verwijderen</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Doorsturen</string>
-  <string name="menu_reply">Beantwoorden</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Bericht kopiëren naar tabletgeheugen</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Bericht kopiëren naar telefoongeheugen</string>
-  <string name="selected_all">Alles selecteren</string>
-  <string name="deselected_all">Alles deselecteren</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> geselecteerd</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">Bericht kopiëren naar simkaart</string>
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Afbeeldingen of video\'s op dit apparaat selecteren</string>
-  <string name="mediapicker_audioListChooserDescription">Audiobestanden op dit apparaat selecteren</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Kan video niet toevoegen. Maximale berichtgrootte overschreden.</string>
-  <string name="mediapicker_audio_list_title">Audio selecteren</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Audio is geselecteerd.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Audio is niet geselecteerd.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> geselecteerd</string>
+    <string name="report_as_spam_to">Rapporteren als ongewenst aan %s</string>
+    <string name="unicode_stripping_pref_title">Unicode-tekens verwijderen</string>
+    <string name="pref_unicode_stripping_leave_intact">Tekens intact laten</string>
+    <string name="pref_unicode_stripping_non_encodable">Niet-encodeerbare tekens verwijderen</string>
+    <string name="pref_unicode_stripping_all">Alle Unicode-tekens verwijderen</string>
+    <string name="validity_period_pref_title">Geldigheidsduur</string>
+    <string name="validity_period_slot1_pref_title">Geldigheidsduur voor SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Geldigheidsduur voor SIM 2</string>
+    <string name="sms_validity_period_not_set">Niet ingesteld</string>
+    <string name="sms_validity_period_one_hour">1 uur</string>
+    <string name="sms_validity_period_six_hours">6 uur</string>
+    <string name="sms_validity_period_twelve_hours">12 uur</string>
+    <string name="sms_validity_period_one_day">1 dag</string>
+    <string name="mms_validity_period_two_days">2 dagen</string>
+    <string name="mms_validity_period_one_week">1 week</string>
+    <string name="validity_period_maximum">Maximaal</string>
+    <string name="pref_summary_mms_delivery_reports">Ontvangstbevestiging vragen voor elk verzonden bericht</string>
+    <string name="pref_summary_mms_read_reports">Leesbevestiging vragen voor elk verzonden bericht</string>
+    <string name="delivery_reports_mms_pref_title">Ontvangstbevestigingen</string>
+    <string name="read_reports_mms_pref_title">Leesbevestigingen</string>
+    <string name="status_label">Status:\u0020</string>
+    <string name="status_read">Gelezen</string>
+    <string name="priority_pref_title">Prioriteit</string>
+    <string name="priority_low">Laag</string>
+    <string name="priority_normal">Normaal</string>
+    <string name="priority_high">Hoog</string>
+    <string name="sms_storage_pref_title">Opslag</string>
+    <string name="pref_summary_auto_delete">Oude berichten verwijderen wanneer limiet bereikt is</string>
+    <string name="auto_delete_pref_title">Oude berichten verwijderen</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> berichten per gesprek</string>
+    <string name="sms_delete_pref_title">Limiet sms-berichten</string>
+    <string name="mms_delete_pref_title">Limiet multimediaberichten</string>
+    <string name="set">Instellen</string>
+    <string name="no">Annuleren</string>
+    <string name="pref_messages_to_save">Aantal berichten om te bewaren</string>
+    <string name="swipe_to_delete_conversation_pref_title">Vegen om te verwijderen</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Naar rechts vegen om een gesprek te verwijderen</string>
+    <string name="pref_quickmessage">Snelbericht en -beantwoorden</string>
+    <string name="pref_quickmessage_title">Snelbericht weergeven</string>
+    <string name="pref_quickmessage_summary">Automatisch een Snelbericht-venster weergeven bij inkomende sms-berichten</string>
+    <string name="pref_close_all_title">Alles sluiten</string>
+    <string name="pref_close_all_summary">Sluiten-knop sluit alle berichten</string>
+    <string name="message_counter">%1$d van %2$d</string>
+    <string name="button_close">Sluiten</string>
+    <string name="button_view">Tonen</string>
+    <string name="button_templates">Sjablonen</string>
+    <string name="qm_button_full_conversation">Volledig gesprek</string>
+    <string name="type_to_reply_text_enter_to_send">Typ om te beantwoorden</string>
+    <string name="toast_sending_message">Bericht verzenden\u2026</string>
+    <string name="qm_quick_reply">Snelbeantwoorden</string>
+    <string name="send">Verzenden</string>
+    <string name="compose_message_hint_text">Bericht invoeren</string>
+    <string name="show_emoticons_pref_title">Toegang tot emoticons</string>
+    <string name="show_emoticons_pref_summary">Emoticons-toets op het toetsenbord weergeven</string>
+    <string name="select_phone_account_title">Verzenden met</string>
+    <string name="pref_title_manage_sim_messages">Berichten op simkaart beheren</string>
+    <string name="pref_title_manage_sim_messages_slot1">Berichten op SIM 1 beheren</string>
+    <string name="pref_title_manage_sim_messages_slot2">Berichten op SIM 2 beheren</string>
+    <string name="copy_to_sim">Bericht kopiëren naar simkaart</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> van <xliff:g id="total">%2$d</xliff:g> berichten opgeslagen op simkaart.</string>
+    <string name="copy_to_sim_fail">Kan bericht niet opslaan</string>
+    <string name="copy_to_phone_success">Bericht opgeslagen</string>
+    <string name="copy_to_phone_fail">Kan bericht niet opslaan</string>
+    <string name="sim_empty">Geen berichten op simkaart.</string>
+    <string name="menu_send_email">E-mail verzenden naar <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back"><xliff:g id="name">%s</xliff:g> bellen</string>
+    <string name="menu_add_address_to_contacts"><xliff:g id="contactEmailOrNumber">%s</xliff:g> aan contacten toevoegen</string>
+    <string name="sim_capacity_title">SIM-capaciteit</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> van <xliff:g id="total">%2$d</xliff:g> plekken op simkaart in gebruik</string>
+    <string name="confirm_dialog_title">Verwijderen?</string>
+    <string name="sim_manage_messages_title">Berichten op simkaart</string>
+    <string name="refreshing">Vernieuwen\u2026</string>
+    <string name="confirm_delete_selected_messages">Geselecteerd bericht wordt verwijderd.</string>
+    <string name="delete">Verwijderen</string>
+    <string name="menu_forward">Doorsturen</string>
+    <string name="menu_reply">Beantwoorden</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Bericht kopiëren naar tabletgeheugen</string>
+    <string name="sim_copy_to_phone_memory" product="default">Bericht kopiëren naar telefoongeheugen</string>
+    <string name="selected_all">Alles selecteren</string>
+    <string name="deselected_all">Alles deselecteren</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> geselecteerd</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Bericht kopiëren naar simkaart</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Afbeeldingen of video\'s op dit apparaat selecteren</string>
+    <string name="mediapicker_audioListChooserDescription">Audiobestanden op dit apparaat selecteren</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Kan video niet toevoegen. Maximale berichtgrootte overschreden.</string>
+    <string name="mediapicker_audio_list_title">Audio selecteren</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Audio is geselecteerd.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Audio is niet geselecteerd.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> geselecteerd</string>
 </resources>
diff --git a/res/values-or-rIN/arrays.xml b/res/values-or-rIN/arrays.xml
deleted file mode 100644
index f2be096..0000000
--- a/res/values-or-rIN/arrays.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String to match as no subject and filter out as a subject. For example, if the
-         subject string is "no subject", we won't display that. We'll pretend
-         no subject string was delivered. -->
-  <!-- Choices for quick-reply to message notification. Users with an Android
-    Wear device (e.g. smartwatch) can reply to messages either by speaking their
-    response, or choosing one of these predefined options. -->
-</resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 02fbf6c..68497ad 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -16,60 +16,29 @@
     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">ଷ୍ଟ୍ରିପ୍‍ ୟୁନିକୋଡ୍‍</string>
-  <string name="pref_unicode_stripping_leave_intact">ବର୍ଣ୍ଣ ଇନ୍‍ଟାକ୍ଟ ଛାଡିଦିଅନ୍ତୁ</string>
-  <string name="pref_unicode_stripping_non_encodable">ନନ୍‍-ଏନ୍‍କୋଡେବୁଲ୍‍ ବର୍ଣ୍ଣଗୁଡିକ ଷ୍ଟ୍ରିପ୍‍ କରନ୍ତୁ</string>
-  <string name="pref_unicode_stripping_all">ସମସ୍ତ ୟୁନିକୋଡ୍‍ ବର୍ଣ୍ଣଗୁଡିକ ଷ୍ଟ୍ରିପ୍‍ କରନ୍ତୁ</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- 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">ଆସୁଥିବା SMS ସନ୍ଦେଶ ପାଇଁ ଦ୍ରୁତସନ୍ଦେଶ ପପ୍‍-ଅପ୍‍ ସ୍ୱତଃ ଭାବେ ଖୋଲନ୍ତୁ</string>
-  <string name="pref_close_all_title">ସବୁ ବନ୍ଦ କରନ୍ତୁ</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 -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">ସ୍ପାମ୍‍ ଭାବେ %sକୁ ରିପୋର୍ଟ କରନ୍ତୁ</string>
+    <string name="unicode_stripping_pref_title">ଷ୍ଟ୍ରିପ୍‍ ୟୁନିକୋଡ୍‍</string>
+    <string name="pref_unicode_stripping_leave_intact">ବର୍ଣ୍ଣ ଇନ୍‍ଟାକ୍ଟ ଛାଡିଦିଅନ୍ତୁ</string>
+    <string name="pref_unicode_stripping_non_encodable">ନନ୍‍-ଏନ୍‍କୋଡେବୁଲ୍‍ ବର୍ଣ୍ଣଗୁଡିକ ଷ୍ଟ୍ରିପ୍‍ କରନ୍ତୁ</string>
+    <string name="pref_unicode_stripping_all">ସମସ୍ତ ୟୁନିକୋଡ୍‍ ବର୍ଣ୍ଣଗୁଡିକ ଷ୍ଟ୍ରିପ୍‍ କରନ୍ତୁ</string>
+    <string name="swipe_to_delete_conversation_pref_title">ବିଲୋପ କରିବାକୁ ସ୍ଵାଇପ୍ କରନ୍ତୁ</string>
+    <string name="swipe_to_delete_conversation_pref_summary">ବିଲୋପ କରିବା ପାଇଁ ଡାହାଣକୁ ସ୍ଵାଇପ୍ କରନ୍ତୁ</string>
+    <string name="pref_quickmessage">ଦ୍ରୁତସନ୍ଦେଶ ଓ ପ୍ରତ୍ୟୁତ୍ତର</string>
+    <string name="pref_quickmessage_title">ଦ୍ରୁତସନ୍ଦେଶ ଦେଖାନ୍ତୁ</string>
+    <string name="pref_quickmessage_summary">ଆସୁଥିବା SMS ସନ୍ଦେଶ ପାଇଁ ଦ୍ରୁତସନ୍ଦେଶ ପପ୍‍-ଅପ୍‍ ସ୍ୱତଃ ଭାବେ ଖୋଲନ୍ତୁ</string>
+    <string name="pref_close_all_title">ସବୁ ବନ୍ଦ କରନ୍ତୁ</string>
+    <string name="pref_close_all_summary">ବନ୍ଦ କରିବା ବଟନ୍‍ ସମସ୍ତ ସନ୍ଦେଶ ବନ୍ଦ କରିଦିଏ</string>
+    <string name="message_counter">%2$Dର %1$d</string>
+    <string name="button_close">ବନ୍ଦ</string>
+    <string name="button_view">ଦର୍ଶନ</string>
+    <string name="button_templates">ଟେଂପଲେଟ୍ସ</string>
+    <string name="qm_button_full_conversation">ସମ୍ପୁର୍ଣ୍ଣ କଥାବାର୍ତ୍ତା</string>
+    <string name="type_to_reply_text_enter_to_send">ପ୍ରତ୍ୟୁତ୍ତର ଦେବା ପାଇଁ ଟାଇପ୍‍ କରନ୍ତୁ</string>
+    <string name="toast_sending_message">ସନ୍ଦେଶ ପଠାଉଛି\u2026</string>
+    <string name="qm_quick_reply">ଦ୍ରୁତ ପ୍ର୍ତ୍ଯୂତ୍ତର</string>
+    <string name="send">ପଠାନ୍ତୁ</string>
+    <string name="compose_message_hint_text">ସନ୍ଦେଶ ପ୍ରବେଶ କରନ୍ତୁ</string>
+    <string name="show_emoticons_pref_title">ଇମୋଟିକନ୍‍ ଆକ୍ସେସ୍</string>
+    <string name="show_emoticons_pref_summary">ସୋ ଦ ଇମୋକସନ କି ଅନ ଦି କିବୋର୍ଡ଼</string>
+    <string name="select_phone_account_title">ଏହା ସହିତ ପଠାନ୍ତୁ</string>
 </resources>
diff --git a/res/values-or-rIN/strings.xml b/res/values-or-rIN/strings.xml
deleted file mode 100644
index d73a67e..0000000
--- a/res/values-or-rIN/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- The name of the application as it appears under the main Launcher icon and in various activity titles -->
-  <!-- The name of the application as it appears in external share intent dialogs -->
-  <!-- The title when selecting a conversation to share to -->
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <!-- The tab header for the frequently used contacts list -->
-  <!-- The tab header for all contacts list -->
-  <!-- The text on the list item in the contact picker that allows a user to send an SMS directly
-         to a number that he/she typed. eg. "Send to 650-555-1234" -->
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <!-- Abbreviated message to express that something occurred some number of hours in the past (e.g., 5 hours ago). -->
-  <!-- Abbreviated message to express that something occurred some number of days in the past (e.g., 5 days ago). -->
-  <!--
-        Plurals used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <!-- Title of the class-0 message activity. -->
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <!-- Title for SMS storage low notification and dialog. Must match the framework's notification title, i.e. //frameworks/base/core/res/res/values/strings.xml#low_internal_storage_view_title -->
-  <!-- Text for SMS storage low notification and dialog -->
-  <!-- Ticker for SMS storage low notification -->
-  <!-- Title for asking the user to enter their phone number -->
-  <!-- Text for asking the user to enter their phone number -->
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <!-- Free SMS storage actions -->
-  <!-- Free SMS storage action confirm dialog message -->
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <!-- While sending a message display this message. -->
-  <!-- When sending a message failed display this message. -->
-  <!-- When retrying sending for a message. -->
-  <!-- When showing resend action display this message. -->
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <!-- When showing resend action, display this message. -->
-  <!-- Title line for an MMS requiring manual download. -->
-  <!-- Title line for an MMS auto-downloading. -->
-  <!-- Title line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which is selected. -->
-  <!-- Timestamp line to display while downloading a message. -->
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <!-- Display this info line with an MMS notification -->
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for download failed -->
-  <!-- notification line 1 for multiple downloads failed -->
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <!-- Notification content when emergency SMS fails to send -->
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <!-- Content description text for Back button on the action bar -->
-  <!-- Action menu title for showing archived conversations -->
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <!-- An enumeration comma for separating multiple names in notifications. [CHAR LIMIT=2] -->
-  <!-- Separator between parts of a notification in each line of an inboxStyle notification. [CHAR LIMIT=2] -->
-  <!-- Separator between title and content in notification ticker -->
-  <!-- Separator between title and content in notifications -->
-  <!-- Shown in notifications when there's a picture. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <!-- Shown in the Android Wear conversation log as the sender for outgoing messages,
-         when we don't know the user's real name (e.g. no "Me" contact on the phone). -->
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <!-- Accessibility announcement for an incoming message -->
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <!-- Accessibility description for conversation list for group conversations -->
-  <!-- Accessibility description for conversation list for failed messages -->
-  <!-- Accessibility name for a group conversation -->
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <!-- Title for the preferences/settings activity -->
-  <!-- Title for the archived conversations activity -->
-  <!-- Action title: Close -->
-  <!-- Preference category: MMS messaging -->
-  <!-- Preference category: Advanced -->
-  <!-- Preference category: Debug -->
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <!-- Title for the notification sound preference -->
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <!-- Preference summary: Current default SMS app -->
-  <!-- Preference title: MMS phone number -->
-  <!-- Display text for phone number preference when the number is unknown -->
-  <!-- Title for the preference for playing a message send sound -->
-  <!-- Strings for dump sms/mms dialog -->
-  <!-- Title of long press menu on an individual message. -->
-  <!-- Menu item to copy message text -->
-  <!-- Title of long press menu for details about an individual message. -->
-  <!-- Title of long press menu for deleting an individual message. -->
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <!-- Title of "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <!-- Sender to be used if the sender address has been hidden -->
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <!-- Notifies the user when an attachment fails to load -->
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <!-- Title for the "People and Options" activity -->
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <!-- Title for the phone call button in the action bar that lets the user call a participant in an SMS conversation -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <!-- The hint text shown in the message compose input box when photo(s) is attached -->
-  <!-- The hint text shown in the message compose input box when audio recording(s) is attached -->
-  <!-- The hint text shown in the message compose input box when video(s) is attached -->
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <!-- Announcement after the user adds or removes an attachment -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <!-- The format of the subtitle of the help activity. -->
-  <!--  Action menu title to let users view open source license -->
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <!-- Reached MMS message attachment limit -->
-  <!-- Message attachment load failed -->
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- When there's a subject in an mms, the subject + message are shown in a notification -->
-  <!-- Text shown on contact VCard when it's being loaded -->
-  <!-- Text shown on contact VCard when it failed to load -->
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <!-- Title for the activity that shows details of VCards -->
-  <!-- VCard label for displaying birthdays -->
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <!-- Title for the message forwarding dialog -->
-  <!-- Title for the message reply dialog -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <!-- Dialog button text that closes the application. -->
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <!-- A message in conversation list view to indicate that the snipit text and preview is from an unsent draft. -->
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <!-- Indicates that the current message will be sent via MMS -->
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <!-- Title of block confirmation dialog -->
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <!-- The title of the list of blocked contacts -->
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <!-- Accessibility toast shown when a message is sending. -->
-  <!-- Accessibility toast shown when a message is sent. -->
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <!-- Accessibility : content description for numbers -->
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <!-- Text prepended to the subject of a forwarded message -->
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <!-- The notification toast text and action button label shown at bottom of screen, for when a new message comes in while the user
-         is in that conversation, but the message list is not scrolled to the bottom -->
-  <!-- Content description for the message images in a conversation or for the image preview in the conversation list if the lastest message in that conversation contains an image-->
-  <!-- Text for a toast message notifying the user that we can't find an appropriate application to handle their request -->
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Screen title after user selects APNs setting option -->
-  <!-- Edit access point label summary text when no value has been set -->
-  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
-  <!-- Edit access point labels: The actual access point name-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The type of APN -->
-  <!-- Edit access point screen menu option to delete this APN -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <!-- APNs screen menu option to reset default APN settings -->
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <!-- Title for Access Point Names settings -->
-  <!-- Title for Access Point Names settings activity -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <!-- The title for general settings section in the settings activity  -->
-  <!-- The title for advanced settings section in the settings activity  -->
-  <!-- The title for general settings activity  -->
-  <!-- The title for advanced settings activity  -->
-  <!-- The title for sim_specific settings  -->
-  <!-- The group MMS choices in settings -->
-  <!-- SIM number shown in the settings when the number is not known -->
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <!-- Content description for the SIM selector button in the conversation -->
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <!-- Content description for the audio record view -->
-  <!-- Content description for new conversation button in desktop widget -->
-  <!-- Content description for widget title -->
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <!-- Content description for new message button in desktop widget -->
-  <!-- Content description for conversation list button in desktop widget -->
-  <!-- Shown when loading conversations in the widget -->
-  <!-- Shown when loading messages in the widget -->
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <!-- Toast message telling the user that someone was blocked -->
-  <!-- Toast message telling the user that someone was unblocked -->
-  <!-- Title for attachment chooser activity -->
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message load failed -->
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <!-- When converting html to text link urls are inlined.  This specifies how the link should be
-    displayed.  For example, a link "click here" which navigates to "www.google.com" would have
-    text="click here" and url="www.google.com", using the below format to create "click here (www.google.com)" -->
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
-</resources>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-pa-rIN/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 1654053..0881390 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Zgłoś spam do %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Opuszczanie Unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Pozostaw znaki bez zmian</string>
-  <string name="pref_unicode_stripping_non_encodable">Opuszczaj znaki niekodowane</string>
-  <string name="pref_unicode_stripping_all">Opuszczaj wszystkie znaki</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Termin ważności</string>
-  <string name="validity_period_slot1_pref_title">Termin ważności SIM1</string>
-  <string name="validity_period_slot2_pref_title">Termin ważności SIM2</string>
-  <string name="sms_validity_period_not_set">Nie ustawiono</string>
-  <string name="sms_validity_period_one_hour">1 godzina</string>
-  <string name="sms_validity_period_six_hours">6 godzin</string>
-  <string name="sms_validity_period_twelve_hours">12 godzin</string>
-  <string name="sms_validity_period_one_day">1 dzień</string>
-  <string name="mms_validity_period_two_days">2 dni</string>
-  <string name="mms_validity_period_one_week">1 tydzień</string>
-  <string name="validity_period_maximum">Maksimum</string>
-  <string name="pref_summary_mms_delivery_reports">Żądaj raportu dostarczenia każdej wysłanej wiadomości</string>
-  <string name="pref_summary_mms_read_reports">Żądaj raportu odczytania każdej wysłanej wiadomości</string>
-  <string name="delivery_reports_mms_pref_title">Raporty dostarczenia</string>
-  <string name="read_reports_mms_pref_title">Raporty odczytania</string>
-  <string name="status_label">Status: \u0020</string>
-  <string name="status_read">Odczytane</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Priorytet wysyłania</string>
-  <string name="priority_low">Niski</string>
-  <string name="priority_normal">Normalny</string>
-  <string name="priority_high">Wysoki</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Pamięć</string>
-  <string name="pref_summary_auto_delete">Jeśli limit zostanie osiągnięty, usuń stare wiadomości</string>
-  <string name="auto_delete_pref_title">Usuń stare wiadomości</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> wiadomości na konwersację</string>
-  <string name="sms_delete_pref_title">Limit wiadomości tekstowych</string>
-  <string name="mms_delete_pref_title">Limit wiadomości multimedialnych</string>
-  <string name="set">Ustaw</string>
-  <string name="no">Anuluj</string>
-  <string name="pref_messages_to_save">Wybierz liczbę wiadomości do zapisania</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Przesuń, aby usunąć</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Przesuń w prawo, aby usunąć konwersację</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Szybka wiadomość i Odpowiedź</string>
-  <string name="pref_quickmessage_title">Włącz szybkie wiadomości</string>
-  <string name="pref_quickmessage_summary">Automatycznie otwórz wyskakujące okno Szybkiej odpowiedzi dla przychodzącej wiadomości SMS</string>
-  <string name="pref_close_all_title">Zamknij wszystkie</string>
-  <string name="pref_close_all_summary">Przycisk „Zamknij” zamyka wszystkie wiadomości</string>
-  <string name="message_counter">%1$d z %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Zamknij</string>
-  <string name="button_view">Zobacz</string>
-  <string name="button_templates">Szablony</string>
-  <string name="qm_button_full_conversation">Pełna konwersacja</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Wpisz wiadomość</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Wysyłanie wiadomości\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Szybka odpowiedź</string>
-  <string name="send">Wyślij</string>
-  <string name="compose_message_hint_text">Wpisz wiadomość</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Dostęp do emotikon</string>
-  <string name="show_emoticons_pref_summary">Pokaż klawisz emotikon na klawiaturze</string>
-  <string name="select_phone_account_title">Wyślij z</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Zarządzanie wiadomościami karty SIM</string>
-  <string name="pref_title_manage_sim_messages_slot1">Zarządzanie wiadomościami SIM 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Zarządzanie wiadomościami SIM 2</string>
-  <string name="copy_to_sim">Kopiuj wiadomość na kartę SIM</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> z <xliff:g id="total">%2$d</xliff:g> wiadomości zapisano na karcie SIM.</string>
-  <string name="copy_to_sim_fail">Nie można zapisać wiadomości</string>
-  <string name="copy_to_phone_success">Wiadomość zapisana</string>
-  <string name="copy_to_phone_fail">Nie można zapisać wiadomości</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">Brak wiadomości na karcie SIM.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Wyślij e-mail do <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">Zadzwoń do <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">Dodaj <xliff:g id="contactEmailOrNumber">%s</xliff:g> do Osób</string>
-  <string name="sim_capacity_title">Pojemność SIM</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> z <xliff:g id="total">%2$d</xliff:g> miejsc na karcie SIM jest używane</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Usunąć?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Wiadomości tekstowe na karcie SIM</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Odświeżanie\u2026</string>
-  <string name="confirm_delete_selected_messages">Wybrana wiadomość zostanie usunięta.</string>
-  <!-- Delete button title -->
-  <string name="delete">Usuń</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Dalej</string>
-  <string name="menu_reply">Odpowiedz</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Kopiuj do pamięci tableta</string>
-  <!-- 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>
-  <!-- Copy message to sim -->
-  <string name="operation_to_card_memory">Kopiuj wiadomość na kartę 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">Wybierz zdjęcia lub wideo z tego urządzenia</string>
-  <string name="mediapicker_audioListChooserDescription">Wybierz pliki dźwiękowe z tego urządzenia</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Nie można dołączyć wideo. Maksymalny rozmiar wiadomości został przekroczony.</string>
-  <string name="mediapicker_audio_list_title">Wybierz muzykę</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Plik audio został wybrany.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Plik audio nie został wybrany.</string>
-  <string name="mediapicker_audio_list_title_selection">Wybrano: <xliff:g id="count">%d</xliff:g></string>
+    <string name="report_as_spam_to">Zgłoś spam do %s</string>
+    <string name="unicode_stripping_pref_title">Opuszczanie Unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Pozostaw znaki bez zmian</string>
+    <string name="pref_unicode_stripping_non_encodable">Opuszczaj znaki niekodowane</string>
+    <string name="pref_unicode_stripping_all">Opuszczaj wszystkie znaki</string>
+    <string name="validity_period_pref_title">Termin ważności</string>
+    <string name="validity_period_slot1_pref_title">Termin ważności SIM1</string>
+    <string name="validity_period_slot2_pref_title">Termin ważności SIM2</string>
+    <string name="sms_validity_period_not_set">Nie ustawiono</string>
+    <string name="sms_validity_period_one_hour">1 godzina</string>
+    <string name="sms_validity_period_six_hours">6 godzin</string>
+    <string name="sms_validity_period_twelve_hours">12 godzin</string>
+    <string name="sms_validity_period_one_day">1 dzień</string>
+    <string name="mms_validity_period_two_days">2 dni</string>
+    <string name="mms_validity_period_one_week">1 tydzień</string>
+    <string name="validity_period_maximum">Maksimum</string>
+    <string name="pref_summary_mms_delivery_reports">Żądaj raportu dostarczenia każdej wysłanej wiadomości</string>
+    <string name="pref_summary_mms_read_reports">Żądaj raportu odczytania każdej wysłanej wiadomości</string>
+    <string name="delivery_reports_mms_pref_title">Raporty dostarczenia</string>
+    <string name="read_reports_mms_pref_title">Raporty odczytania</string>
+    <string name="status_label">Status: \u0020</string>
+    <string name="status_read">Odczytane</string>
+    <string name="priority_pref_title">Priorytet wysyłania</string>
+    <string name="priority_low">Niski</string>
+    <string name="priority_normal">Normalny</string>
+    <string name="priority_high">Wysoki</string>
+    <string name="sms_storage_pref_title">Pamięć</string>
+    <string name="pref_summary_auto_delete">Jeśli limit zostanie osiągnięty, usuń stare wiadomości</string>
+    <string name="auto_delete_pref_title">Usuń stare wiadomości</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> wiadomości na konwersację</string>
+    <string name="sms_delete_pref_title">Limit wiadomości tekstowych</string>
+    <string name="mms_delete_pref_title">Limit wiadomości multimedialnych</string>
+    <string name="set">Ustaw</string>
+    <string name="no">Anuluj</string>
+    <string name="pref_messages_to_save">Wybierz liczbę wiadomości do zapisania</string>
+    <string name="swipe_to_delete_conversation_pref_title">Przesuń, aby usunąć</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Przesuń w prawo, aby usunąć konwersację</string>
+    <string name="pref_quickmessage">Szybka wiadomość i Odpowiedź</string>
+    <string name="pref_quickmessage_title">Włącz szybkie wiadomości</string>
+    <string name="pref_quickmessage_summary">Automatycznie otwórz wyskakujące okno Szybkiej odpowiedzi dla przychodzącej wiadomości SMS</string>
+    <string name="pref_close_all_title">Zamknij wszystkie</string>
+    <string name="pref_close_all_summary">Przycisk „Zamknij” zamyka wszystkie wiadomości</string>
+    <string name="message_counter">%1$d z %2$d</string>
+    <string name="button_close">Zamknij</string>
+    <string name="button_view">Zobacz</string>
+    <string name="button_templates">Szablony</string>
+    <string name="qm_button_full_conversation">Pełna konwersacja</string>
+    <string name="type_to_reply_text_enter_to_send">Wpisz wiadomość</string>
+    <string name="toast_sending_message">Wysyłanie wiadomości\u2026</string>
+    <string name="qm_quick_reply">Szybka odpowiedź</string>
+    <string name="send">Wyślij</string>
+    <string name="compose_message_hint_text">Wpisz wiadomość</string>
+    <string name="show_emoticons_pref_title">Dostęp do emotikon</string>
+    <string name="show_emoticons_pref_summary">Pokaż klawisz emotikon na klawiaturze</string>
+    <string name="select_phone_account_title">Wyślij z</string>
+    <string name="pref_title_manage_sim_messages">Zarządzanie wiadomościami karty SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Zarządzanie wiadomościami SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Zarządzanie wiadomościami SIM 2</string>
+    <string name="copy_to_sim">Kopiuj wiadomość na kartę SIM</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> z <xliff:g id="total">%2$d</xliff:g> wiadomości zapisano na karcie SIM.</string>
+    <string name="copy_to_sim_fail">Nie można zapisać wiadomości</string>
+    <string name="copy_to_phone_success">Wiadomość zapisana</string>
+    <string name="copy_to_phone_fail">Nie można zapisać wiadomości</string>
+    <string name="sim_empty">Brak wiadomości na karcie SIM.</string>
+    <string name="menu_send_email">Wyślij e-mail do <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Zadzwoń do <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Dodaj <xliff:g id="contactEmailOrNumber">%s</xliff:g> do Osób</string>
+    <string name="sim_capacity_title">Pojemność SIM</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> z <xliff:g id="total">%2$d</xliff:g> miejsc na karcie SIM jest używane</string>
+    <string name="confirm_dialog_title">Usunąć?</string>
+    <string name="sim_manage_messages_title">Wiadomości tekstowe na karcie SIM</string>
+    <string name="refreshing">Odświeżanie\u2026</string>
+    <string name="confirm_delete_selected_messages">Wybrana wiadomość zostanie usunięta.</string>
+    <string name="delete">Usuń</string>
+    <string name="menu_forward">Dalej</string>
+    <string name="menu_reply">Odpowiedz</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Kopiuj do pamięci tableta</string>
+    <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>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Kopiuj wiadomość na kartę SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Wybierz zdjęcia lub wideo z tego urządzenia</string>
+    <string name="mediapicker_audioListChooserDescription">Wybierz pliki dźwiękowe z tego urządzenia</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Nie można dołączyć wideo. Maksymalny rozmiar wiadomości został przekroczony.</string>
+    <string name="mediapicker_audio_list_title">Wybierz muzykę</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Plik audio został wybrany.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Plik audio nie został wybrany.</string>
+    <string name="mediapicker_audio_list_title_selection">Wybrano: <xliff:g id="count">%d</xliff:g></string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 98f8078..6a8ea57 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Reportar como spam para %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Retirar unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Manter caracteres intactos</string>
-  <string name="pref_unicode_stripping_non_encodable">Retirar caracteres não codificáveis</string>
-  <string name="pref_unicode_stripping_all">Retirar todos os caracteres unicode</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Período de validade</string>
-  <string name="validity_period_slot1_pref_title">Período de validade para o SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Período de validade para o SIM 2</string>
-  <string name="sms_validity_period_not_set">Não definido</string>
-  <string name="sms_validity_period_one_hour">1 hora</string>
-  <string name="sms_validity_period_six_hours">6 horas</string>
-  <string name="sms_validity_period_twelve_hours">12 horas</string>
-  <string name="sms_validity_period_one_day">1 dia</string>
-  <string name="mms_validity_period_two_days">2 dias</string>
-  <string name="mms_validity_period_one_week">1 semana</string>
-  <string name="validity_period_maximum">Máximo</string>
-  <string name="pref_summary_mms_delivery_reports">Pedir um aviso de entrega para cada mensagem enviada</string>
-  <string name="pref_summary_mms_read_reports">Pedir um aviso de leitura para cada mensagem enviada</string>
-  <string name="delivery_reports_mms_pref_title">Relatórios de entrega</string>
-  <string name="read_reports_mms_pref_title">Relatórios de leitura</string>
-  <string name="status_label">Estado:\u0020</string>
-  <string name="status_read">Lida</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Prioridade de envio</string>
-  <string name="priority_low">Baixa</string>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">Alta</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Armazenamento</string>
-  <string name="pref_summary_auto_delete">Excluir mensagens antigas quando o limite for atingido</string>
-  <string name="auto_delete_pref_title">Excluir mensagens antigas</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mensagens por conversação</string>
-  <string name="sms_delete_pref_title">Limite de mensagem de texto</string>
-  <string name="mms_delete_pref_title">Limite de mensagem multimídia</string>
-  <string name="set">Definir</string>
-  <string name="no">Cancelar</string>
-  <string name="pref_messages_to_save">Definir o número de mensagens para salvar</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Deslize para excluir</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Deslize para a direita para excluir uma mensagem</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Mensagem Rápida e Resposta</string>
-  <string name="pref_quickmessage_title">Mostrar Mensagem Rápida</string>
-  <string name="pref_quickmessage_summary">Abrir automaticamente o pop-up de Mensagem Rápida para SMS recebidas</string>
-  <string name="pref_close_all_title">Fechar tudo</string>
-  <string name="pref_close_all_summary">O botão \'fechar\' fecha todas as mensagens</string>
-  <string name="message_counter">%1$d de %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Fechar</string>
-  <string name="button_view">Ver</string>
-  <string name="button_templates">Modelos</string>
-  <string name="qm_button_full_conversation">Conversa completa</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Digite para responder</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Enviando mensagem\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Resposta rápida</string>
-  <string name="send">Enviar</string>
-  <string name="compose_message_hint_text">Digite a mensagem</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Acesso a emoticons</string>
-  <string name="show_emoticons_pref_summary">Mostrar o botão de emoticons no teclado</string>
-  <string name="select_phone_account_title">Enviar com</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Gerenciar mensagens do cartão SIM</string>
-  <string name="pref_title_manage_sim_messages_slot1">Gerenciar mensagens do SIM 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Gerenciar mensagens do SIM 2</string>
-  <string name="copy_to_sim">Copiar mensagem para o cartão SIM</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d </xliff:g> de <xliff:g id="total">%2$d </xliff:g> mensagens salvas no cartão SIM.</string>
-  <string name="copy_to_sim_fail">Não é possível salvar a mensagem</string>
-  <string name="copy_to_phone_success">Mensagem salva</string>
-  <string name="copy_to_phone_fail">Não é possível salvar a mensagem</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">Não há mensagens no cartão SIM.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Enviar e-mail para <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">Chamar <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">Adicionar <xliff:g id="contactEmailOrNumber">%s </xliff:g> para as pessoas</string>
-  <string name="sim_capacity_title">Capacidade do SIM</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d </xliff:g> de <xliff:g id="total">%2$d </xliff:g> entradas de cartão SIM são utilizadas</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Apagar?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Mensagens de texto no cartão SIM</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Atualizando</string>
-  <string name="confirm_delete_selected_messages">A mensagem selecionada será excluída.</string>
-  <!-- Delete button title -->
-  <string name="delete">Apagar</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Avançar</string>
-  <string name="menu_reply">Responder</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Copiar para a memória do 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">Copiar para a memória do telefone</string>
-  <string name="selected_all">Selecionar tudo</string>
-  <string name="deselected_all">Desmarcar tudo</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> selecionados</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">Copiar mensagem para o cartão 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">Escolher imagens ou vídeos neste dispositivo</string>
-  <string name="mediapicker_audioListChooserDescription">Escolher arquivos de áudio neste dispositivo</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Não é possível anexar o vídeo. Tamanho máximo de mensagem excedido.</string>
-  <string name="mediapicker_audio_list_title">Selecionar áudio</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">O áudio está selecionado.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">O áudio está desselecionado.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selecionado(s)</string>
+    <string name="report_as_spam_to">Reportar como spam para %s</string>
+    <string name="unicode_stripping_pref_title">Retirar unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Manter caracteres intactos</string>
+    <string name="pref_unicode_stripping_non_encodable">Retirar caracteres não codificáveis</string>
+    <string name="pref_unicode_stripping_all">Retirar todos os caracteres unicode</string>
+    <string name="validity_period_pref_title">Período de validade</string>
+    <string name="validity_period_slot1_pref_title">Período de validade para o SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Período de validade para o SIM 2</string>
+    <string name="sms_validity_period_not_set">Não definido</string>
+    <string name="sms_validity_period_one_hour">1 hora</string>
+    <string name="sms_validity_period_six_hours">6 horas</string>
+    <string name="sms_validity_period_twelve_hours">12 horas</string>
+    <string name="sms_validity_period_one_day">1 dia</string>
+    <string name="mms_validity_period_two_days">2 dias</string>
+    <string name="mms_validity_period_one_week">1 semana</string>
+    <string name="validity_period_maximum">Máximo</string>
+    <string name="pref_summary_mms_delivery_reports">Pedir um aviso de entrega para cada mensagem enviada</string>
+    <string name="pref_summary_mms_read_reports">Pedir um aviso de leitura para cada mensagem enviada</string>
+    <string name="delivery_reports_mms_pref_title">Relatórios de entrega</string>
+    <string name="read_reports_mms_pref_title">Relatórios de leitura</string>
+    <string name="status_label">Estado:\u0020</string>
+    <string name="status_read">Lida</string>
+    <string name="priority_pref_title">Prioridade de envio</string>
+    <string name="priority_low">Baixa</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">Alta</string>
+    <string name="sms_storage_pref_title">Armazenamento</string>
+    <string name="pref_summary_auto_delete">Excluir mensagens antigas quando o limite for atingido</string>
+    <string name="auto_delete_pref_title">Excluir mensagens antigas</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mensagens por conversação</string>
+    <string name="sms_delete_pref_title">Limite de mensagem de texto</string>
+    <string name="mms_delete_pref_title">Limite de mensagem multimídia</string>
+    <string name="set">Definir</string>
+    <string name="no">Cancelar</string>
+    <string name="pref_messages_to_save">Definir o número de mensagens para salvar</string>
+    <string name="swipe_to_delete_conversation_pref_title">Deslize para excluir</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Deslize para a direita para excluir uma mensagem</string>
+    <string name="pref_quickmessage">Mensagem Rápida e Resposta</string>
+    <string name="pref_quickmessage_title">Mostrar Mensagem Rápida</string>
+    <string name="pref_quickmessage_summary">Abrir automaticamente o pop-up de Mensagem Rápida para SMS recebidas</string>
+    <string name="pref_close_all_title">Fechar tudo</string>
+    <string name="pref_close_all_summary">O botão \'fechar\' fecha todas as mensagens</string>
+    <string name="message_counter">%1$d de %2$d</string>
+    <string name="button_close">Fechar</string>
+    <string name="button_view">Ver</string>
+    <string name="button_templates">Modelos</string>
+    <string name="qm_button_full_conversation">Conversa completa</string>
+    <string name="type_to_reply_text_enter_to_send">Digite para responder</string>
+    <string name="toast_sending_message">Enviando mensagem\u2026</string>
+    <string name="qm_quick_reply">Resposta rápida</string>
+    <string name="send">Enviar</string>
+    <string name="compose_message_hint_text">Digite a mensagem</string>
+    <string name="show_emoticons_pref_title">Acesso a emoticons</string>
+    <string name="show_emoticons_pref_summary">Mostrar o botão de emoticons no teclado</string>
+    <string name="select_phone_account_title">Enviar com</string>
+    <string name="pref_title_manage_sim_messages">Gerenciar mensagens do cartão SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Gerenciar mensagens do SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Gerenciar mensagens do SIM 2</string>
+    <string name="copy_to_sim">Copiar mensagem para o cartão SIM</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d </xliff:g> de <xliff:g id="total">%2$d </xliff:g> mensagens salvas no cartão SIM.</string>
+    <string name="copy_to_sim_fail">Não é possível salvar a mensagem</string>
+    <string name="copy_to_phone_success">Mensagem salva</string>
+    <string name="copy_to_phone_fail">Não é possível salvar a mensagem</string>
+    <string name="sim_empty">Não há mensagens no cartão SIM.</string>
+    <string name="menu_send_email">Enviar e-mail para <xliff:g id="name">%s </xliff:g></string>
+    <string name="menu_call_back">Chamar <xliff:g id="name">%s </xliff:g></string>
+    <string name="menu_add_address_to_contacts">Adicionar <xliff:g id="contactEmailOrNumber">%s </xliff:g> para as pessoas</string>
+    <string name="sim_capacity_title">Capacidade do SIM</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d </xliff:g> de <xliff:g id="total">%2$d </xliff:g> entradas de cartão SIM são utilizadas</string>
+    <string name="confirm_dialog_title">Apagar?</string>
+    <string name="sim_manage_messages_title">Mensagens de texto no cartão SIM</string>
+    <string name="refreshing">Atualizando</string>
+    <string name="confirm_delete_selected_messages">A mensagem selecionada será excluída.</string>
+    <string name="delete">Apagar</string>
+    <string name="menu_forward">Avançar</string>
+    <string name="menu_reply">Responder</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Copiar para a memória do tablet</string>
+    <string name="sim_copy_to_phone_memory" product="default">Copiar para a memória do telefone</string>
+    <string name="selected_all">Selecionar tudo</string>
+    <string name="deselected_all">Desmarcar tudo</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> selecionados</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Copiar mensagem para o cartão SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Escolher imagens ou vídeos neste dispositivo</string>
+    <string name="mediapicker_audioListChooserDescription">Escolher arquivos de áudio neste dispositivo</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Não é possível anexar o vídeo. Tamanho máximo de mensagem excedido.</string>
+    <string name="mediapicker_audio_list_title">Selecionar áudio</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">O áudio está selecionado.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">O áudio está desselecionado.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selecionado(s)</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 8417b95..d3d9803 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Reportar como spam para %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Retirar unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Manter caracteres intactos</string>
-  <string name="pref_unicode_stripping_non_encodable">Retirar caracteres não codificáveis</string>
-  <string name="pref_unicode_stripping_all">Retirar todos os caracteres unicode</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Período de validade</string>
-  <string name="validity_period_slot1_pref_title">Período de validade para o cartão SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Período de validade para o cartão SIM 2</string>
-  <string name="sms_validity_period_not_set">Não definido</string>
-  <string name="sms_validity_period_one_hour">1 hora</string>
-  <string name="sms_validity_period_six_hours">6 horas</string>
-  <string name="sms_validity_period_twelve_hours">12 horas</string>
-  <string name="sms_validity_period_one_day">1 dia</string>
-  <string name="mms_validity_period_two_days">2 dias</string>
-  <string name="mms_validity_period_one_week">1 semana</string>
-  <string name="validity_period_maximum">Máximo</string>
-  <string name="pref_summary_mms_delivery_reports">Pedir um aviso de entrega para cada MMS enviado</string>
-  <string name="pref_summary_mms_read_reports">Pedir um aviso de entrega para cada MMS enviado</string>
-  <string name="delivery_reports_mms_pref_title">Avisos de entrega de MMS</string>
-  <string name="read_reports_mms_pref_title">Relatórios de leitura MMS</string>
-  <string name="status_label">Estado:\u0020</string>
-  <string name="status_read">Lida</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Prioridade de envio</string>
-  <string name="priority_low">Baixa</string>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">Elevada</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Armazenamento</string>
-  <string name="pref_summary_auto_delete">Apagar mensagens antigas quando os limites forem atingidos</string>
-  <string name="auto_delete_pref_title">Apagar mensagens antigas</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mensagens por conversa</string>
-  <string name="sms_delete_pref_title">Limite de mensagens SMS</string>
-  <string name="mms_delete_pref_title">Limite de mensagens MMS</string>
-  <string name="set">Definir</string>
-  <string name="no">Cancelar</string>
-  <string name="pref_messages_to_save">Definir o número de mensagens a guardar</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Deslize para apagar</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Deslize para a direita para apagar uma conversa</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Mensagem e resposta rápidas</string>
-  <string name="pref_quickmessage_title">Mostrar mensagem rápida</string>
-  <string name="pref_quickmessage_summary">Abrir automaticamente o pop-up de mensagem rápida para mensagens SMS recebidas</string>
-  <string name="pref_close_all_title">Fechar todas</string>
-  <string name="pref_close_all_summary">O botão \'Fechar\' fecha todas as mensagens</string>
-  <string name="message_counter">%1$d de %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Fechar</string>
-  <string name="button_view">Ver</string>
-  <string name="button_templates">Modelos</string>
-  <string name="qm_button_full_conversation">Conversa completa</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Escreva para responder</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">A enviar mensagem\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Resposta rápida</string>
-  <string name="send">Enviar</string>
-  <string name="compose_message_hint_text">Escreva a mensagem</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Acesso a emojis</string>
-  <string name="show_emoticons_pref_summary">Mostrar a tecla dos emojis no teclado</string>
-  <string name="select_phone_account_title">Enviar com</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Gerir as mensagens do cartão SIM</string>
-  <string name="pref_title_manage_sim_messages_slot1">Gerir as mensagens do cartão SIM 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Gerir as mensagens do cartão SIM 2</string>
-  <string name="copy_to_sim">Copiar a mensagem para o cartão SIM</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> mensagens guardadas no cartão SIM.</string>
-  <string name="copy_to_sim_fail">Não foi possível guardar a mensagem</string>
-  <string name="copy_to_phone_success">Mensagem guardada</string>
-  <string name="copy_to_phone_fail">Não foi possível guardar a mensagem</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">Sem mensagens no cartão SIM.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Enviar e-mail para <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">Ligar para <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">Adicionar <xliff:g id="contactEmailOrNumber">%s</xliff:g> aos Contactos</string>
-  <string name="sim_capacity_title">Capacidade do cartão SIM</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> registos do cartão SIM a serem utilizados</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Apagar?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Mensagens SMS no cartão SIM</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">A atualizar\u2026</string>
-  <string name="confirm_delete_selected_messages">A mensagem selecionada será apagada.</string>
-  <!-- Delete button title -->
-  <string name="delete">Apagar</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Avançar</string>
-  <string name="menu_reply">Responder</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Copiar para a memória do 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">Copiar para a memória do telefone</string>
-  <string name="selected_all">Selecionar todas</string>
-  <string name="deselected_all">Desmarcar todas</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> selecionada(s)</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">Copiar a mensagem para o cartão SIM</string>
-  <string name="slot1">Cartão SIM 1</string>
-  <string name="slot2">Cartão SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Escolher imagens ou vídeos a partir deste dispositivo</string>
-  <string name="mediapicker_audioListChooserDescription">Escolher ficheiros de áudio a partir deste dispositivo</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Não é possível anexar o vídeo. O tamanho máximo da mensagem foi excedido.</string>
-  <string name="mediapicker_audio_list_title">Selecionar áudio</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">O áudio está selecionado.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">O áudio não está selecionado.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selecionado(s)</string>
+    <string name="report_as_spam_to">Reportar como spam para %s</string>
+    <string name="unicode_stripping_pref_title">Retirar unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Manter caracteres intactos</string>
+    <string name="pref_unicode_stripping_non_encodable">Retirar caracteres não codificáveis</string>
+    <string name="pref_unicode_stripping_all">Retirar todos os caracteres unicode</string>
+    <string name="validity_period_pref_title">Período de validade</string>
+    <string name="validity_period_slot1_pref_title">Período de validade para o cartão SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Período de validade para o cartão SIM 2</string>
+    <string name="sms_validity_period_not_set">Não definido</string>
+    <string name="sms_validity_period_one_hour">1 hora</string>
+    <string name="sms_validity_period_six_hours">6 horas</string>
+    <string name="sms_validity_period_twelve_hours">12 horas</string>
+    <string name="sms_validity_period_one_day">1 dia</string>
+    <string name="mms_validity_period_two_days">2 dias</string>
+    <string name="mms_validity_period_one_week">1 semana</string>
+    <string name="validity_period_maximum">Máximo</string>
+    <string name="pref_summary_mms_delivery_reports">Pedir um aviso de entrega para cada MMS enviado</string>
+    <string name="pref_summary_mms_read_reports">Pedir um aviso de entrega para cada MMS enviado</string>
+    <string name="delivery_reports_mms_pref_title">Avisos de entrega de MMS</string>
+    <string name="read_reports_mms_pref_title">Relatórios de leitura MMS</string>
+    <string name="status_label">Estado:\u0020</string>
+    <string name="status_read">Lida</string>
+    <string name="priority_pref_title">Prioridade de envio</string>
+    <string name="priority_low">Baixa</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">Elevada</string>
+    <string name="sms_storage_pref_title">Armazenamento</string>
+    <string name="pref_summary_auto_delete">Apagar mensagens antigas quando os limites forem atingidos</string>
+    <string name="auto_delete_pref_title">Apagar mensagens antigas</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mensagens por conversa</string>
+    <string name="sms_delete_pref_title">Limite de mensagens SMS</string>
+    <string name="mms_delete_pref_title">Limite de mensagens MMS</string>
+    <string name="set">Definir</string>
+    <string name="no">Cancelar</string>
+    <string name="pref_messages_to_save">Definir o número de mensagens a guardar</string>
+    <string name="swipe_to_delete_conversation_pref_title">Deslize para apagar</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Deslize para a direita para apagar uma conversa</string>
+    <string name="pref_quickmessage">Mensagem e resposta rápidas</string>
+    <string name="pref_quickmessage_title">Mostrar mensagem rápida</string>
+    <string name="pref_quickmessage_summary">Abrir automaticamente o pop-up de mensagem rápida para mensagens SMS recebidas</string>
+    <string name="pref_close_all_title">Fechar todas</string>
+    <string name="pref_close_all_summary">O botão \'Fechar\' fecha todas as mensagens</string>
+    <string name="message_counter">%1$d de %2$d</string>
+    <string name="button_close">Fechar</string>
+    <string name="button_view">Ver</string>
+    <string name="button_templates">Modelos</string>
+    <string name="qm_button_full_conversation">Conversa completa</string>
+    <string name="type_to_reply_text_enter_to_send">Escreva para responder</string>
+    <string name="toast_sending_message">A enviar mensagem\u2026</string>
+    <string name="qm_quick_reply">Resposta rápida</string>
+    <string name="send">Enviar</string>
+    <string name="compose_message_hint_text">Escreva a mensagem</string>
+    <string name="show_emoticons_pref_title">Acesso a emojis</string>
+    <string name="show_emoticons_pref_summary">Mostrar a tecla dos emojis no teclado</string>
+    <string name="select_phone_account_title">Enviar com</string>
+    <string name="pref_title_manage_sim_messages">Gerir as mensagens do cartão SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Gerir as mensagens do cartão SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Gerir as mensagens do cartão SIM 2</string>
+    <string name="copy_to_sim">Copiar a mensagem para o cartão SIM</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> mensagens guardadas no cartão SIM.</string>
+    <string name="copy_to_sim_fail">Não foi possível guardar a mensagem</string>
+    <string name="copy_to_phone_success">Mensagem guardada</string>
+    <string name="copy_to_phone_fail">Não foi possível guardar a mensagem</string>
+    <string name="sim_empty">Sem mensagens no cartão SIM.</string>
+    <string name="menu_send_email">Enviar e-mail para <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Ligar para <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Adicionar <xliff:g id="contactEmailOrNumber">%s</xliff:g> aos Contactos</string>
+    <string name="sim_capacity_title">Capacidade do cartão SIM</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> de <xliff:g id="total">%2$d</xliff:g> registos do cartão SIM a serem utilizados</string>
+    <string name="confirm_dialog_title">Apagar?</string>
+    <string name="sim_manage_messages_title">Mensagens SMS no cartão SIM</string>
+    <string name="refreshing">A atualizar\u2026</string>
+    <string name="confirm_delete_selected_messages">A mensagem selecionada será apagada.</string>
+    <string name="delete">Apagar</string>
+    <string name="menu_forward">Avançar</string>
+    <string name="menu_reply">Responder</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Copiar para a memória do tablet</string>
+    <string name="sim_copy_to_phone_memory" product="default">Copiar para a memória do telefone</string>
+    <string name="selected_all">Selecionar todas</string>
+    <string name="deselected_all">Desmarcar todas</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> selecionada(s)</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Copiar a mensagem para o cartão SIM</string>
+    <string name="slot1">Cartão SIM 1</string>
+    <string name="slot2">Cartão SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Escolher imagens ou vídeos a partir deste dispositivo</string>
+    <string name="mediapicker_audioListChooserDescription">Escolher ficheiros de áudio a partir deste dispositivo</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Não é possível anexar o vídeo. O tamanho máximo da mensagem foi excedido.</string>
+    <string name="mediapicker_audio_list_title">Selecionar áudio</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">O áudio está selecionado.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">O áudio não está selecionado.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selecionado(s)</string>
 </resources>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-rm/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 90fa5db..4d29840 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Raportează ca spam la %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Elimină unicod</string>
-  <string name="pref_unicode_stripping_leave_intact">Lasă caracterele intacte</string>
-  <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>
-  <string name="pref_quickmessage_title">Afișare Mesaj Rapid</string>
-  <string name="pref_quickmessage_summary">Deschide automat MesajRapid pentru mesajele SMS</string>
-  <string name="pref_close_all_title">Închideți toate</string>
-  <string name="pref_close_all_summary">Butonul Închidere închide toate mesajele</string>
-  <string name="message_counter">%1$d din %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Închide</string>
-  <string name="button_view">Vizualizați</string>
-  <string name="button_templates">Șabloane</string>
-  <string name="qm_button_full_conversation">Toată conversația</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Tastați pentru a răspunde</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Se trimite mesajul\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Răspuns rapid</string>
-  <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>
+    <string name="report_as_spam_to">Raportează ca spam la %s</string>
+    <string name="unicode_stripping_pref_title">Elimină unicod</string>
+    <string name="pref_unicode_stripping_leave_intact">Lasă caracterele intacte</string>
+    <string name="pref_unicode_stripping_non_encodable">Elimină caracterele ne-codificabile</string>
+    <string name="pref_unicode_stripping_all">Elimină toate caracterele unicod</string>
+    <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>
+    <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>
+    <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>
+    <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>
+    <string name="pref_quickmessage">Mesaj Rapid și Răspuns</string>
+    <string name="pref_quickmessage_title">Afișare Mesaj Rapid</string>
+    <string name="pref_quickmessage_summary">Deschide automat MesajRapid pentru mesajele SMS</string>
+    <string name="pref_close_all_title">Închideți toate</string>
+    <string name="pref_close_all_summary">Butonul Închidere închide toate mesajele</string>
+    <string name="message_counter">%1$d din %2$d</string>
+    <string name="button_close">Închide</string>
+    <string name="button_view">Vizualizați</string>
+    <string name="button_templates">Șabloane</string>
+    <string name="qm_button_full_conversation">Toată conversația</string>
+    <string name="type_to_reply_text_enter_to_send">Tastați pentru a răspunde</string>
+    <string name="toast_sending_message">Se trimite mesajul\u2026</string>
+    <string name="qm_quick_reply">Răspuns rapid</string>
+    <string name="send">Trimite</string>
+    <string name="compose_message_hint_text">Introduceți mesajul</string>
+    <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>
+    <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>
+    <string name="sim_empty">Nu există mesaje pe cartela SIM.</string>
+    <string name="menu_send_email">Trimiteți e-mail către <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Apelați <xliff:g id="name">%s</xliff:g></string>
+    <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>
+    <string name="confirm_dialog_title">Ștergeți?</string>
+    <string name="sim_manage_messages_title">Mesaje text pe cartela SIM</string>
+    <string name="refreshing">Actualizare\u2026</string>
+    <string name="confirm_delete_selected_messages">Mesajul selectat va fi şters.</string>
+    <string name="delete">Ștergeți</string>
+    <string name="menu_forward">Redirecţionaţi</string>
+    <string name="menu_reply">Răspundeți</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Copiați în memoria tabletei</string>
+    <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>
+    <string name="yes">OK</string>
+    <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>
+    <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>
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 4705fa3..f4f4b68 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -16,127 +16,96 @@
     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">Заменять юникод</string>
-  <string name="pref_unicode_stripping_leave_intact">Не заменять символы юникода</string>
-  <string name="pref_unicode_stripping_non_encodable">Заменять некодируемые символы</string>
-  <string name="pref_unicode_stripping_all">Заменять все символы юникода</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">Ограничение SMS-сообщений</string>
-  <string name="mms_delete_pref_title">Ограничение MMS-сообщений</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_close_all_title">Закрывать всё</string>
-  <string name="pref_close_all_summary">Кнопка «Закрыть» закрывает все сообщения</string>
-  <string name="message_counter">%1$d из %2$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="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>
-  <!-- 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="name">%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">Используется <xliff:g id="used">%1$d</xliff:g> из <xliff:g id="total">%2$d</xliff:g> возможных записей на SIM-карте</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">OK</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>
+    <string name="report_as_spam_to">Сообщить о спаме в %s</string>
+    <string name="unicode_stripping_pref_title">Заменять юникод</string>
+    <string name="pref_unicode_stripping_leave_intact">Не заменять символы юникода</string>
+    <string name="pref_unicode_stripping_non_encodable">Заменять некодируемые символы</string>
+    <string name="pref_unicode_stripping_all">Заменять все символы юникода</string>
+    <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>
+    <string name="priority_pref_title">Приоритет отправки</string>
+    <string name="priority_low">Низкий</string>
+    <string name="priority_normal">Обычный</string>
+    <string name="priority_high">Высокий</string>
+    <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">Ограничение SMS-сообщений</string>
+    <string name="mms_delete_pref_title">Ограничение MMS-сообщений</string>
+    <string name="set">Установить</string>
+    <string name="no">Отмена</string>
+    <string name="pref_messages_to_save">Количество сообщений для сохранения</string>
+    <string name="swipe_to_delete_conversation_pref_title">Свайп для удаления</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Свайп вправо для удаления разговора</string>
+    <string name="pref_quickmessage">Всплывающие уведомления</string>
+    <string name="pref_quickmessage_title">Быстрый ответ</string>
+    <string name="pref_quickmessage_summary">Автоматически открывать окно быстрого ответа для новых сообщений</string>
+    <string name="pref_close_all_title">Закрывать все</string>
+    <string name="pref_close_all_summary">Кнопка «Закрыть» закрывает все сообщения</string>
+    <string name="message_counter">%1$d из %2$d</string>
+    <string name="button_close">Закрыть</string>
+    <string name="button_view">Посмотреть</string>
+    <string name="button_templates">Шаблоны</string>
+    <string name="qm_button_full_conversation">Перейти к диалогу</string>
+    <string name="type_to_reply_text_enter_to_send">Введите текст ответа</string>
+    <string name="toast_sending_message">Отправка сообщения\u2026</string>
+    <string name="qm_quick_reply">Быстрый ответ</string>
+    <string name="send">Отправить</string>
+    <string name="compose_message_hint_text">Введите сообщение</string>
+    <string name="show_emoticons_pref_title">Доступ к смайлам</string>
+    <string name="show_emoticons_pref_summary">Показать кнопку смайлов на клавиатуре</string>
+    <string name="select_phone_account_title">Отправить через</string>
+    <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="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>
+    <string name="sim_empty">Нет сообщений на SIM-карте.</string>
+    <string name="menu_send_email">Отправить эл. сообщение <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Позвонить <xliff:g id="name">%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">Используется <xliff:g id="used">%1$d</xliff:g> из <xliff:g id="total">%2$d</xliff:g> возможных записей на SIM-карте</string>
+    <string name="confirm_dialog_title">Удалить?</string>
+    <string name="sim_manage_messages_title">Текстовые сообщения на SIM-карте</string>
+    <string name="refreshing">Обновление\u2026</string>
+    <string name="confirm_delete_selected_messages">Выбранное сообщение будет удалено.</string>
+    <string name="delete">Удалить</string>
+    <string name="menu_forward">Вперед</string>
+    <string name="menu_reply">Ответить</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Копировать в память планшета</string>
+    <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>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Копировать сообщение на SIM-карту</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <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>
 </resources>
diff --git a/res/values-sc-rIT/arrays.xml b/res/values-sc-rIT/arrays.xml
deleted file mode 100644
index f2be096..0000000
--- a/res/values-sc-rIT/arrays.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String to match as no subject and filter out as a subject. For example, if the
-         subject string is "no subject", we won't display that. We'll pretend
-         no subject string was delivered. -->
-  <!-- Choices for quick-reply to message notification. Users with an Android
-    Wear device (e.g. smartwatch) can reply to messages either by speaking their
-    response, or choosing one of these predefined options. -->
-</resources>
diff --git a/res/values-sc-rIT/cm_strings.xml b/res/values-sc-rIT/cm_strings.xml
index d7cf535..05b082b 100644
--- a/res/values-sc-rIT/cm_strings.xml
+++ b/res/values-sc-rIT/cm_strings.xml
@@ -16,35 +16,20 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="sms_validity_period_one_hour">1 ora</string>
+    <string name="sms_validity_period_six_hours">6 oras</string>
+    <string name="sms_validity_period_twelve_hours">12 oras</string>
+    <string name="sms_validity_period_one_day">1 die</string>
+    <string name="mms_validity_period_two_days">2 dies</string>
+    <string name="mms_validity_period_one_week">1 chida</string>
+    <string name="priority_high">Arta</string>
+    <string name="set">Cunfigura</string>
+    <string name="no">Annulla</string>
+    <string name="message_counter">%1$d de %2$d</string>
+    <string name="button_close">Serra</string>
+    <string name="send">Imbia</string>
+    <string name="delete">Iscantzella</string>
+    <string name="menu_forward">Torra a imbiare</string>
+    <string name="menu_reply">Risponde</string>
+    <string name="yes">AB</string>
 </resources>
diff --git a/res/values-sc-rIT/strings.xml b/res/values-sc-rIT/strings.xml
deleted file mode 100644
index d73a67e..0000000
--- a/res/values-sc-rIT/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- The name of the application as it appears under the main Launcher icon and in various activity titles -->
-  <!-- The name of the application as it appears in external share intent dialogs -->
-  <!-- The title when selecting a conversation to share to -->
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <!-- The tab header for the frequently used contacts list -->
-  <!-- The tab header for all contacts list -->
-  <!-- The text on the list item in the contact picker that allows a user to send an SMS directly
-         to a number that he/she typed. eg. "Send to 650-555-1234" -->
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <!-- Abbreviated message to express that something occurred some number of hours in the past (e.g., 5 hours ago). -->
-  <!-- Abbreviated message to express that something occurred some number of days in the past (e.g., 5 days ago). -->
-  <!--
-        Plurals used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <!-- Title of the class-0 message activity. -->
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <!-- Title for SMS storage low notification and dialog. Must match the framework's notification title, i.e. //frameworks/base/core/res/res/values/strings.xml#low_internal_storage_view_title -->
-  <!-- Text for SMS storage low notification and dialog -->
-  <!-- Ticker for SMS storage low notification -->
-  <!-- Title for asking the user to enter their phone number -->
-  <!-- Text for asking the user to enter their phone number -->
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <!-- Free SMS storage actions -->
-  <!-- Free SMS storage action confirm dialog message -->
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <!-- While sending a message display this message. -->
-  <!-- When sending a message failed display this message. -->
-  <!-- When retrying sending for a message. -->
-  <!-- When showing resend action display this message. -->
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <!-- When showing resend action, display this message. -->
-  <!-- Title line for an MMS requiring manual download. -->
-  <!-- Title line for an MMS auto-downloading. -->
-  <!-- Title line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which is selected. -->
-  <!-- Timestamp line to display while downloading a message. -->
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <!-- Display this info line with an MMS notification -->
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for download failed -->
-  <!-- notification line 1 for multiple downloads failed -->
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <!-- Notification content when emergency SMS fails to send -->
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <!-- Content description text for Back button on the action bar -->
-  <!-- Action menu title for showing archived conversations -->
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <!-- An enumeration comma for separating multiple names in notifications. [CHAR LIMIT=2] -->
-  <!-- Separator between parts of a notification in each line of an inboxStyle notification. [CHAR LIMIT=2] -->
-  <!-- Separator between title and content in notification ticker -->
-  <!-- Separator between title and content in notifications -->
-  <!-- Shown in notifications when there's a picture. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <!-- Shown in the Android Wear conversation log as the sender for outgoing messages,
-         when we don't know the user's real name (e.g. no "Me" contact on the phone). -->
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <!-- Accessibility announcement for an incoming message -->
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <!-- Accessibility description for conversation list for group conversations -->
-  <!-- Accessibility description for conversation list for failed messages -->
-  <!-- Accessibility name for a group conversation -->
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <!-- Title for the preferences/settings activity -->
-  <!-- Title for the archived conversations activity -->
-  <!-- Action title: Close -->
-  <!-- Preference category: MMS messaging -->
-  <!-- Preference category: Advanced -->
-  <!-- Preference category: Debug -->
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <!-- Title for the notification sound preference -->
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <!-- Preference summary: Current default SMS app -->
-  <!-- Preference title: MMS phone number -->
-  <!-- Display text for phone number preference when the number is unknown -->
-  <!-- Title for the preference for playing a message send sound -->
-  <!-- Strings for dump sms/mms dialog -->
-  <!-- Title of long press menu on an individual message. -->
-  <!-- Menu item to copy message text -->
-  <!-- Title of long press menu for details about an individual message. -->
-  <!-- Title of long press menu for deleting an individual message. -->
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <!-- Title of "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <!-- Sender to be used if the sender address has been hidden -->
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <!-- Notifies the user when an attachment fails to load -->
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <!-- Title for the "People and Options" activity -->
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <!-- Title for the phone call button in the action bar that lets the user call a participant in an SMS conversation -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <!-- The hint text shown in the message compose input box when photo(s) is attached -->
-  <!-- The hint text shown in the message compose input box when audio recording(s) is attached -->
-  <!-- The hint text shown in the message compose input box when video(s) is attached -->
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <!-- Announcement after the user adds or removes an attachment -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <!-- The format of the subtitle of the help activity. -->
-  <!--  Action menu title to let users view open source license -->
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <!-- Reached MMS message attachment limit -->
-  <!-- Message attachment load failed -->
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- When there's a subject in an mms, the subject + message are shown in a notification -->
-  <!-- Text shown on contact VCard when it's being loaded -->
-  <!-- Text shown on contact VCard when it failed to load -->
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <!-- Title for the activity that shows details of VCards -->
-  <!-- VCard label for displaying birthdays -->
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <!-- Title for the message forwarding dialog -->
-  <!-- Title for the message reply dialog -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <!-- Dialog button text that closes the application. -->
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <!-- A message in conversation list view to indicate that the snipit text and preview is from an unsent draft. -->
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <!-- Indicates that the current message will be sent via MMS -->
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <!-- Title of block confirmation dialog -->
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <!-- The title of the list of blocked contacts -->
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <!-- Accessibility toast shown when a message is sending. -->
-  <!-- Accessibility toast shown when a message is sent. -->
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <!-- Accessibility : content description for numbers -->
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <!-- Text prepended to the subject of a forwarded message -->
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <!-- The notification toast text and action button label shown at bottom of screen, for when a new message comes in while the user
-         is in that conversation, but the message list is not scrolled to the bottom -->
-  <!-- Content description for the message images in a conversation or for the image preview in the conversation list if the lastest message in that conversation contains an image-->
-  <!-- Text for a toast message notifying the user that we can't find an appropriate application to handle their request -->
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Screen title after user selects APNs setting option -->
-  <!-- Edit access point label summary text when no value has been set -->
-  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
-  <!-- Edit access point labels: The actual access point name-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The type of APN -->
-  <!-- Edit access point screen menu option to delete this APN -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <!-- APNs screen menu option to reset default APN settings -->
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <!-- Title for Access Point Names settings -->
-  <!-- Title for Access Point Names settings activity -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <!-- The title for general settings section in the settings activity  -->
-  <!-- The title for advanced settings section in the settings activity  -->
-  <!-- The title for general settings activity  -->
-  <!-- The title for advanced settings activity  -->
-  <!-- The title for sim_specific settings  -->
-  <!-- The group MMS choices in settings -->
-  <!-- SIM number shown in the settings when the number is not known -->
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <!-- Content description for the SIM selector button in the conversation -->
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <!-- Content description for the audio record view -->
-  <!-- Content description for new conversation button in desktop widget -->
-  <!-- Content description for widget title -->
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <!-- Content description for new message button in desktop widget -->
-  <!-- Content description for conversation list button in desktop widget -->
-  <!-- Shown when loading conversations in the widget -->
-  <!-- Shown when loading messages in the widget -->
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <!-- Toast message telling the user that someone was blocked -->
-  <!-- Toast message telling the user that someone was unblocked -->
-  <!-- Title for attachment chooser activity -->
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message load failed -->
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <!-- When converting html to text link urls are inlined.  This specifies how the link should be
-    displayed.  For example, a link "click here" which navigates to "www.google.com" would have
-    text="click here" and url="www.google.com", using the below format to create "click here (www.google.com)" -->
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
-</resources>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 64d278a..fe9e509 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -16,41 +16,10 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_close_all_title">සියල්ල වහන්න</string>
-  <string name="pref_close_all_summary">වහන්න බොත්තම සියලුම පණිවිඩ වසා දමයි</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">වහන්න</string>
-  <string name="button_view">පෙන්වන්න</string>
-  <string name="button_templates">අච්චු</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">පිළිතුරු දීමට ටයිප් කරන්න</string>
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="pref_close_all_title">සියල්ල වහන්න</string>
+    <string name="pref_close_all_summary">වහන්න බොත්තම සියලුම පණිවිඩ වසා දමයි</string>
+    <string name="button_close">වහන්න</string>
+    <string name="button_view">පෙන්වන්න</string>
+    <string name="button_templates">අච්චු</string>
+    <string name="type_to_reply_text_enter_to_send">පිළිතුරු දීමට ටයිප් කරන්න</string>
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 3d507fb..fd6d015 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -16,127 +16,96 @@
     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>
-  <string name="pref_quickmessage_title">Zobraziť rýchlu správu</string>
-  <string name="pref_quickmessage_summary">Zobraziť vyskakovacie okno s rýchlou správou pre prichádzajúce SMS správy</string>
-  <string name="pref_close_all_title">Zavrieť všetky</string>
-  <string name="pref_close_all_summary">Tlačidlo Zatvoriť zatvorí všetky správy</string>
-  <string name="message_counter">%1$d z %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <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>
+    <string name="report_as_spam_to">Nahlásiť ako spam do %s</string>
+    <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>
+    <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>
+    <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>
+    <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>
+    <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>
+    <string name="pref_quickmessage">Rýchla správa a odpoveď</string>
+    <string name="pref_quickmessage_title">Zobraziť rýchlu správu</string>
+    <string name="pref_quickmessage_summary">Zobraziť vyskakovacie okno s rýchlou správou pre prichádzajúce SMS správy</string>
+    <string name="pref_close_all_title">Zavrieť všetky</string>
+    <string name="pref_close_all_summary">Tlačidlo Zatvoriť zatvorí všetky správy</string>
+    <string name="message_counter">%1$d z %2$d</string>
+    <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>
+    <string name="type_to_reply_text_enter_to_send">Zadajte odpoveď</string>
+    <string name="toast_sending_message">Odosielanie správy</string>
+    <string name="qm_quick_reply">Rýchla odpoveď</string>
+    <string name="send">Odoslať</string>
+    <string name="compose_message_hint_text">Zadajte správu</string>
+    <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>
+    <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>
+    <string name="sim_empty">Žiadne správy na SIM karte.</string>
+    <string name="menu_send_email">Poslať e-mail na <xliff:g id="name">%s </xliff:g></string>
+    <string name="menu_call_back">Zavolať <xliff:g id="name">%s</xliff:g></string>
+    <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>
+    <string name="confirm_dialog_title">Vymazať?</string>
+    <string name="sim_manage_messages_title">Textové správy na SIM karte</string>
+    <string name="refreshing">Obnovenie\u2026</string>
+    <string name="confirm_delete_selected_messages">Vybrané správy budú odstránené.</string>
+    <string name="delete">Vymazať</string>
+    <string name="menu_forward">Preposlať</string>
+    <string name="menu_reply">Odpovedať</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Kopírovať do pamäte tabletu</string>
+    <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>
+    <string name="yes">OK</string>
+    <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>
+    <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>
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 17e0207..937646d 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Prijavi kot neželeno na %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Odstrani unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Pusti znake nespremenjene</string>
-  <string name="pref_unicode_stripping_non_encodable">Odstrani nekodirne znake</string>
-  <string name="pref_unicode_stripping_all">Odstrani vse znake unicode</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Obdobje veljavnosti</string>
-  <string name="validity_period_slot1_pref_title">Obdobje veljavnosti za SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Obdobje veljavnosti za SIM 2</string>
-  <string name="sms_validity_period_not_set">Ni nastavljeno</string>
-  <string name="sms_validity_period_one_hour">1 ura</string>
-  <string name="sms_validity_period_six_hours">6 ur</string>
-  <string name="sms_validity_period_twelve_hours">12 ur</string>
-  <string name="sms_validity_period_one_day">1 dan</string>
-  <string name="mms_validity_period_two_days">2 dni</string>
-  <string name="mms_validity_period_one_week">1 teden</string>
-  <string name="validity_period_maximum">Najdaljše</string>
-  <string name="pref_summary_mms_delivery_reports">Zahtevaj potrdilo o dostavi za vsako poslano sporočilo</string>
-  <string name="pref_summary_mms_read_reports">Zahtevaj potrdilo o branju za vsako poslano sporočilo</string>
-  <string name="delivery_reports_mms_pref_title">Potrdila o dostavi</string>
-  <string name="read_reports_mms_pref_title">Potrdila o branju</string>
-  <string name="status_label">Stanje:\u0020</string>
-  <string name="status_read">Prebrano</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Prednost pošiljanja</string>
-  <string name="priority_low">Nizka</string>
-  <string name="priority_normal">Običajna</string>
-  <string name="priority_high">Visoka</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Pomnilniška naprava</string>
-  <string name="pref_summary_auto_delete">Izbriši stara sporočila, ko so dosežene omejitve</string>
-  <string name="auto_delete_pref_title">Izbriši stara sporočila</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> sporočil na pogovor</string>
-  <string name="sms_delete_pref_title">Omejitev SMS-ov</string>
-  <string name="mms_delete_pref_title">Omejitev MMS-ov</string>
-  <string name="set">Nastavi</string>
-  <string name="no">Prekliči</string>
-  <string name="pref_messages_to_save">Nastavi število sporočil za shranjevanje</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Potegnite za brisanje</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Za izbris pogovora potegnite na desno</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Hitro sporočilo in Odgovor</string>
-  <string name="pref_quickmessage_title">Prikaži Hitro sporočilo</string>
-  <string name="pref_quickmessage_summary">Samodejno odpri pojavno okno Hitrega sporočila za dohodna sporočila SMS</string>
-  <string name="pref_close_all_title">Zapri vse</string>
-  <string name="pref_close_all_summary">Gumb Zapri zapre vsa sporočila</string>
-  <string name="message_counter">%1$d od %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Zapri</string>
-  <string name="button_view">Pogled</string>
-  <string name="button_templates">Predloge</string>
-  <string name="qm_button_full_conversation">Celoten pogovor</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Tipkajte za odgovor</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Pošiljanje sporočila \u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Hitri odgovor</string>
-  <string name="send">Pošlji</string>
-  <string name="compose_message_hint_text">Vnesite sporočilo</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Dostop do izraznih ikon</string>
-  <string name="show_emoticons_pref_summary">Na tipkovnici prikaži tipko za izrazne ikone</string>
-  <string name="select_phone_account_title">Pošlji s/z</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Upravljaj sporočila kartice SIM</string>
-  <string name="pref_title_manage_sim_messages_slot1">Upravljaj sporočila kartice SIM 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Upravljaj sporočila kartice SIM 2</string>
-  <string name="copy_to_sim">Kopiraj sporočilo na kartico SIM</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> sporočil shranjenih na kartico SIM.</string>
-  <string name="copy_to_sim_fail">Sporočila ni mogoče shraniti</string>
-  <string name="copy_to_phone_success">Sporočilo shranjeno</string>
-  <string name="copy_to_phone_fail">Sporočila ni mogoče shraniti</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">Na kartici SIM ni sporočil.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Pošlji e-pošto 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">Poklič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">Dodaj <xliff:g id="contactEmailOrNumber">%s</xliff:g> k Ljudem</string>
-  <string name="sim_capacity_title">Zmogljivost kartice SIM</string>
-  <string name="sim_capacity">Uporabljenih <xliff:g id="used">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> vnosov kartice SIM</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Izbriši?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Sporočila na kartici SIM</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Osveževanje \u2026</string>
-  <string name="confirm_delete_selected_messages">Izbrano sporočilo bo izbrisano.</string>
-  <!-- Delete button title -->
-  <string name="delete">Izbriši</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Posreduj</string>
-  <string name="menu_reply">Odgovori</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Kopiraj v pomnilnik tabličnega računalnika</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Kopiraj v pomnilnik telefona</string>
-  <string name="selected_all">Izberi vse</string>
-  <string name="deselected_all">Odstrani vse izbire</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> izbranih</string>
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <string name="yes">V REDU</string>
-  <!-- Copy message to sim -->
-  <string name="operation_to_card_memory">Kopiraj sporočilo na kartico 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">Izberi slike ali videoposnetke iz te naprave</string>
-  <string name="mediapicker_audioListChooserDescription">Izberi zvočne datoteke iz te naprave</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Videoposnetka ni mogoče pripeti. Dosežena največja velikost sporočila.</string>
-  <string name="mediapicker_audio_list_title">Izberite zvok</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Zvok je izbran.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Izbira zvoka je preklicana.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> izbranih</string>
+    <string name="report_as_spam_to">Prijavi kot neželeno na %s</string>
+    <string name="unicode_stripping_pref_title">Odstrani unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Pusti znake nespremenjene</string>
+    <string name="pref_unicode_stripping_non_encodable">Odstrani nekodirne znake</string>
+    <string name="pref_unicode_stripping_all">Odstrani vse znake unicode</string>
+    <string name="validity_period_pref_title">Obdobje veljavnosti</string>
+    <string name="validity_period_slot1_pref_title">Obdobje veljavnosti za SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Obdobje veljavnosti za SIM 2</string>
+    <string name="sms_validity_period_not_set">Ni nastavljeno</string>
+    <string name="sms_validity_period_one_hour">1 ura</string>
+    <string name="sms_validity_period_six_hours">6 ur</string>
+    <string name="sms_validity_period_twelve_hours">12 ur</string>
+    <string name="sms_validity_period_one_day">1 dan</string>
+    <string name="mms_validity_period_two_days">2 dni</string>
+    <string name="mms_validity_period_one_week">1 teden</string>
+    <string name="validity_period_maximum">Najdaljše</string>
+    <string name="pref_summary_mms_delivery_reports">Zahtevaj potrdilo o dostavi za vsako poslano sporočilo</string>
+    <string name="pref_summary_mms_read_reports">Zahtevaj potrdilo o branju za vsako poslano sporočilo</string>
+    <string name="delivery_reports_mms_pref_title">Potrdila o dostavi</string>
+    <string name="read_reports_mms_pref_title">Potrdila o branju</string>
+    <string name="status_label">Stanje:\u0020</string>
+    <string name="status_read">Prebrano</string>
+    <string name="priority_pref_title">Prednost pošiljanja</string>
+    <string name="priority_low">Nizka</string>
+    <string name="priority_normal">Običajna</string>
+    <string name="priority_high">Visoka</string>
+    <string name="sms_storage_pref_title">Pomnilniška naprava</string>
+    <string name="pref_summary_auto_delete">Izbriši stara sporočila, ko so dosežene omejitve</string>
+    <string name="auto_delete_pref_title">Izbriši stara sporočila</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> sporočil na pogovor</string>
+    <string name="sms_delete_pref_title">Omejitev SMS-ov</string>
+    <string name="mms_delete_pref_title">Omejitev MMS-ov</string>
+    <string name="set">Nastavi</string>
+    <string name="no">Prekliči</string>
+    <string name="pref_messages_to_save">Nastavi število sporočil za shranjevanje</string>
+    <string name="swipe_to_delete_conversation_pref_title">Potegnite za brisanje</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Za izbris pogovora potegnite na desno</string>
+    <string name="pref_quickmessage">Hitro sporočilo in Odgovor</string>
+    <string name="pref_quickmessage_title">Prikaži Hitro sporočilo</string>
+    <string name="pref_quickmessage_summary">Samodejno odpri pojavno okno Hitrega sporočila za dohodna sporočila SMS</string>
+    <string name="pref_close_all_title">Zapri vse</string>
+    <string name="pref_close_all_summary">Gumb Zapri zapre vsa sporočila</string>
+    <string name="message_counter">%1$d od %2$d</string>
+    <string name="button_close">Zapri</string>
+    <string name="button_view">Pogled</string>
+    <string name="button_templates">Predloge</string>
+    <string name="qm_button_full_conversation">Celoten pogovor</string>
+    <string name="type_to_reply_text_enter_to_send">Tipkajte za odgovor</string>
+    <string name="toast_sending_message">Pošiljanje sporočila \u2026</string>
+    <string name="qm_quick_reply">Hitri odgovor</string>
+    <string name="send">Pošlji</string>
+    <string name="compose_message_hint_text">Vnesite sporočilo</string>
+    <string name="show_emoticons_pref_title">Dostop do izraznih ikon</string>
+    <string name="show_emoticons_pref_summary">Na tipkovnici prikaži tipko za izrazne ikone</string>
+    <string name="select_phone_account_title">Pošlji s/z</string>
+    <string name="pref_title_manage_sim_messages">Upravljaj sporočila kartice SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Upravljaj sporočila kartice SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Upravljaj sporočila kartice SIM 2</string>
+    <string name="copy_to_sim">Kopiraj sporočilo na kartico SIM</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> sporočil shranjenih na kartico SIM.</string>
+    <string name="copy_to_sim_fail">Sporočila ni mogoče shraniti</string>
+    <string name="copy_to_phone_success">Sporočilo shranjeno</string>
+    <string name="copy_to_phone_fail">Sporočila ni mogoče shraniti</string>
+    <string name="sim_empty">Na kartici SIM ni sporočil.</string>
+    <string name="menu_send_email">Pošlji e-pošto na <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Pokliči <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Dodaj <xliff:g id="contactEmailOrNumber">%s</xliff:g> k Osebam</string>
+    <string name="sim_capacity_title">Zmogljivost kartice SIM</string>
+    <string name="sim_capacity">Uporabljenih <xliff:g id="used">%1$d</xliff:g> of <xliff:g id="total">%2$d</xliff:g> vnosov kartice SIM</string>
+    <string name="confirm_dialog_title">Izbriši?</string>
+    <string name="sim_manage_messages_title">Sporočila na kartici SIM</string>
+    <string name="refreshing">Osveževanje \u2026</string>
+    <string name="confirm_delete_selected_messages">Izbrano sporočilo bo izbrisano.</string>
+    <string name="delete">Izbriši</string>
+    <string name="menu_forward">Posreduj</string>
+    <string name="menu_reply">Odgovori</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Kopiraj v pomnilnik tabličnega računalnika</string>
+    <string name="sim_copy_to_phone_memory" product="default">Kopiraj v pomnilnik telefona</string>
+    <string name="selected_all">Izberi vse</string>
+    <string name="deselected_all">Odstrani vse izbire</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> izbranih</string>
+    <string name="yes">V REDU</string>
+    <string name="operation_to_card_memory">Kopiraj sporočilo na kartico SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Izberi slike ali videoposnetke iz te naprave</string>
+    <string name="mediapicker_audioListChooserDescription">Izberi zvočne datoteke iz te naprave</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Videoposnetka ni mogoče pripeti. Dosežena največja velikost sporočila.</string>
+    <string name="mediapicker_audio_list_title">Izberite zvok</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Zvok je izbran.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Izbira zvoka je preklicana.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> izbranih</string>
 </resources>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 63281ec..5e61113 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -16,126 +16,95 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Raporto si spam te %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Hiq unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Lëri karakteret të paprekura</string>
-  <string name="pref_unicode_stripping_non_encodable">Hiq karakteret e pakodueshëm</string>
-  <string name="pref_unicode_stripping_all">Hiq të gjitha karakteret unicode</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Periudha e vlefshmërisë</string>
-  <string name="validity_period_slot1_pref_title">Periudha e vlefshmërisë për kartën SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Periudha e vlefshmërisë për kartën SIM 2</string>
-  <string name="sms_validity_period_not_set">E pacaktuar</string>
-  <string name="sms_validity_period_one_hour">1 orë</string>
-  <string name="sms_validity_period_six_hours">6 orë</string>
-  <string name="sms_validity_period_twelve_hours">12 orë</string>
-  <string name="sms_validity_period_one_day">1 ditë</string>
-  <string name="mms_validity_period_two_days">2 ditë</string>
-  <string name="mms_validity_period_one_week">1 javë</string>
-  <string name="validity_period_maximum">Maksimumi</string>
-  <string name="pref_summary_mms_delivery_reports">Kërko një raport që tregon se mesazhi u dërgua për çdo mesazh që dërgon</string>
-  <string name="pref_summary_mms_read_reports">Kërko një raport që tregon se mesazhi u lexua për çdo mesazh që dërgon</string>
-  <string name="delivery_reports_mms_pref_title">Raportet e dërgimit</string>
-  <string name="read_reports_mms_pref_title">Raportet e leximit</string>
-  <string name="status_label">Statusi:\u0020</string>
-  <string name="status_read">I lexuar</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_pref_title">Prioriteti i dërgimit</string>
-  <string name="priority_low">I ulët</string>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">I lartë</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Memoria</string>
-  <string name="pref_summary_auto_delete">Fshi mesazhet e vjetra kur arrihet numri maksimal i mesazheve</string>
-  <string name="auto_delete_pref_title">Fshi mesazhet e vjetra</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mesazhe për bisedë</string>
-  <string name="sms_delete_pref_title">Kufiri i mesazheve SMS</string>
-  <string name="mms_delete_pref_title">Kufiri i mesazheve MMS</string>
-  <string name="set">Cakto</string>
-  <string name="no">Anullo</string>
-  <string name="pref_messages_to_save">Cakto numrin e mesazheve që do të ruash</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Rrëshqit gishtin për të fshirë</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Rrëshqit gishtin djathtas për të fshirë një bisedë</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Mesazhet e Shpejta dhe Përgjigjet</string>
-  <string name="pref_quickmessage_title">Shfaq Mesazhet e Shpejta</string>
-  <string name="pref_quickmessage_summary">Hap automatikisht dritaren e Mesazheve të Shpejta kur vjen një SMS</string>
-  <string name="pref_close_all_title">Mbylli të gjitha</string>
-  <string name="pref_close_all_summary">Butoni \'Mbyll\' mbyll të gjitha mesazhet</string>
-  <string name="message_counter">%1$d nga %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Mbyll</string>
-  <string name="button_view">Shiko</string>
-  <string name="button_templates">Shabllonet</string>
-  <string name="qm_button_full_conversation">Biseda e plotë</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Shkruaj për t\'u përgjigjur</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Duke dërguar mesazhin\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Përgjigje e shpejtë</string>
-  <string name="send">Dërgo</string>
-  <string name="compose_message_hint_text">Shkruaj mesazhin</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Aksesi i emotikonave</string>
-  <string name="show_emoticons_pref_summary">Trego tastin e emotikonave në tastjerë</string>
-  <string name="select_phone_account_title">Dërgo me</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages">Menaxho mesazhet e kartës SIM</string>
-  <string name="pref_title_manage_sim_messages_slot1">Menaxho mesazhet e kartës SIM 1</string>
-  <string name="pref_title_manage_sim_messages_slot2">Menaxho mesazhet e kartës SIM 2</string>
-  <string name="copy_to_sim">Kopjo mesazhin në kartën SIM</string>
-  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> nga <xliff:g id="total">%2$d</xliff:g> mesazhe u ruajtën në kartën SIM.</string>
-  <string name="copy_to_sim_fail">Mesazhi nuk u ruajt dot</string>
-  <string name="copy_to_phone_success">Mesazhi u ruajt</string>
-  <string name="copy_to_phone_fail">Mesazhi nuk u ruajt dot</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">Asnjë mesazh në kartën SIM.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Dërgo një email te <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">Telefono <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">Shto <xliff:g id="contactEmailOrNumber">%s</xliff:g> te Personat</string>
-  <string name="sim_capacity_title">Kapaciteti i kartës SIM</string>
-  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> nga <xliff:g id="total">%2$d</xliff:g> vende të kartës SIM janë të përdorura</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Dëshiron ta fshish?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">Mesazhet SMS në kartën SIM</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Duke përditësuar\u2026</string>
-  <string name="confirm_delete_selected_messages">Mesazhi i zgjedhur do të fshihet.</string>
-  <!-- Delete button title -->
-  <string name="delete">Fshi</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_reply">Përgjigju</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="tablet">Kopjo te memoria e tabletës</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Kopjo te memoria e telefonit</string>
-  <string name="selected_all">Zgjidhi të gjitha</string>
-  <string name="deselected_all">Deselektoji të gjitha</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> të zgjedhura</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">Kopjo mesazhin në kartën 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">Zgjidh imazhet ose videot nga kjo pajisje</string>
-  <string name="mediapicker_audioListChooserDescription">Zgjidh audiot nga kjo pajisje</string>
-  <string name="mediapicker_gallery_image_item_attachment_too_large">Videoja nuk mund të bashkangjitet. Madhësia maksimale e mesazhit është tejkaluar.</string>
-  <string name="mediapicker_audio_list_title">Zgjidh audion</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Audioja është e zgjedhur.</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Audioja nuk është e zgjedhur.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> të zgjedhura</string>
+    <string name="report_as_spam_to">Raporto si spam te %s</string>
+    <string name="unicode_stripping_pref_title">Hiq unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Lëri karakteret të paprekura</string>
+    <string name="pref_unicode_stripping_non_encodable">Hiq karakteret e pakodueshëm</string>
+    <string name="pref_unicode_stripping_all">Hiq të gjitha karakteret unicode</string>
+    <string name="validity_period_pref_title">Periudha e vlefshmërisë</string>
+    <string name="validity_period_slot1_pref_title">Periudha e vlefshmërisë për kartën SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Periudha e vlefshmërisë për kartën SIM 2</string>
+    <string name="sms_validity_period_not_set">E pacaktuar</string>
+    <string name="sms_validity_period_one_hour">1 orë</string>
+    <string name="sms_validity_period_six_hours">6 orë</string>
+    <string name="sms_validity_period_twelve_hours">12 orë</string>
+    <string name="sms_validity_period_one_day">1 ditë</string>
+    <string name="mms_validity_period_two_days">2 ditë</string>
+    <string name="mms_validity_period_one_week">1 javë</string>
+    <string name="validity_period_maximum">Maksimumi</string>
+    <string name="pref_summary_mms_delivery_reports">Kërko një raport që tregon se mesazhi u dërgua për çdo mesazh që dërgon</string>
+    <string name="pref_summary_mms_read_reports">Kërko një raport që tregon se mesazhi u lexua për çdo mesazh që dërgon</string>
+    <string name="delivery_reports_mms_pref_title">Raportet e dërgimit</string>
+    <string name="read_reports_mms_pref_title">Raportet e leximit</string>
+    <string name="status_label">Statusi:\u0020</string>
+    <string name="status_read">I lexuar</string>
+    <string name="priority_pref_title">Prioriteti i dërgimit</string>
+    <string name="priority_low">I ulët</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">I lartë</string>
+    <string name="sms_storage_pref_title">Memoria</string>
+    <string name="pref_summary_auto_delete">Fshi mesazhet e vjetra kur arrihet numri maksimal i mesazheve</string>
+    <string name="auto_delete_pref_title">Fshi mesazhet e vjetra</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mesazhe për bisedë</string>
+    <string name="sms_delete_pref_title">Kufiri i mesazheve SMS</string>
+    <string name="mms_delete_pref_title">Kufiri i mesazheve MMS</string>
+    <string name="set">Cakto</string>
+    <string name="no">Anullo</string>
+    <string name="pref_messages_to_save">Cakto numrin e mesazheve që do të ruash</string>
+    <string name="swipe_to_delete_conversation_pref_title">Rrëshqit gishtin për të fshirë</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Rrëshqit gishtin djathtas për të fshirë një bisedë</string>
+    <string name="pref_quickmessage">Mesazhet e Shpejta dhe Përgjigjet</string>
+    <string name="pref_quickmessage_title">Shfaq Mesazhet e Shpejta</string>
+    <string name="pref_quickmessage_summary">Hap automatikisht dritaren e Mesazheve të Shpejta kur vjen një SMS</string>
+    <string name="pref_close_all_title">Mbylli të gjitha</string>
+    <string name="pref_close_all_summary">Butoni \'Mbyll\' mbyll të gjitha mesazhet</string>
+    <string name="message_counter">%1$d nga %2$d</string>
+    <string name="button_close">Mbyll</string>
+    <string name="button_view">Shiko</string>
+    <string name="button_templates">Shabllonet</string>
+    <string name="qm_button_full_conversation">Biseda e plotë</string>
+    <string name="type_to_reply_text_enter_to_send">Shkruaj për t\'u përgjigjur</string>
+    <string name="toast_sending_message">Duke dërguar mesazhin\u2026</string>
+    <string name="qm_quick_reply">Përgjigje e shpejtë</string>
+    <string name="send">Dërgo</string>
+    <string name="compose_message_hint_text">Shkruaj mesazhin</string>
+    <string name="show_emoticons_pref_title">Aksesi i emotikonave</string>
+    <string name="show_emoticons_pref_summary">Trego tastin e emotikonave në tastjerë</string>
+    <string name="select_phone_account_title">Dërgo me</string>
+    <string name="pref_title_manage_sim_messages">Menaxho mesazhet e kartës SIM</string>
+    <string name="pref_title_manage_sim_messages_slot1">Menaxho mesazhet e kartës SIM 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">Menaxho mesazhet e kartës SIM 2</string>
+    <string name="copy_to_sim">Kopjo mesazhin në kartën SIM</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> nga <xliff:g id="total">%2$d</xliff:g> mesazhe u ruajtën në kartën SIM.</string>
+    <string name="copy_to_sim_fail">Mesazhi nuk u ruajt dot</string>
+    <string name="copy_to_phone_success">Mesazhi u ruajt</string>
+    <string name="copy_to_phone_fail">Mesazhi nuk u ruajt dot</string>
+    <string name="sim_empty">Asnjë mesazh në kartën SIM.</string>
+    <string name="menu_send_email">Dërgo një email te <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Telefono <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">Shto <xliff:g id="contactEmailOrNumber">%s</xliff:g> te Personat</string>
+    <string name="sim_capacity_title">Kapaciteti i kartës SIM</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> nga <xliff:g id="total">%2$d</xliff:g> vende të kartës SIM janë të përdorura</string>
+    <string name="confirm_dialog_title">Dëshiron ta fshish?</string>
+    <string name="sim_manage_messages_title">Mesazhet SMS në kartën SIM</string>
+    <string name="refreshing">Duke përditësuar\u2026</string>
+    <string name="confirm_delete_selected_messages">Mesazhi i zgjedhur do të fshihet.</string>
+    <string name="delete">Fshi</string>
+    <string name="menu_reply">Përgjigju</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Kopjo te memoria e tabletës</string>
+    <string name="sim_copy_to_phone_memory" product="default">Kopjo te memoria e telefonit</string>
+    <string name="selected_all">Zgjidhi të gjitha</string>
+    <string name="deselected_all">Deselektoji të gjitha</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> të zgjedhura</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Kopjo mesazhin në kartën SIM</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_galleryChooserDescription_cm">Zgjidh imazhet ose videot nga kjo pajisje</string>
+    <string name="mediapicker_audioListChooserDescription">Zgjidh audiot nga kjo pajisje</string>
+    <string name="mediapicker_gallery_image_item_attachment_too_large">Videoja nuk mund të bashkangjitet. Madhësia maksimale e mesazhit është tejkaluar.</string>
+    <string name="mediapicker_audio_list_title">Zgjidh audion</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Audioja është e zgjedhur.</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Audioja nuk është e zgjedhur.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> të zgjedhura</string>
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 55d10d3..8496fe1 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -16,127 +16,96 @@
     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">Нацртај уникод</string>
-  <string name="pref_unicode_stripping_leave_intact">Остави знакове нетакнуте</string>
-  <string name="pref_unicode_stripping_non_encodable">Монтирај не-кодиране знакове</string>
-  <string name="pref_unicode_stripping_all">Монтирај све уникод знакове</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">Аутоматски отвори искачући прозор Брзе поруке за долазеће SMS поруке</string>
-  <string name="pref_close_all_title">Затвори све</string>
-  <string name="pref_close_all_summary">Дугме за затварање затвара све поруке</string>
-  <string name="message_counter">%1$d од %2$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="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>
-  <!-- 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="name">%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"><xliff:g id="used">%1$d</xliff:g> од <xliff:g id="total">%2$d</xliff:g> уноса на SIM картици је искоришћено</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>
+    <string name="report_as_spam_to">Пријави спам у %s</string>
+    <string name="unicode_stripping_pref_title">Нацртај уникод</string>
+    <string name="pref_unicode_stripping_leave_intact">Остави знакове нетакнуте</string>
+    <string name="pref_unicode_stripping_non_encodable">Монтирај не-кодиране знакове</string>
+    <string name="pref_unicode_stripping_all">Монтирај све уникод знакове</string>
+    <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>
+    <string name="priority_pref_title">Приоритет слања</string>
+    <string name="priority_low">Низак</string>
+    <string name="priority_normal">Нормално</string>
+    <string name="priority_high">Висок</string>
+    <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>
+    <string name="swipe_to_delete_conversation_pref_title">Брисање превлачењем</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Превуците у десно да бисте избрисали конверзацију</string>
+    <string name="pref_quickmessage">Брза порука и одговор</string>
+    <string name="pref_quickmessage_title">Прикажи Брзу поруку</string>
+    <string name="pref_quickmessage_summary">Аутоматски отвори искачући прозор Брзе поруке за долазеће SMS поруке</string>
+    <string name="pref_close_all_title">Затвори све</string>
+    <string name="pref_close_all_summary">Дугме за затварање затвара све поруке</string>
+    <string name="message_counter">%1$d од %2$d</string>
+    <string name="button_close">Затвори</string>
+    <string name="button_view">Погледај</string>
+    <string name="button_templates">Шаблони</string>
+    <string name="qm_button_full_conversation">Сва преписка</string>
+    <string name="type_to_reply_text_enter_to_send">Додирни да одговориш</string>
+    <string name="toast_sending_message">Слање поруке\u2026</string>
+    <string name="qm_quick_reply">Брзи одговор</string>
+    <string name="send">Пошаљи</string>
+    <string name="compose_message_hint_text">Унеси поруку</string>
+    <string name="show_emoticons_pref_title">Приступ емотиконима</string>
+    <string name="show_emoticons_pref_summary">Прикажите дугме са емотиконима на тастатури</string>
+    <string name="select_phone_account_title">Пошаљи са</string>
+    <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="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>
+    <string name="sim_empty">Нема порука на SIM картици.</string>
+    <string name="menu_send_email">Пошаљи е-пошту за <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Позови <xliff:g id="name">%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"><xliff:g id="used">%1$d</xliff:g> од <xliff:g id="total">%2$d</xliff:g> уноса на SIM картици је искоришћено</string>
+    <string name="confirm_dialog_title">Обрисати?</string>
+    <string name="sim_manage_messages_title">Текстуалне поруке на SIM картици</string>
+    <string name="refreshing">Освежавам\u2026</string>
+    <string name="confirm_delete_selected_messages">Изабрана порука ће бити обрисана.</string>
+    <string name="delete">Обриши</string>
+    <string name="menu_forward">Проследи</string>
+    <string name="menu_reply">Одговори</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Копирај у меморију таблета</string>
+    <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>
+    <string name="yes">У реду</string>
+    <string name="operation_to_card_memory">Копирај поруку на SIM картицу</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <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>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 164151d..5f690ef 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -16,111 +16,87 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Rapportera som spam till %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Konvertera unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Lämna tecken intakta</string>
-  <string name="pref_unicode_stripping_non_encodable">Konvertera ej kodbara tecken</string>
-  <string name="pref_unicode_stripping_all">Konvertera alla unicodetecken</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Giltighetsperiod</string>
-  <string name="validity_period_slot1_pref_title">Giltighetsperiod för SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Giltighetsperiod för SIM 2</string>
-  <string name="sms_validity_period_not_set">Inte inställt</string>
-  <string name="sms_validity_period_one_hour">1 timme</string>
-  <string name="sms_validity_period_six_hours">6 timmar</string>
-  <string name="sms_validity_period_twelve_hours">12 timmar</string>
-  <string name="sms_validity_period_one_day">1 dag</string>
-  <string name="mms_validity_period_two_days">2 dagar</string>
-  <string name="mms_validity_period_one_week">1 vecka</string>
-  <string name="validity_period_maximum">Maximalt</string>
-  <string name="pref_summary_mms_read_reports">Begär en läsrapport för varje meddelande du skickar</string>
-  <string name="delivery_reports_mms_pref_title">Leveransrapporter</string>
-  <string name="read_reports_mms_pref_title">Läsa rapporter</string>
-  <string name="status_label">Status:\u0020</string>
-  <string name="status_read">Läst</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <string name="priority_low">Låg</string>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">Hög</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Lagring</string>
-  <string name="auto_delete_pref_title">Ta bort gamla meddelanden</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> meddelanden per konversation</string>
-  <string name="mms_delete_pref_title">Gräns för multimediameddelande</string>
-  <string name="set">Ställ in</string>
-  <string name="no">Avbryt</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Svep för att radera</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Svep till höger för att ta bort en konversation</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Snabbmeddelande och svar</string>
-  <string name="pref_quickmessage_title">Visa snabbmeddelande</string>
-  <string name="pref_quickmessage_summary">Öppna snabbmeddelande i ett pop-up-fönster automatiskt för inkommande SMS-meddelanden</string>
-  <string name="pref_close_all_title">Stäng alla</string>
-  <string name="pref_close_all_summary">Stängknappen stänger alla meddelanden</string>
-  <string name="message_counter">%1$d av %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Stäng</string>
-  <string name="button_view">Visa</string>
-  <string name="button_templates">Mallar</string>
-  <string name="qm_button_full_conversation">Hel konversation</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Skriv för att svara</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Skickar meddelande\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Snabbsvar</string>
-  <string name="send">Skicka</string>
-  <string name="compose_message_hint_text">Skriv meddelande</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Tillgång till uttryckssymboler</string>
-  <string name="show_emoticons_pref_summary">Visa knappen för uttryckssymboler på tangentbordet</string>
-  <string name="select_phone_account_title">Skicka med</string>
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <string name="pref_title_manage_sim_messages_slot1">Hantera SIM 1-meddelanden</string>
-  <string name="pref_title_manage_sim_messages_slot2">Hantera SIM 2-meddelanden</string>
-  <string name="copy_to_sim">Kopiera meddelande till SIM-kort</string>
-  <string name="copy_to_phone_success">Meddelandet sparades</string>
-  <string name="copy_to_phone_fail">Det gick inte att spara meddelandet</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">Inga meddelanden på SIM-kortet.</string>
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <string name="menu_send_email">Skicka mail till <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">Ring <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">Lägg till <xliff:g id="contactEmailOrNumber">%s</xliff:g> till kontakter</string>
-  <string name="sim_capacity_title">SIM-kapacitet</string>
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">Ta bort?</string>
-  <!-- Title of screen displaying messages on SIM card -->
-  <string name="sim_manage_messages_title">SMS på SIM-kortet</string>
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">Uppdaterar\u2026</string>
-  <!-- Delete button title -->
-  <string name="delete">Ta bort</string>
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <string name="menu_forward">Framåt</string>
-  <string name="menu_reply">Svara</string>
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <string name="sim_copy_to_phone_memory" product="default">Kopiera till telefonens minne</string>
-  <string name="selected_all">Markera alla</string>
-  <string name="deselected_all">Avmarkera alla</string>
-  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> markerade</string>
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <string name="yes">OK</string>
-  <!-- Copy message to sim -->
-  <string name="slot1">SIM 1</string>
-  <string name="slot2">SIM 2</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_audio_list_title">Välj ljud</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Ljudet är inte valt.</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> vald</string>
+    <string name="report_as_spam_to">Rapportera som spam till %s</string>
+    <string name="unicode_stripping_pref_title">Konvertera unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Lämna tecken intakta</string>
+    <string name="pref_unicode_stripping_non_encodable">Konvertera ej kodbara tecken</string>
+    <string name="pref_unicode_stripping_all">Konvertera alla unicodetecken</string>
+    <string name="validity_period_pref_title">Giltighetsperiod</string>
+    <string name="validity_period_slot1_pref_title">Giltighetsperiod för SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Giltighetsperiod för SIM 2</string>
+    <string name="sms_validity_period_not_set">Inte inställt</string>
+    <string name="sms_validity_period_one_hour">1 timme</string>
+    <string name="sms_validity_period_six_hours">6 timmar</string>
+    <string name="sms_validity_period_twelve_hours">12 timmar</string>
+    <string name="sms_validity_period_one_day">1 dag</string>
+    <string name="mms_validity_period_two_days">2 dagar</string>
+    <string name="mms_validity_period_one_week">1 vecka</string>
+    <string name="validity_period_maximum">Maximalt</string>
+    <string name="pref_summary_mms_read_reports">Begär en läsrapport för varje meddelande du skickar</string>
+    <string name="delivery_reports_mms_pref_title">Leveransrapporter</string>
+    <string name="read_reports_mms_pref_title">Läsa rapporter</string>
+    <string name="status_label">Status:\u0020</string>
+    <string name="status_read">Läst</string>
+    <string name="priority_pref_title">Skickar prioritet</string>
+    <string name="priority_low">Låg</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">Hög</string>
+    <string name="sms_storage_pref_title">Lagring</string>
+    <string name="auto_delete_pref_title">Ta bort gamla meddelanden</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> meddelanden per konversation</string>
+    <string name="sms_delete_pref_title">Textmeddelandegräns</string>
+    <string name="mms_delete_pref_title">Gräns för multimediameddelande</string>
+    <string name="set">Ställ in</string>
+    <string name="no">Avbryt</string>
+    <string name="swipe_to_delete_conversation_pref_title">Svep för att radera</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Svep till höger för att ta bort en konversation</string>
+    <string name="pref_quickmessage">Snabbmeddelande och svar</string>
+    <string name="pref_quickmessage_title">Visa snabbmeddelande</string>
+    <string name="pref_quickmessage_summary">Öppna snabbmeddelande i ett pop-up-fönster automatiskt för inkommande SMS-meddelanden</string>
+    <string name="pref_close_all_title">Stäng alla</string>
+    <string name="pref_close_all_summary">Stängknappen stänger alla meddelanden</string>
+    <string name="message_counter">%1$d av %2$d</string>
+    <string name="button_close">Stäng</string>
+    <string name="button_view">Visa</string>
+    <string name="button_templates">Mallar</string>
+    <string name="qm_button_full_conversation">Hel konversation</string>
+    <string name="type_to_reply_text_enter_to_send">Skriv för att svara</string>
+    <string name="toast_sending_message">Skickar meddelande\u2026</string>
+    <string name="qm_quick_reply">Snabbsvar</string>
+    <string name="send">Skicka</string>
+    <string name="compose_message_hint_text">Skriv meddelande</string>
+    <string name="show_emoticons_pref_title">Tillgång till uttryckssymboler</string>
+    <string name="show_emoticons_pref_summary">Visa knappen för uttryckssymboler på tangentbordet</string>
+    <string name="select_phone_account_title">Skicka med</string>
+    <string name="pref_title_manage_sim_messages_slot1">Hantera SIM 1-meddelanden</string>
+    <string name="pref_title_manage_sim_messages_slot2">Hantera SIM 2-meddelanden</string>
+    <string name="copy_to_sim">Kopiera meddelande till SIM-kort</string>
+    <string name="copy_to_sim_fail">Det gick inte att spara meddelandet</string>
+    <string name="copy_to_phone_success">Meddelandet sparades</string>
+    <string name="copy_to_phone_fail">Det gick inte att spara meddelandet</string>
+    <string name="sim_empty">Inga meddelanden på SIM-kortet.</string>
+    <string name="menu_send_email">Skicka mail till <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Ring <xliff:g id="name">%s </xliff:g></string>
+    <string name="menu_add_address_to_contacts">Lägg till <xliff:g id="contactEmailOrNumber">%s</xliff:g> till kontakter</string>
+    <string name="sim_capacity_title">SIM-kapacitet</string>
+    <string name="confirm_dialog_title">Ta bort?</string>
+    <string name="sim_manage_messages_title">SMS på SIM-kortet</string>
+    <string name="refreshing">Uppdaterar\u2026</string>
+    <string name="confirm_delete_selected_messages">Markerade meddelandet kommer att raderas.</string>
+    <string name="delete">Ta bort</string>
+    <string name="menu_forward">Framåt</string>
+    <string name="menu_reply">Svara</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Kopiera till surfplattans minne</string>
+    <string name="sim_copy_to_phone_memory" product="default">Kopiera till telefonens minne</string>
+    <string name="selected_all">Markera alla</string>
+    <string name="deselected_all">Avmarkera alla</string>
+    <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> markerade</string>
+    <string name="yes">OK</string>
+    <string name="operation_to_card_memory">Kopiera meddelande till SIM-kort</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <string name="mediapicker_audioListChooserDescription">Välj ljudfiler från denna enhet</string>
+    <string name="mediapicker_audio_list_title">Välj ljud</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Ljudet är inte valt.</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> vald</string>
 </resources>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-sw/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index ad1eb0a..80905d4 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -16,60 +16,29 @@
     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">யூனிகோடை நீக்கு</string>
-  <string name="pref_unicode_stripping_leave_intact">எழுத்துக்களை உள்ளபடியே விட்டுவிடு</string>
-  <string name="pref_unicode_stripping_non_encodable">என்கோட் செய்யமுடியாத எழுத்துக்களை நீக்கு</string>
-  <string name="pref_unicode_stripping_all">அனைத்து யூனிகோட் எழுத்துக்களையும் நீக்கு</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- 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">QuickMessage  மற்றும் பதில்</string>
-  <string name="pref_quickmessage_title">QuickMessage காண்பி</string>
-  <string name="pref_quickmessage_summary">தானியக்கமாக QuickMessage பாப்-அப்பை உள்வரும் SMS செய்திகளுக்கு திற</string>
-  <string name="pref_close_all_title">அனைத்தையும் மூடு</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 -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">ஸ்பேமை %sக்கு புகாரளிக்கவும்</string>
+    <string name="unicode_stripping_pref_title">யூனிகோடை நீக்கு</string>
+    <string name="pref_unicode_stripping_leave_intact">எழுத்துக்களை உள்ளபடியே விட்டுவிடு</string>
+    <string name="pref_unicode_stripping_non_encodable">என்கோட் செய்யமுடியாத எழுத்துக்களை நீக்கு</string>
+    <string name="pref_unicode_stripping_all">அனைத்து யூனிகோட் எழுத்துக்களையும் நீக்கு</string>
+    <string name="swipe_to_delete_conversation_pref_title">நீக்குவதற்கு தேய்க்கவும்</string>
+    <string name="swipe_to_delete_conversation_pref_summary">ஒரு உரையாடல் நீக்குவதற்கு வலது பக்கமாக தேய்க்கவும்</string>
+    <string name="pref_quickmessage">QuickMessage  மற்றும் பதில்</string>
+    <string name="pref_quickmessage_title">QuickMessage காண்பி</string>
+    <string name="pref_quickmessage_summary">தானியக்கமாக QuickMessage பாப்-அப்பை உள்வரும் SMS செய்திகளுக்கு திற</string>
+    <string name="pref_close_all_title">அனைத்தையும் மூடு</string>
+    <string name="pref_close_all_summary">மூடு பொத்தான் அனைத்து செய்திகளையும் மூடுகிறது</string>
+    <string name="message_counter">%2$d இல் %1$d</string>
+    <string name="button_close">மூடு</string>
+    <string name="button_view">காட்டு</string>
+    <string name="button_templates">வார்ப்புருக்கள்</string>
+    <string name="qm_button_full_conversation">முழு உரையாடல்</string>
+    <string name="type_to_reply_text_enter_to_send">பதிலளிக்க தட்டச்சுசெய்க</string>
+    <string name="toast_sending_message">செய்தியை அனுப்புகிறது\u2026</string>
+    <string name="qm_quick_reply">விரைவான பதில்</string>
+    <string name="send">அனுப்பு</string>
+    <string name="compose_message_hint_text">செய்தியை உள்ளிடு</string>
+    <string name="show_emoticons_pref_title">எமோடிகான்கள் அணுகல்</string>
+    <string name="show_emoticons_pref_summary">விசைப்பலகையில் உள்ள எமோடிகான் விசையை காண்பிக்கவும்</string>
+    <string name="select_phone_account_title">இதோடு அனுப்பவும்</string>
 </resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 41fa09e..a53913f 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -16,60 +16,29 @@
     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">యూనికోడ్‌ ను స్ట్రిప్ చేయుము</string>
-  <string name="pref_unicode_stripping_leave_intact">అక్షరాలను అలాగే ఉంచుము</string>
-  <string name="pref_unicode_stripping_non_encodable">సంకేతించదగని అక్షరాలను స్ట్రిప్ చేయుము</string>
-  <string name="pref_unicode_stripping_all">అన్ని యూనికోడ్ అక్షరాలను స్ట్రిప్ చేయుము</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- 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">ఇన్‌కమింగ్ SMS  సందేశాలకు స్వయంచాలకంగా త్వరిత సందేశ ఉద్వాహాన్ని తెరువుము</string>
-  <string name="pref_close_all_title">అన్నింటినీ మూయుము</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 -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">%s స్పామ్ గా నివేదిక పంపుము</string>
+    <string name="unicode_stripping_pref_title">యూనికోడ్‌ ను స్ట్రిప్ చేయుము</string>
+    <string name="pref_unicode_stripping_leave_intact">అక్షరాలను అలాగే ఉంచుము</string>
+    <string name="pref_unicode_stripping_non_encodable">సంకేతించదగని అక్షరాలను స్ట్రిప్ చేయుము</string>
+    <string name="pref_unicode_stripping_all">అన్ని యూనికోడ్ అక్షరాలను స్ట్రిప్ చేయుము</string>
+    <string name="swipe_to_delete_conversation_pref_title">తొలగించడానికి స్వైప్ చెయ్యండి</string>
+    <string name="swipe_to_delete_conversation_pref_summary">ఒక సంభాషణను తొలగించడానికి కుడి ప్రక్కన స్వైప్ చెయ్యండి</string>
+    <string name="pref_quickmessage">త్వరితసందేశం మరియు ప్రత్యుత్తరం</string>
+    <string name="pref_quickmessage_title">త్వరిత సందేశాన్ని చూపుము</string>
+    <string name="pref_quickmessage_summary">ఇన్‌కమింగ్ SMS  సందేశాలకు స్వయంచాలకంగా త్వరిత సందేశ ఉద్వాహాన్ని తెరువుము</string>
+    <string name="pref_close_all_title">అన్నింటినీ మూయుము</string>
+    <string name="pref_close_all_summary">క్లోస్ బటన్ అన్ని సందేశాలను మూసి వేస్తుంది</string>
+    <string name="message_counter">%2$d యొక్క %1$d</string>
+    <string name="button_close">మూసివేయి</string>
+    <string name="button_view">వీక్షించండి</string>
+    <string name="button_templates">మూసలు</string>
+    <string name="qm_button_full_conversation">సంపూర్ణ సంభాషణ</string>
+    <string name="type_to_reply_text_enter_to_send">ప్రత్యుత్తరాన్ని టైప్ చేయుము</string>
+    <string name="toast_sending_message">సందేశాన్ని పంపుతోంది\u2026</string>
+    <string name="qm_quick_reply">త్వరిత ప్రత్యుత్తరం</string>
+    <string name="send">పంపు</string>
+    <string name="compose_message_hint_text">సందేశం ప్రవేశపెట్టు</string>
+    <string name="show_emoticons_pref_title">ఎమోటికన్స్ యాక్సెస్</string>
+    <string name="show_emoticons_pref_summary">కీబోర్డ్ మీద ఎమోటికన్స్ కీ చూపించు</string>
+    <string name="select_phone_account_title">దానితో పంపు</string>
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index f1a02d4..5a28fcc 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -16,88 +16,96 @@
     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">ระยะเวลาสำหรับซิม 1</string>
-  <string name="validity_period_slot2_pref_title">ระยะเวลาสำหรับซิม 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>
-  <!-- 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">เปิดป๊อปอัปข้อความตอบกลับแบบรวดเร็วเมื่อมี SMS เข้า</string>
-  <string name="pref_close_all_title">ปิดทั้งหมด</string>
-  <string name="pref_close_all_summary">ปุ่มปิดเพื่อปิดข้อความทั้งหมด</string>
-  <string name="message_counter">%1$d ของ %2$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 -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">รายงานว่าเป็นสแปมไป %s</string>
+    <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>
+    <string name="validity_period_pref_title">ระยะเวลาความถูกต้อง</string>
+    <string name="validity_period_slot1_pref_title">ระยะเวลาสำหรับซิม 1</string>
+    <string name="validity_period_slot2_pref_title">ระยะเวลาสำหรับซิม 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>
+    <string name="priority_pref_title">ความสำคัญในการส่ง</string>
+    <string name="priority_low">ต่ำ</string>
+    <string name="priority_normal">ปกติ</string>
+    <string name="priority_high">สูง</string>
+    <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>
+    <string name="swipe_to_delete_conversation_pref_title">กวาดนิ้วเพื่อลบ</string>
+    <string name="swipe_to_delete_conversation_pref_summary">กวาดนิ้วไปทางขวาเพื่อลบการสนทนา</string>
+    <string name="pref_quickmessage">ข้อความแบบรวดเร็วและตอบกลับ</string>
+    <string name="pref_quickmessage_title">แสดงข้อความตอบกลับแบบรวดเร็ว</string>
+    <string name="pref_quickmessage_summary">เปิดป๊อปอัปข้อความตอบกลับแบบรวดเร็วเมื่อมี SMS เข้า</string>
+    <string name="pref_close_all_title">ปิดทั้งหมด</string>
+    <string name="pref_close_all_summary">ปุ่มปิดเพื่อปิดข้อความทั้งหมด</string>
+    <string name="message_counter">%1$d ของ %2$d</string>
+    <string name="button_close">ปิด</string>
+    <string name="button_view">ดู</string>
+    <string name="button_templates">แม่แบบ</string>
+    <string name="qm_button_full_conversation">การสนทนาทั้งหมด</string>
+    <string name="type_to_reply_text_enter_to_send">พิมพ์ตอบ</string>
+    <string name="toast_sending_message">กำลังส่งข้อความ\u2026</string>
+    <string name="qm_quick_reply">ตอบด่วน</string>
+    <string name="send">ส่ง</string>
+    <string name="compose_message_hint_text">ป้อนข้อความ</string>
+    <string name="show_emoticons_pref_title">การเข้าถึงอีโมติคอน</string>
+    <string name="show_emoticons_pref_summary">แสดงแป้นอีโมติคอนบนแป้นพิมพ์</string>
+    <string name="select_phone_account_title">ส่งด้วย</string>
+    <string name="pref_title_manage_sim_messages">จัดการ​ข้อ​ความ​ในซิมการ์ด</string>
+    <string name="pref_title_manage_sim_messages_slot1">จัดการ​ข้อ​ความ​ในซิม 1</string>
+    <string name="pref_title_manage_sim_messages_slot2">จัดการ​ข้อ​ความ​ในซิม 2</string>
+    <string name="copy_to_sim">คัดลอกข้อความไปซิมการ์ด</string>
+    <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> จาก <xliff:g id="total">%2$d</xliff:g> ข้อความที่บันทึกไว้ในซิมการ์ด</string>
+    <string name="copy_to_sim_fail">ไม่สามารถบันทึกข้อความได้</string>
+    <string name="copy_to_phone_success">บันทึกข้อความแล้ว</string>
+    <string name="copy_to_phone_fail">ไม่สามารถบันทึกข้อความได้</string>
+    <string name="sim_empty">ไม่มีข้อความบนซิมการ์ด</string>
+    <string name="menu_send_email">ส่งอีเมลไปยัง <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">โทร <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_add_address_to_contacts">เพิ่ม <xliff:g id="contactEmailOrNumber">%s</xliff:g> กับบุคคล</string>
+    <string name="sim_capacity_title">ความจุของซิมการ์ด</string>
+    <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> จาก <xliff:g id="total">%2$d</xliff:g> รายการซิมการ์ดถูกใช้</string>
+    <string name="confirm_dialog_title">ลบ?</string>
+    <string name="sim_manage_messages_title">ข้อความตัวอักษรบนซิมการ์ด</string>
+    <string name="refreshing">กำลังรีเฟรช\u2026</string>
+    <string name="confirm_delete_selected_messages">ข้อความที่เลือกจะถูกลบ</string>
+    <string name="delete">ลบ</string>
+    <string name="menu_forward">ส่งต่อ</string>
+    <string name="menu_reply">ตอบกลับ</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">คัดลอกไปยังหน่วยความจำของแท็บเล็ต</string>
+    <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>
+    <string name="yes">ตกลง</string>
+    <string name="operation_to_card_memory">คัดลอกข้อความไปซิมการ์ด</string>
+    <string name="slot1">ซิม 1</string>
+    <string name="slot2">ซิม 2</string>
+    <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>
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index d23e67f..4f9c169 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">%s kişisine spam olarak bildirin</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Unicode\'u çıkar</string>
-  <string name="pref_unicode_stripping_leave_intact">Karakterleri olduğu gibi bırak</string>
-  <string name="pref_unicode_stripping_non_encodable">Görüntülünemeyen karakterleri çıkar</string>
-  <string name="pref_unicode_stripping_all">Tüm unicode karakterleri çıkar</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Geçerlilik süresi</string>
-  <string name="validity_period_slot1_pref_title">SIM 1 için geçerlilik süresi</string>
-  <string name="validity_period_slot2_pref_title">SIM 2 için geçerlilik süresi</string>
-  <string name="sms_validity_period_not_set">Ayarlanmadı</string>
-  <string name="sms_validity_period_one_hour">1 saat</string>
-  <string name="sms_validity_period_six_hours">6 saat</string>
-  <string name="sms_validity_period_twelve_hours">12 saat</string>
-  <string name="sms_validity_period_one_day">1 gün</string>
-  <string name="mms_validity_period_two_days">2 gün</string>
-  <string name="mms_validity_period_one_week">1 hafta</string>
-  <string name="validity_period_maximum">Maksimum</string>
-  <string name="pref_summary_mms_delivery_reports">Gönderdiğiniz her ileti için bir teslim raporu isteyin</string>
-  <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>
-  <string name="priority_normal">Normal</string>
-  <string name="priority_high">Yüksek</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Depolama</string>
-  <string name="pref_summary_auto_delete">Sınıra ulaştığında eski mesajları sil</string>
-  <string name="auto_delete_pref_title">Eski mesajları sil</string>
-  <string name="pref_summary_delete_limit">Her konuşmada <xliff:g id="count">%1$s</xliff:g> mesaj</string>
-  <string name="sms_delete_pref_title">Metin mesajı sınırı</string>
-  <string name="mms_delete_pref_title">Multimedya mesajı sınırı</string>
-  <string name="set">Ayarla</string>
-  <string name="no">İptal</string>
-  <string name="pref_messages_to_save">Kaydedilecek mesaj sayısını ayarla</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Silmek için kaydırın</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Bir sohbeti silmek için sağa kaydırın</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">HızlıMesaj ve Yanıt</string>
-  <string name="pref_quickmessage_title">HızlıMesaj\'ı göster</string>
-  <string name="pref_quickmessage_summary">Gelen SMS mesajları için HızlıMesaj açılır penceresini otomatik göster</string>
-  <string name="pref_close_all_title">Tümünü kapat</string>
-  <string name="pref_close_all_summary">Kapat tuşu tüm mesajları kapatır</string>
-  <string name="message_counter">%1$d / %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Kapat</string>
-  <string name="button_view">Görüntüle</string>
-  <string name="button_templates">Şablonlar</string>
-  <string name="qm_button_full_conversation">Tam sohbet</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Yanıtlamak için yazın</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Mesaj gönderiliyor\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Hızlı cevap</string>
-  <string name="send">Gönder</string>
-  <string name="compose_message_hint_text">İleti girin</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Emoji erişimi</string>
-  <string name="show_emoticons_pref_summary">Klavyede emoji tuşunu göster</string>
-  <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>
+    <string name="report_as_spam_to">%s kişisine spam olarak bildirin</string>
+    <string name="unicode_stripping_pref_title">Unicode\'u çıkar</string>
+    <string name="pref_unicode_stripping_leave_intact">Karakterleri olduğu gibi bırak</string>
+    <string name="pref_unicode_stripping_non_encodable">Görüntülünemeyen karakterleri çıkar</string>
+    <string name="pref_unicode_stripping_all">Tüm unicode karakterleri çıkar</string>
+    <string name="validity_period_pref_title">Geçerlilik süresi</string>
+    <string name="validity_period_slot1_pref_title">SIM 1 için geçerlilik süresi</string>
+    <string name="validity_period_slot2_pref_title">SIM 2 için geçerlilik süresi</string>
+    <string name="sms_validity_period_not_set">Ayarlanmadı</string>
+    <string name="sms_validity_period_one_hour">1 saat</string>
+    <string name="sms_validity_period_six_hours">6 saat</string>
+    <string name="sms_validity_period_twelve_hours">12 saat</string>
+    <string name="sms_validity_period_one_day">1 gün</string>
+    <string name="mms_validity_period_two_days">2 gün</string>
+    <string name="mms_validity_period_one_week">1 hafta</string>
+    <string name="validity_period_maximum">Maksimum</string>
+    <string name="pref_summary_mms_delivery_reports">Gönderdiğiniz her ileti için bir teslim raporu isteyin</string>
+    <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>
+    <string name="priority_pref_title">Gönderim önceliği</string>
+    <string name="priority_low">Düşük</string>
+    <string name="priority_normal">Normal</string>
+    <string name="priority_high">Yüksek</string>
+    <string name="sms_storage_pref_title">Depolama</string>
+    <string name="pref_summary_auto_delete">Sınıra ulaştığında eski mesajları sil</string>
+    <string name="auto_delete_pref_title">Eski mesajları sil</string>
+    <string name="pref_summary_delete_limit">Her konuşmada <xliff:g id="count">%1$s</xliff:g> mesaj</string>
+    <string name="sms_delete_pref_title">Metin mesajı sınırı</string>
+    <string name="mms_delete_pref_title">Multimedya mesajı sınırı</string>
+    <string name="set">Ayarla</string>
+    <string name="no">İptal</string>
+    <string name="pref_messages_to_save">Kaydedilecek mesaj sayısını ayarla</string>
+    <string name="swipe_to_delete_conversation_pref_title">Silmek için kaydırın</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Bir sohbeti silmek için sağa kaydırın</string>
+    <string name="pref_quickmessage">HızlıMesaj ve Yanıt</string>
+    <string name="pref_quickmessage_title">HızlıMesaj\'ı göster</string>
+    <string name="pref_quickmessage_summary">Gelen SMS mesajları için HızlıMesaj açılır penceresini otomatik göster</string>
+    <string name="pref_close_all_title">Tümünü kapat</string>
+    <string name="pref_close_all_summary">Kapat tuşu tüm mesajları kapatır</string>
+    <string name="message_counter">%1$d / %2$d</string>
+    <string name="button_close">Kapat</string>
+    <string name="button_view">Görüntüle</string>
+    <string name="button_templates">Şablonlar</string>
+    <string name="qm_button_full_conversation">Tam sohbet</string>
+    <string name="type_to_reply_text_enter_to_send">Yanıtlamak için yazın</string>
+    <string name="toast_sending_message">Mesaj gönderiliyor\u2026</string>
+    <string name="qm_quick_reply">Hızlı cevap</string>
+    <string name="send">Gönder</string>
+    <string name="compose_message_hint_text">İleti girin</string>
+    <string name="show_emoticons_pref_title">Emoji erişimi</string>
+    <string name="show_emoticons_pref_summary">Klavyede emoji tuşunu göster</string>
+    <string name="select_phone_account_title">Şununla gönder</string>
+    <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>
+    <string name="sim_empty">SIM kartta mesaj yok.</string>
+    <string name="menu_send_email">Şuraya email gönder: <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Sesli arama yap: <xliff:g id="Name">%s</xliff:g></string>
+    <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>
+    <string name="confirm_dialog_title">Sil?</string>
+    <string name="sim_manage_messages_title">SIM karttaki mesajlar</string>
+    <string name="refreshing">Yenileniyor\u2026</string>
+    <string name="confirm_delete_selected_messages">Seçilen mesaj silinecek.</string>
+    <string name="delete">Sil</string>
+    <string name="menu_forward">Yönlendir</string>
+    <string name="menu_reply">Yanıtla</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Tablet hafızasına kopyala</string>
+    <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>
+    <string name="yes">TAMAM</string>
+    <string name="operation_to_card_memory">Mesajı SIM karta kopyala</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <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>
 </resources>
diff --git a/res/values-ug/arrays.xml b/res/values-ug/arrays.xml
index 48270c4..bdeb442 100644
--- a/res/values-ug/arrays.xml
+++ b/res/values-ug/arrays.xml
@@ -16,27 +16,21 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- String to match as no subject and filter out as a subject. For example, if the
-         subject string is "no subject", we won't display that. We'll pretend
-         no subject string was delivered. -->
-  <string-array name="empty_subject_strings">
-    <item>تېما يوق</item>
-    <item>تېمىسىز</item>
-  </string-array>
-  <!-- Choices for quick-reply to message notification. Users with an Android
-    Wear device (e.g. smartwatch) can reply to messages either by speaking their
-    response, or choosing one of these predefined options. -->
-  <string-array name="notification_reply_choices">
-    <item>ھەئە</item>
-    <item>ياق</item>
-    <item>جەزىملەش</item>
-    <item>ھا ھا</item>
-    <item>رەھمەت</item>
-    <item>قوشۇلىمەن</item>
-    <item>ياخشى</item>
-    <item>يولدا</item>
-    <item>ماقۇل، مەن سەل تۇرۇپ سىزگە قايتۇراي</item>
-    <item>:)</item>
-    <item>:(</item>
-  </string-array>
+    <string-array name="empty_subject_strings">
+        <item>تېما يوق</item>
+        <item>تېمىسىز</item>
+    </string-array>
+    <string-array name="notification_reply_choices">
+        <item>ھەئە</item>
+        <item>ياق</item>
+        <item>جەزىملەش</item>
+        <item>ھا ھا</item>
+        <item>رەھمەت</item>
+        <item>قوشۇلىمەن</item>
+        <item>ياخشى</item>
+        <item>يولدا</item>
+        <item>ماقۇل، مەن سەل تۇرۇپ سىزگە قايتۇراي</item>
+        <item>:)</item>
+        <item>:(</item>
+    </string-array>
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index a6d28b7..590cbb1 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -16,66 +16,35 @@
     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="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="validity_period_maximum">ئەڭ چوڭ قىممەت</string>
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- 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_close_all_title">ھەممىنى تاقاڭ</string>
-  <string name="pref_close_all_summary">ياپ توپچا ھەممە ئۇچۇرلارنى ياپىدۇ</string>
-  <string name="message_counter">%1$d/%2$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 -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="report_as_spam_to">%s گە ئەخلەت دەپ دوكىلات قىلىش</string>
+    <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>
+    <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="validity_period_maximum">ئەڭ چوڭ قىممەت</string>
+    <string name="swipe_to_delete_conversation_pref_title">سۈرۈلسە ئۆچۈرىدۇ</string>
+    <string name="swipe_to_delete_conversation_pref_summary">دىئالوگنى ئۆچۈرۈش ئۈچۈن ئوڭغا سىيرىڭ</string>
+    <string name="pref_quickmessage">تىز ئۇچۇر ۋە جاۋاپ قايتۇرۇش</string>
+    <string name="pref_quickmessage_title">تىز ئۇچۇرنى كۆرسىتىش</string>
+    <string name="pref_quickmessage_summary">ئۇچۇرنىڭ قوبۇللىنىشى ئۈچۈن، تىز ئۇچۇر كۆزنىكى ئاپتۇماتېك قوزغىلىدۇ</string>
+    <string name="pref_close_all_title">ھەممىنى تاقاڭ</string>
+    <string name="pref_close_all_summary">ياپ توپچا ھەممە ئۇچۇرلارنى ياپىدۇ</string>
+    <string name="message_counter">%1$d/%2$d</string>
+    <string name="button_close">تاقاش</string>
+    <string name="button_view">كۆرۈنۈش</string>
+    <string name="button_templates">قېلىپلار</string>
+    <string name="qm_button_full_conversation">تۇللۇق دىئالوگ</string>
+    <string name="type_to_reply_text_enter_to_send">ئۇچۇر كىرگۈزۈڭ</string>
+    <string name="toast_sending_message">ئۇچۇر يوللاۋاتىدۇ\u2026</string>
+    <string name="qm_quick_reply">تېز جاۋاب</string>
+    <string name="send">يوللاڭ</string>
+    <string name="compose_message_hint_text">ئۇچۇر كىرگۈزۈڭ</string>
+    <string name="show_emoticons_pref_title">ئىپادە بەلگىسىنى كۆرسىتىش</string>
+    <string name="show_emoticons_pref_summary">كونۇپكا تاختىسىدا ئىپادە بەلگىسىنى كۆرسىتىش</string>
+    <string name="select_phone_account_title">ئىلە ئەۋەتىش</string>
 </resources>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index 2a8ff6a..2557d1b 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -16,342 +16,11 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- The name of the application as it appears under the main Launcher icon and in various activity titles -->
-  <string name="app_name">ئۇچۇر</string>
-  <!-- The name of the application as it appears in external share intent dialogs -->
-  <string name="share_intent_label">ئۇچۇر</string>
-  <!-- The title when selecting a conversation to share to -->
-  <string name="share_intent_activity_label">دىئالوگ تاللاش</string>
-  <string name="action_settings">تەڭشەكلەر</string>
-  <string name="sendButtonContentDescription">ئۇچۇر يوللاڭ</string>
-  <string name="attachMediaButtonContentDescription">قىستۇرما قوشۇش</string>
-  <string name="help_and_feedback_activity_label">ياردەم</string>
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <!-- The tab header for the frequently used contacts list -->
-  <!-- The tab header for all contacts list -->
-  <!-- The text on the list item in the contact picker that allows a user to send an SMS directly
-         to a number that he/she typed. eg. "Send to 650-555-1234" -->
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <!-- Abbreviated message to express that something occurred some number of hours in the past (e.g., 5 hours ago). -->
-  <!-- Abbreviated message to express that something occurred some number of days in the past (e.g., 5 days ago). -->
-  <!--
-        Plurals used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <!-- Title of the class-0 message activity. -->
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <!-- Title for SMS storage low notification and dialog. Must match the framework's notification title, i.e. //frameworks/base/core/res/res/values/strings.xml#low_internal_storage_view_title -->
-  <!-- Text for SMS storage low notification and dialog -->
-  <!-- Ticker for SMS storage low notification -->
-  <!-- Title for asking the user to enter their phone number -->
-  <!-- Text for asking the user to enter their phone number -->
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <!-- Free SMS storage actions -->
-  <!-- Free SMS storage action confirm dialog message -->
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <!-- While sending a message display this message. -->
-  <!-- When sending a message failed display this message. -->
-  <!-- When retrying sending for a message. -->
-  <!-- When showing resend action display this message. -->
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <!-- When showing resend action, display this message. -->
-  <!-- Title line for an MMS requiring manual download. -->
-  <!-- Title line for an MMS auto-downloading. -->
-  <!-- Title line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which failed to download. -->
-  <!-- Timestamp line for MMS which is selected. -->
-  <!-- Timestamp line to display while downloading a message. -->
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <!-- Display this info line with an MMS notification -->
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for "there are some failed messages" -->
-  <!-- notification line 1 for download failed -->
-  <!-- notification line 1 for multiple downloads failed -->
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <!-- Notification content when emergency SMS fails to send -->
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <!-- Content description text for Back button on the action bar -->
-  <!-- Action menu title for showing archived conversations -->
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <!-- An enumeration comma for separating multiple names in notifications. [CHAR LIMIT=2] -->
-  <!-- Separator between parts of a notification in each line of an inboxStyle notification. [CHAR LIMIT=2] -->
-  <!-- Separator between title and content in notification ticker -->
-  <!-- Separator between title and content in notifications -->
-  <!-- Shown in notifications when there's a picture. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <!-- Shown in the Android Wear conversation log as the sender for outgoing messages,
-         when we don't know the user's real name (e.g. no "Me" contact on the phone). -->
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <!-- Accessibility announcement for an incoming message -->
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <!-- Accessibility description for conversation list for group conversations -->
-  <!-- Accessibility description for conversation list for failed messages -->
-  <!-- Accessibility name for a group conversation -->
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <!-- Title for the preferences/settings activity -->
-  <!-- Title for the archived conversations activity -->
-  <!-- Action title: Close -->
-  <!-- Preference category: MMS messaging -->
-  <!-- Preference category: Advanced -->
-  <!-- Preference category: Debug -->
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <!-- Title for the notification sound preference -->
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <!-- Preference summary: Current default SMS app -->
-  <!-- Preference title: MMS phone number -->
-  <!-- Display text for phone number preference when the number is unknown -->
-  <!-- Title for the preference for playing a message send sound -->
-  <!-- Strings for dump sms/mms dialog -->
-  <!-- Title of long press menu on an individual message. -->
-  <!-- Menu item to copy message text -->
-  <!-- Title of long press menu for details about an individual message. -->
-  <!-- Title of long press menu for deleting an individual message. -->
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <!-- Title of "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- "Type" value in "Message details" dialog -->
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- Label in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- "Priority" value in "Message details" dialog -->
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <!-- Sender to be used if the sender address has been hidden -->
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <!-- Notifies the user when an attachment fails to load -->
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <!-- Title for the "People and Options" activity -->
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <!-- Title for the phone call button in the action bar that lets the user call a participant in an SMS conversation -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message -->
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <!-- The hint text shown in the message compose input box when photo(s) is attached -->
-  <!-- The hint text shown in the message compose input box when audio recording(s) is attached -->
-  <!-- The hint text shown in the message compose input box when video(s) is attached -->
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <!-- Announcement after the user adds or removes an attachment -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <!-- The format of the subtitle of the help activity. -->
-  <!--  Action menu title to let users view open source license -->
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <!-- Reached MMS message attachment limit -->
-  <!-- Message attachment load failed -->
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- The text shown as a label before the message subject input box -->
-  <!-- When there's a subject in an mms, the subject + message are shown in a notification -->
-  <!-- Text shown on contact VCard when it's being loaded -->
-  <!-- Text shown on contact VCard when it failed to load -->
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <!-- Title for the activity that shows details of VCards -->
-  <!-- VCard label for displaying birthdays -->
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <!-- Title for the message forwarding dialog -->
-  <!-- Title for the message reply dialog -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <!-- Dialog button text that closes the application. -->
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <!-- A message in conversation list view to indicate that the snipit text and preview is from an unsent draft. -->
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <!-- Indicates that the current message will be sent via MMS -->
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <!-- Title of block confirmation dialog -->
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <!-- The title of the list of blocked contacts -->
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <!-- Accessibility toast shown when a message is sending. -->
-  <!-- Accessibility toast shown when a message is sent. -->
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <!-- Accessibility : content description for numbers -->
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <!-- Text prepended to the subject of a forwarded message -->
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <!-- The notification toast text and action button label shown at bottom of screen, for when a new message comes in while the user
-         is in that conversation, but the message list is not scrolled to the bottom -->
-  <!-- Content description for the message images in a conversation or for the image preview in the conversation list if the lastest message in that conversation contains an image-->
-  <!-- Text for a toast message notifying the user that we can't find an appropriate application to handle their request -->
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Label for new message button in share intent dialog -->
-  <!-- Screen title after user selects APNs setting option -->
-  <!-- Edit access point label summary text when no value has been set -->
-  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
-  <!-- Edit access point labels: The actual access point name-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: -->
-  <!-- Edit access point labels: The type of APN -->
-  <!-- Edit access point screen menu option to delete this APN -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- APN error dialog messages: -->
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <!-- APNs screen menu option to reset default APN settings -->
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <!-- Title for Access Point Names settings -->
-  <!-- Title for Access Point Names settings activity -->
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <!-- The title for general settings section in the settings activity  -->
-  <!-- The title for advanced settings section in the settings activity  -->
-  <!-- The title for general settings activity  -->
-  <!-- The title for advanced settings activity  -->
-  <!-- The title for sim_specific settings  -->
-  <!-- The group MMS choices in settings -->
-  <!-- SIM number shown in the settings when the number is not known -->
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <!-- Content description for the SIM selector button in the conversation -->
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <!-- Content description for the audio record view -->
-  <!-- Content description for new conversation button in desktop widget -->
-  <!-- Content description for widget title -->
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <!-- Content description for new message button in desktop widget -->
-  <!-- Content description for conversation list button in desktop widget -->
-  <!-- Shown when loading conversations in the widget -->
-  <!-- Shown when loading messages in the widget -->
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <!-- Toast message telling the user that someone was blocked -->
-  <!-- Toast message telling the user that someone was unblocked -->
-  <!-- Title for attachment chooser activity -->
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <!-- The dialog message content for when the message load failed -->
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <!-- When converting html to text link urls are inlined.  This specifies how the link should be
-    displayed.  For example, a link "click here" which navigates to "www.google.com" would have
-    text="click here" and url="www.google.com", using the below format to create "click here (www.google.com)" -->
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
+    <string name="app_name">ئۇچۇر</string>
+    <string name="share_intent_label">ئۇچۇر</string>
+    <string name="share_intent_activity_label">دىئالوگ تاللاش</string>
+    <string name="action_settings">تەڭشەكلەر</string>
+    <string name="sendButtonContentDescription">ئۇچۇر يوللاڭ</string>
+    <string name="attachMediaButtonContentDescription">قىستۇرما قوشۇش</string>
+    <string name="help_and_feedback_activity_label">ياردەم</string>
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 5cb514b..8cfb5ab 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -16,127 +16,96 @@
     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">Замінювати юнікод</string>
-  <string name="pref_unicode_stripping_leave_intact">Залишити без змін</string>
-  <string name="pref_unicode_stripping_non_encodable">Замінювати символи, які не кодуються</string>
-  <string name="pref_unicode_stripping_all">Замінювати всі символи юнікоду</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">Обмеження SMS-повідомлень</string>
-  <string name="mms_delete_pref_title">Обмеження MMS-повідомлень</string>
-  <string name="set">Встановити</string>
-  <string name="no">Скаcувати</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">Автоматично відкривати спливаючи вікна для вхідних SMS-повідомлень</string>
-  <string name="pref_close_all_title">Закрити все</string>
-  <string name="pref_close_all_summary">Кнопка Закрити закриває всі повідомлення</string>
-  <string name="message_counter">%1$d із %2$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="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>
-  <!-- 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="name">%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"><xliff:g id="used">%1$d</xliff:g> із <xliff:g id="total">%2$d</xliff:g> записів на SIM-карті використано</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>
+    <string name="report_as_spam_to">Відмітити як спам %s</string>
+    <string name="unicode_stripping_pref_title">Замінювати юнікод</string>
+    <string name="pref_unicode_stripping_leave_intact">Залишити без змін</string>
+    <string name="pref_unicode_stripping_non_encodable">Замінювати символи, які не кодуються</string>
+    <string name="pref_unicode_stripping_all">Замінювати всі символи юнікоду</string>
+    <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>
+    <string name="priority_pref_title">Пріоритет надсилання</string>
+    <string name="priority_low">Низький</string>
+    <string name="priority_normal">Звичайний</string>
+    <string name="priority_high">Високий</string>
+    <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">Обмеження SMS-повідомлень</string>
+    <string name="mms_delete_pref_title">Обмеження MMS-повідомлень</string>
+    <string name="set">Встановити</string>
+    <string name="no">Скаcувати</string>
+    <string name="pref_messages_to_save">Встановити кількість повідомлень для збереження</string>
+    <string name="swipe_to_delete_conversation_pref_title">Проведіть для видалення</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Проведіть вправо для видалення бесіди</string>
+    <string name="pref_quickmessage">Швидке повідомлення та відповідь</string>
+    <string name="pref_quickmessage_title">Показати швидке повідомлення</string>
+    <string name="pref_quickmessage_summary">Автоматично відкривати спливаючи вікна для вхідних SMS-повідомлень</string>
+    <string name="pref_close_all_title">Закрити все</string>
+    <string name="pref_close_all_summary">Кнопка Закрити закриває всі повідомлення</string>
+    <string name="message_counter">%1$d із %2$d</string>
+    <string name="button_close">Закрити</string>
+    <string name="button_view">Вигляд</string>
+    <string name="button_templates">Шаблони</string>
+    <string name="qm_button_full_conversation">Повна бесіда</string>
+    <string name="type_to_reply_text_enter_to_send">Введіть текст для відповіді</string>
+    <string name="toast_sending_message">Відправка повідомлення\u2026</string>
+    <string name="qm_quick_reply">Швидка відповідь</string>
+    <string name="send">Надіслати</string>
+    <string name="compose_message_hint_text">Введіть повідомлення</string>
+    <string name="show_emoticons_pref_title">Доступ до емограм</string>
+    <string name="show_emoticons_pref_summary">Показувати кнопку емограм на клавіатурі</string>
+    <string name="select_phone_account_title">Надіслати через</string>
+    <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="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>
+    <string name="sim_empty">На SIM-карті відсутні повідомлення.</string>
+    <string name="menu_send_email">Надіслати листа <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Подзвонити <xliff:g id="name">%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"><xliff:g id="used">%1$d</xliff:g> із <xliff:g id="total">%2$d</xliff:g> записів на SIM-карті використано</string>
+    <string name="confirm_dialog_title">Видалити?</string>
+    <string name="sim_manage_messages_title">Текстові повідомлення на SIM-карті</string>
+    <string name="refreshing">Оновлення\u2026</string>
+    <string name="confirm_delete_selected_messages">Вибрані повідомлення видалені.</string>
+    <string name="delete">Видалити</string>
+    <string name="menu_forward">Переслати</string>
+    <string name="menu_reply">Відповісти</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Копіювати до пам\'яті планшету</string>
+    <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>
+    <string name="yes">ОК</string>
+    <string name="operation_to_card_memory">Копіювати повідомлення на SIM-карту</string>
+    <string name="slot1">SIM 1</string>
+    <string name="slot2">SIM 2</string>
+    <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>
 </resources>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-ur-rPK/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-uz-rUZ/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index bb9cead..1614fc1 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -16,127 +16,96 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="report_as_spam_to">Báo cáo là tin rác cho %s</string>
-  <!-- Strip unicode -->
-  <string name="unicode_stripping_pref_title">Gỡ bỏ unicode</string>
-  <string name="pref_unicode_stripping_leave_intact">Giữ nguyên các ký tự</string>
-  <string name="pref_unicode_stripping_non_encodable">Gỡ bỏ các ký tự không thể mã hóa</string>
-  <string name="pref_unicode_stripping_all">Gỡ bỏ tất cả các ký tự unicode</string>
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <string name="validity_period_pref_title">Thời hạn hiệu lực</string>
-  <string name="validity_period_slot1_pref_title">Thời hạn hiệu lực cho SIM 1</string>
-  <string name="validity_period_slot2_pref_title">Thời hạn hiệu lực cho SIM 2</string>
-  <string name="sms_validity_period_not_set">Không đặt</string>
-  <string name="sms_validity_period_one_hour">1 giờ</string>
-  <string name="sms_validity_period_six_hours">6 giờ</string>
-  <string name="sms_validity_period_twelve_hours">12 giờ</string>
-  <string name="sms_validity_period_one_day">1 ngày</string>
-  <string name="mms_validity_period_two_days">2 ngày</string>
-  <string name="mms_validity_period_one_week">1 tuần</string>
-  <string name="validity_period_maximum">Tối đa</string>
-  <string name="pref_summary_mms_delivery_reports">Yêu cầu báo cáo gửi cho mỗi tin nhắn bạn gửi</string>
-  <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>
-  <string name="priority_normal">Bình thường</string>
-  <string name="priority_high">Cao</string>
-  <!-- Storage specific Settings -->
-  <string name="sms_storage_pref_title">Bộ lưu trữ</string>
-  <string name="pref_summary_auto_delete">Xóa tin nhắn cũ khi đã đạt đến giới hạn</string>
-  <string name="auto_delete_pref_title">Xóa tin nhắn cũ</string>
-  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s </xliff:g> tin nhắn mỗi cuộc trò chuyện</string>
-  <string name="sms_delete_pref_title">Giới hạn tin nhắn văn bản</string>
-  <string name="mms_delete_pref_title">Giới hạn tin nhắn đa phương tiện</string>
-  <string name="set">Đặt</string>
-  <string name="no">Hủy bỏ</string>
-  <string name="pref_messages_to_save">Thiết lập số lượng tin nhắn được lưu</string>
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Vuốt để xóa</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Vuốt sang phải để xóa một cuộc trò chuyện</string>
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage">Nhắn tin và trả lời nhanh</string>
-  <string name="pref_quickmessage_title">Hiện nhắn tin nhanh</string>
-  <string name="pref_quickmessage_summary">Tự động mở cửa sổ bật lên Nhắn tin nhanh đối với các tin nhắn SMS đến</string>
-  <string name="pref_close_all_title">Đóng tất cả</string>
-  <string name="pref_close_all_summary">Nút đóng sẽ đóng tất cả tin nhắn</string>
-  <string name="message_counter">%1$d / %2$d</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">Đóng</string>
-  <string name="button_view">Xem</string>
-  <string name="button_templates">Mẫu</string>
-  <string name="qm_button_full_conversation">Toàn bộ cuộc trò chuyện</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">Nhập để trả lời</string>
-  <!-- QM Toast -->
-  <string name="toast_sending_message">Đang gửi tin nhắn\u2026</string>
-  <!-- QM - Quick reply -->
-  <string name="qm_quick_reply">Trả lời nhanh</string>
-  <string name="send">Gửi</string>
-  <string name="compose_message_hint_text">Nhập tin nhắn</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Truy cập vào biểu tượng cảm xúc</string>
-  <string name="show_emoticons_pref_summary">Hiển thị phím biểu tượng cảm xúc trên bàn phím</string>
-  <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>
+    <string name="report_as_spam_to">Báo cáo là tin rác cho %s</string>
+    <string name="unicode_stripping_pref_title">Gỡ bỏ unicode</string>
+    <string name="pref_unicode_stripping_leave_intact">Giữ nguyên các ký tự</string>
+    <string name="pref_unicode_stripping_non_encodable">Gỡ bỏ các ký tự không thể mã hóa</string>
+    <string name="pref_unicode_stripping_all">Gỡ bỏ tất cả các ký tự unicode</string>
+    <string name="validity_period_pref_title">Thời hạn hiệu lực</string>
+    <string name="validity_period_slot1_pref_title">Thời hạn hiệu lực cho SIM 1</string>
+    <string name="validity_period_slot2_pref_title">Thời hạn hiệu lực cho SIM 2</string>
+    <string name="sms_validity_period_not_set">Không đặt</string>
+    <string name="sms_validity_period_one_hour">1 giờ</string>
+    <string name="sms_validity_period_six_hours">6 giờ</string>
+    <string name="sms_validity_period_twelve_hours">12 giờ</string>
+    <string name="sms_validity_period_one_day">1 ngày</string>
+    <string name="mms_validity_period_two_days">2 ngày</string>
+    <string name="mms_validity_period_one_week">1 tuần</string>
+    <string name="validity_period_maximum">Tối đa</string>
+    <string name="pref_summary_mms_delivery_reports">Yêu cầu báo cáo gửi cho mỗi tin nhắn bạn gửi</string>
+    <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>
+    <string name="priority_pref_title">Ưu tiên gửi</string>
+    <string name="priority_low">Thấp</string>
+    <string name="priority_normal">Bình thường</string>
+    <string name="priority_high">Cao</string>
+    <string name="sms_storage_pref_title">Bộ lưu trữ</string>
+    <string name="pref_summary_auto_delete">Xóa tin nhắn cũ khi đã đạt đến giới hạn</string>
+    <string name="auto_delete_pref_title">Xóa tin nhắn cũ</string>
+    <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s </xliff:g> tin nhắn mỗi cuộc trò chuyện</string>
+    <string name="sms_delete_pref_title">Giới hạn tin nhắn văn bản</string>
+    <string name="mms_delete_pref_title">Giới hạn tin nhắn đa phương tiện</string>
+    <string name="set">Đặt</string>
+    <string name="no">Hủy bỏ</string>
+    <string name="pref_messages_to_save">Thiết lập số lượng tin nhắn được lưu</string>
+    <string name="swipe_to_delete_conversation_pref_title">Vuốt để xóa</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Vuốt sang phải để xóa một cuộc trò chuyện</string>
+    <string name="pref_quickmessage">Nhắn tin và trả lời nhanh</string>
+    <string name="pref_quickmessage_title">Hiện nhắn tin nhanh</string>
+    <string name="pref_quickmessage_summary">Tự động mở cửa sổ bật lên Nhắn tin nhanh đối với các tin nhắn SMS đến</string>
+    <string name="pref_close_all_title">Đóng tất cả</string>
+    <string name="pref_close_all_summary">Nút đóng sẽ đóng tất cả tin nhắn</string>
+    <string name="message_counter">%1$d / %2$d</string>
+    <string name="button_close">Đóng</string>
+    <string name="button_view">Xem</string>
+    <string name="button_templates">Mẫu</string>
+    <string name="qm_button_full_conversation">Toàn bộ cuộc trò chuyện</string>
+    <string name="type_to_reply_text_enter_to_send">Nhập để trả lời</string>
+    <string name="toast_sending_message">Đang gửi tin nhắn\u2026</string>
+    <string name="qm_quick_reply">Trả lời nhanh</string>
+    <string name="send">Gửi</string>
+    <string name="compose_message_hint_text">Nhập tin nhắn</string>
+    <string name="show_emoticons_pref_title">Truy cập vào biểu tượng cảm xúc</string>
+    <string name="show_emoticons_pref_summary">Hiển thị phím biểu tượng cảm xúc trên bàn phím</string>
+    <string name="select_phone_account_title">Gửi bằng</string>
+    <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>
+    <string name="sim_empty">Không có tin nhắn trên thẻ SIM.</string>
+    <string name="menu_send_email">Gửi email đến <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">Gọi <xliff:g id="name">%s</xliff:g></string>
+    <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>
+    <string name="confirm_dialog_title">Xóa?</string>
+    <string name="sim_manage_messages_title">Tin nhắn văn bản trên thẻ SIM</string>
+    <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>
+    <string name="delete">Xóa</string>
+    <string name="menu_forward">Chuyển tiếp</string>
+    <string name="menu_reply">Trả lời</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">Sao chép vào bộ nhớ máy tính bảng</string>
+    <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>
+    <string name="yes">OK</string>
+    <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>
+    <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>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 7a05318..f09f95f 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -16,127 +16,96 @@
     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_close_all_title">全部关闭</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="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>
-  <!-- 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="name">%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="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>
-  <!-- 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>
+    <string name="report_as_spam_to">报告为垃圾信息至 %s</string>
+    <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>
+    <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>
+    <string name="priority_pref_title">发送优先级</string>
+    <string name="priority_low">低</string>
+    <string name="priority_normal">一般</string>
+    <string name="priority_high">高</string>
+    <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>
+    <string name="swipe_to_delete_conversation_pref_title">滑动删除邮件</string>
+    <string name="swipe_to_delete_conversation_pref_summary">向右滑动以删除会话</string>
+    <string name="pref_quickmessage">快速信息和答复</string>
+    <string name="pref_quickmessage_title">显示快速信息</string>
+    <string name="pref_quickmessage_summary">为传入短信自动打开快速信息窗口</string>
+    <string name="pref_close_all_title">全部关闭</string>
+    <string name="pref_close_all_summary">\'关闭\' 按钮将关闭所有的消息</string>
+    <string name="message_counter">%2$d 中的 %1$d</string>
+    <string name="button_close">关闭</string>
+    <string name="button_view">查看</string>
+    <string name="button_templates">模板</string>
+    <string name="qm_button_full_conversation">完整的会话</string>
+    <string name="type_to_reply_text_enter_to_send">键入信息</string>
+    <string name="toast_sending_message">正在发送信息\u2026</string>
+    <string name="qm_quick_reply">快速回复</string>
+    <string name="send">发送</string>
+    <string name="compose_message_hint_text">输入消息</string>
+    <string name="show_emoticons_pref_title">访问表情符号</string>
+    <string name="show_emoticons_pref_summary">在键盘上显示表情符号键</string>
+    <string name="select_phone_account_title">发送方式</string>
+    <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="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>
+    <string name="sim_empty">SIM 卡中无信息。</string>
+    <string name="menu_send_email">发送电子邮件到 <xliff:g id="name">%s</xliff:g></string>
+    <string name="menu_call_back">呼叫 <xliff:g id="name">%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="used">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> 项</string>
+    <string name="confirm_dialog_title">确定删除？</string>
+    <string name="sim_manage_messages_title">SIM 卡中的信息</string>
+    <string name="refreshing">正在刷新\u2026</string>
+    <string name="confirm_delete_selected_messages">选中的信息将被删除。</string>
+    <string name="delete">删除</string>
+    <string name="menu_forward">前进</string>
+    <string name="menu_reply">回复</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">复制到平板电脑存储</string>
+    <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>
+    <string name="yes">确定</string>
+    <string name="operation_to_card_memory">将信息复制到 SIM 卡</string>
+    <string name="slot1">SIM 卡 1</string>
+    <string name="slot2">SIM 卡 2</string>
+    <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>
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index e571b3e..cbc1918 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -16,42 +16,11 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <string name="pref_quickmessage_summary">自動打開 QuickMessage 快顯視窗檢視新訊息</string>
-  <string name="pref_close_all_title">全部關閉</string>
-  <string name="pref_close_all_summary">關閉按鈕關閉所有訊息</string>
-  <!-- QM Dialog box buttons -->
-  <string name="button_close">關閉</string>
-  <string name="button_view">檢視</string>
-  <string name="button_templates">範本</string>
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <string name="type_to_reply_text_enter_to_send">輸入答覆</string>
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="pref_quickmessage_summary">自動打開 QuickMessage 快顯視窗檢視新訊息</string>
+    <string name="pref_close_all_title">全部關閉</string>
+    <string name="pref_close_all_summary">關閉按鈕關閉所有訊息</string>
+    <string name="button_close">關閉</string>
+    <string name="button_view">檢視</string>
+    <string name="button_templates">範本</string>
+    <string name="type_to_reply_text_enter_to_send">輸入答覆</string>
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 5c11630..62bf52a 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -16,127 +16,96 @@
     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_close_all_title">全部關閉</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>
+    <string name="report_as_spam_to">報告為垃圾郵件至 %s</string>
+    <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>
+    <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>
+    <string name="priority_pref_title">傳送優先權</string>
+    <string name="priority_low">低</string>
+    <string name="priority_normal">一般</string>
+    <string name="priority_high">高</string>
+    <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>
+    <string name="swipe_to_delete_conversation_pref_title">滑動刪除</string>
+    <string name="swipe_to_delete_conversation_pref_summary">向右滑動即可刪除對話</string>
+    <string name="pref_quickmessage">快速訊息和回覆</string>
+    <string name="pref_quickmessage_title">顯示快速訊息</string>
+    <string name="pref_quickmessage_summary">將接收的簡訊訊息自動彈出快速訊息視窗</string>
+    <string name="pref_close_all_title">全部關閉</string>
+    <string name="pref_close_all_summary">關閉按鍵會關閉所有訊息</string>
+    <string name="message_counter">%2$d 的 %1$d</string>
+    <string name="button_close">關閉</string>
+    <string name="button_view">檢視</string>
+    <string name="button_templates">範本</string>
+    <string name="qm_button_full_conversation">完整的對話</string>
+    <string name="type_to_reply_text_enter_to_send">輸入即可回覆</string>
+    <string name="toast_sending_message">正在傳送訊息\u2026</string>
+    <string name="qm_quick_reply">快速回覆</string>
+    <string name="send">傳送</string>
+    <string name="compose_message_hint_text">輸入訊息</string>
+    <string name="show_emoticons_pref_title">表情符號使用</string>
+    <string name="show_emoticons_pref_summary">在鍵盤上顯示表情符號按鍵</string>
+    <string name="select_phone_account_title">傳送方式</string>
+    <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>
+    <string name="sim_empty">SIM 卡裡沒有訊息</string>
+    <string name="menu_send_email">傳送電子郵件至<xliff:g id="number">%s</xliff:g></string>
+    <string name="menu_call_back">打給<xliff:g id="name">%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="confirm_dialog_title">刪除？</string>
+    <string name="sim_manage_messages_title">SIM 卡上的訊息</string>
+    <string name="refreshing">重新整理中\u2026</string>
+    <string name="confirm_delete_selected_messages">已選擇的訊息將被刪除。</string>
+    <string name="delete">刪除</string>
+    <string name="menu_forward">轉寄</string>
+    <string name="menu_reply">回覆</string>
+    <string name="sim_copy_to_phone_memory" product="tablet">複製到平板電腦記憶體</string>
+    <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>
+    <string name="yes">確定</string>
+    <string name="operation_to_card_memory">複製訊息至 SIM 卡</string>
+    <string name="slot1">SIM 卡 1</string>
+    <string name="slot2">SIM 卡 2</string>
+    <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>
 </resources>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
deleted file mode 100644
index d7cf535..0000000
--- a/res/values-zu/cm_strings.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-    Copyright (C) 2015-2016 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Strip unicode -->
-  <!-- Settings item description for SMS and MMS Validity period -->
-  <!-- Item Descriptions for MMS sending Priority -->
-  <!-- Storage specific Settings -->
-  <!-- Swipe to delete conversation -->
-  <!-- QUICKMESSAGE SUPPORT -->
-  <!-- Preferences -->
-  <!-- QM Dialog box buttons -->
-  <!-- Hint text in message body field when keyboard is exposed -->
-  <!-- QM Toast -->
-  <!-- QM - Quick reply -->
-  <!-- Show emoticons -->
-  <!-- Copy message to sim -->
-  <!-- Settings item for entering SIM card message screen -->
-  <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
-  <!-- Context menu item on an individual message for emailing the sender -->
-  <!-- Context menu item on an individual message for dialing the sender's phone number -->
-  <!-- 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] -->
-  <!-- Confirm Delete -->
-  <!-- Delete confirmation dialog title -->
-  <!-- Title of screen displaying messages on SIM card -->
-  <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <!-- Delete button title -->
-  <!-- Context menu item on an individual message for forwarding it to another recipient -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Menu title to copy a selected message from the SIM card to the phone. -->
-  <!-- Text to be used for affirmative response button in dialog boxes -->
-  <!-- Copy message to sim -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>