Automatic translation import

Change-Id: I5ff6617b3a665267561c09a09d54054de2976576

119 files changed, 1761 insertions, 6993 deletions

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 9faf645..0930ed6 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Emosieikone toegang</string>
-  <string name="show_emoticons_pref_summary">Wys emosieikone sleutel op die sleutelbord</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">Geselekteerde oudio</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Tik om te kies</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> gekies</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="show_emoticons_pref_title">Emosieikone toegang</string>
+    <string name="show_emoticons_pref_summary">Wys emosieikone sleutel op die sleutelbord</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">Geselekteerde oudio</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Tik om te kies</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 d6c34bc..0000000
--- a/res/values-am/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 1fbb933..bc8a4b4 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -16,11 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">تمرير لإجراء حذف</string>
-  <string name="swipe_to_delete_conversation_pref_summary">تمرير إلى اليمين لحذف محادثة</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">الوصول إلى التعبيرات</string>
-  <string name="show_emoticons_pref_summary">إظهار مفتاح التعبيرات على لوحة المفاتيح</string>
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="swipe_to_delete_conversation_pref_title">تمرير لإجراء حذف</string>
+    <string name="swipe_to_delete_conversation_pref_summary">تمرير إلى اليمين لحذف محادثة</string>
+    <string name="show_emoticons_pref_title">الوصول إلى التعبيرات</string>
+    <string name="show_emoticons_pref_summary">إظهار مفتاح التعبيرات على لوحة المفاتيح</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 9b0c2d9..73b5d85 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -16,11 +16,8 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
   <string name="swipe_to_delete_conversation_pref_title">মচি পেলাবলৈ স্ৱাইপ কৰক</string>
   <string name="swipe_to_delete_conversation_pref_summary">কথোপকথন মচিবলৈ সোঁ ফাললৈ স্ৱাইপ কৰক</string>
-  <!-- Show emoticons -->
   <string name="show_emoticons_pref_title">ইমটিকনৰ অনুমতি</string>
   <string name="show_emoticons_pref_summary">ইমটিকনৰ কীটো কীবৰ্ডত দেখাওক</string>
-  <!-- Audio Library Tab for MMS attachments -->
 </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 04de1e0..2ffd1f8 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -16,11 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_summary">Amuesa la tecla de fustaxes nel tecláu</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_galleryChooserDescription_cm">Escueyi imáxenes o vídeos d\'esti preséu</string>
-  <string name="mediapicker_audio_list_item_selected_content_description">Audiu esbilláu</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Calca pa esbillar</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="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="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">Audiu esbilláu</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Calca pa esbillar</string>
+    <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> esbillaos</string>
 </resources>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index a373551..d1b5f82 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -16,411 +16,502 @@
     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 -->
-  <string name="contact_picker_all_contacts_tab_title">Tolos contautos</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" -->
-  <!-- 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 -->
-  <string name="sms_storage_low_title">Ta escosando l\'almacenamientu</string>
-  <!-- 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. -->
-  <string name="message_status_send_failed">Nun s\'unvió. Toca pa tentalo de nueves.</string>
-  <!-- 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. -->
-  <string name="message_status_download_failed">Calca pa tentalo de nueves</string>
-  <!-- Timestamp line for MMS which failed to download. -->
-  <string name="message_status_download">Calca pa baxar</string>
-  <!-- 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. -->
-  <string name="no_subject">(Nun hai asuntu)</string>
-  <!-- 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 -->
-  <string name="notification_emergency_send_failure_line2">
-        Llama a los servicios d\'emerxencia, por favor. Nesti momentu nun
+    <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">Calca pa tentalo de nueves</string>
+    <string name="message_status_download">Calca pa baxar</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>
-  <!-- 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") -->
-  <string name="attachment_more_items">+<xliff:g id="count">%d</xliff:g></string>
-  <!-- Failed to start recording audio -->
-  <!-- Failed to replay recorded audio -->
-  <!-- Error occurred while recording audio -->
-  <string name="audio_recording_error"> Nun pudo guardase l\'audiu. Volvi tentalo.</string>
-  <!-- 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 -->
-  <!-- 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] -->
-  <!-- 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 -->
-  <string name="failed_message_content_description">Fallu al unviar el mensaxe. Calca pa retentar.</string>
-  <!-- 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 -->
-  <string name="default_sms_app"><xliff:g id="app_name">%s</xliff:g></string>
-  <!-- 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 name="plus_one">+1</string>
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <string name="plus_n">+%d</string>
-  <!-- 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 -->
-  <string name="content_description_for_number_zero">Cero</string>
-  <!-- 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-->
-  <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">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 -->
-  <string name="apn_settings">APNs</string>
-  <!-- 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  -->
-  <string name="sim_specific_settings">SIM «<xliff:g id="sim_name">%s</xliff:g>»</string>
-  <!-- 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 -->
-  <string name="tap_to_configure">Desanicióse la conversación. Calca p\'amosar una conversación diferente de Mensaxes</string>
-  <!-- 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 -->
+    <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="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">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="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">Desanicióse la conversación. Calca p\'amosar una conversación diferente 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
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-az-rAZ/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-be-rBY/cm_strings.xml b/res/values-be-rBY/cm_strings.xml
index 7b8c2eb..82b32f4 100644
--- a/res/values-be-rBY/cm_strings.xml
+++ b/res/values-be-rBY/cm_strings.xml
@@ -16,13 +16,10 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Доступ да смайлаў</string>
-  <string name="show_emoticons_pref_summary">Паказаць смайлы на клавіятуры</string>
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_audio_list_item_selected_content_description">Абранае аўдыё</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Краніся, каб абраць</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="show_emoticons_pref_title">Доступ да смайлаў</string>
+    <string name="show_emoticons_pref_summary">Паказаць смайлы на клавіятуры</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Абранае аўдыё</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Краніся, каб абраць</string>
 </resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 1d97ea7..977377c 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Бързо изтриване</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Плъзнете от ляво надясно за да изтриете кореспонденцията</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Достъп до емотикони</string>
-  <string name="show_emoticons_pref_summary">Показва клавиш с емотикони на клавиатурата</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="swipe_to_delete_conversation_pref_title">Бързо изтриване</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Плъзнете от ляво надясно за да изтриете кореспонденцията</string>
+    <string name="show_emoticons_pref_title">Достъп до емотикони</string>
+    <string name="show_emoticons_pref_summary">Показва клавиш с емотикони на клавиатурата</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
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-bn-rBD/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-bs-rBA/cm_strings.xml b/res/values-bs-rBA/cm_strings.xml
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-bs-rBA/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 6daa89a..19fe8d5 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">So seleccionat</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Pica per seleccionar</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> seleccionat</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="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="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">So seleccionat</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Pica per seleccionar</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 736cde6..a92b59d 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Vybraný zvuk</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Dotykem vybrat</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> vybrán</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="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="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">Vybraný zvuk</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Dotykem vybrat</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 b157ace..1b3733d 100644
--- a/res/values-cy/arrays.xml
+++ b/res/values-cy/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>dim pwnc</item>
-    <item>dimpwnc</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>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>
+    <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 d6c34bc..e38fb7b 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -16,7 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
+    <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="show_emoticons_pref_title">Mynediad at wenogluniau</string>
+    <string name="show_emoticons_pref_summary">Dangos y fysell gwenogluniau ar y bysellfwrdd</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">Sain a ddewiswyd</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Tapia i ddewis</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 88e05b9..aa8563a 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -16,946 +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 -->
-  <string name="app_name">Negesu</string>
-  <!-- The name of the application as it appears in external share intent dialogs -->
-  <string name="share_intent_label">Negesu</string>
-  <!-- The title when selecting a conversation to share to -->
-  <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>
-  <!-- Inform user of the names of permissions that are required to use the app -->
-  <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>
-  <!-- The tab header for the frequently used contacts list -->
-  <string name="contact_picker_frequents_tab_title">Cysylltiadau aml</string>
-  <!-- The tab header for all contacts list -->
-  <string name="contact_picker_all_contacts_tab_title">Pob cyswllt</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" -->
-  <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>
-  <!-- example: "image January 17 2015 1 59 pm" -->
-  <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">"Yn awr"</string>
-  <string name="posted_now">"Nawr"</string>
-  <!-- Abbreviated message to express that something occurred some number of minutes in the past (e.g., 5 minutes ago). -->
-  <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>
-  <!-- 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="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>
-  <!-- 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="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 used for the duration in free sms storage action and confirm strings above
-        Example: "Delete messages older than a week"
-    -->
-  <plurals name="week_count">
-    <item quantity="zero"><xliff:g id="count">%d</xliff:g> wythnosau</item>
-    <!-- Singular case -->
-    <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>
-    <!-- Plural case -->
-    <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>
-    <!-- Singular case -->
-    <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>
-    <!-- Plural case -->
-    <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>
-    <!-- Singular case -->
-    <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>
-    <!-- Plural case -->
-    <item quantity="other"><xliff:g id="count">%d</xliff:g> blwyddyn</item>
-  </plurals>
-  <!-- Title of the class-0 message activity. -->
-  <string name="class_0_message_activity">Neges dosbarth 0</string>
-  <string name="save">Cadw</string>
-  <!-- Text for SMS storage low text, when auto delete is enabled -->
-  <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>
-  <!-- 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 -->
-  <string name="sms_storage_low_title">Yn rhedeg yn brin o le storio</string>
-  <!-- Text for SMS storage low notification and dialog -->
-  <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>
-  <!-- Ticker for SMS storage low notification -->
-  <string name="sms_storage_low_notification_ticker">Nid oes lawer o le i storio SMS. Mae\'n bosib bydd rhaid dileu negeseuon.</string>
-  <!-- Title for asking the user to enter their phone number -->
-  <string name="enter_phone_number_title">Cadarnha dy rif ffôn</string>
-  <!-- Text for asking the user to enter their phone number -->
-  <string name="enter_phone_number_text">Bydd y cam un tro yma yn sicrhau bod Negesu yn anfon dy negeseuon grwpiau yn gywir.</string>
-  <!-- EditText hint for asking the user to enter their phone number -->
-  <string name="enter_phone_number_hint">Rhif ffôn</string>
-  <!-- Free SMS storage actions -->
-  <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>
-  <!-- Free SMS storage action confirm dialog message -->
-  <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>
-  <!-- ####### Strings to support the mms/sms service ####### -->
-  <!-- Prefix for accessibility to indicate who the sender of a plain text message is. -->
-  <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>
-  <!-- Prefix for accessibility to indicate who the sender of text with hyperlinks, an attachment, or yet-to-be-downloaded message is. -->
-  <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>
-  <!-- While sending a message display this message. -->
-  <string name="message_status_sending">Yn anfon&#8230;</string>
-  <!-- When sending a message failed display this message. -->
-  <string name="message_status_send_failed">Heb ei hanfon. Tara i geisio eto.</string>
-  <!-- When retrying sending for a message. -->
-  <string name="message_status_send_retrying">Heb ei hanfon. Yn ceisio eto&#8230;</string>
-  <!-- When showing resend action display this message. -->
-  <string name="message_status_resend">Ail-anfon neu ddileu</string>
-  <!-- When sending a message to an emergency number failed display this message in the conversation. -->
-  <string name="message_status_send_failed_emergency_number">Gwna alwad llais i\'r gwasanaethau brys. Dyw dy neges destun heb ei hanfon ar hyn o bryd.</string>
-  <!-- When showing resend action, display this message. -->
-  <string name="message_status_failed">Wedi methu</string>
-  <!-- Title line for an MMS requiring manual download. -->
-  <string name="message_title_manual_download">Neges MMS newydd i\'w lawrlwytho</string>
-  <!-- Title line for an MMS auto-downloading. -->
-  <string name="message_title_downloading">Neges MMS newydd</string>
-  <!-- Title line for MMS which failed to download. -->
-  <string name="message_title_download_failed">Methwyd â lawrlwytho</string>
-  <!-- Timestamp line for MMS which failed to download. -->
-  <string name="message_status_download_failed">Tara i geisio eto</string>
-  <!-- Timestamp line for MMS which failed to download. -->
-  <string name="message_status_download">Tara i lawrlwytho</string>
-  <!-- Timestamp line for MMS which is selected. -->
-  <string name="message_status_download_action">Lawrlwytho neu ddileu</string>
-  <!-- Timestamp line to display while downloading a message. -->
-  <string name="message_status_downloading">Yn lawrlwytho&#8230;</string>
-  <!-- Timestamp line for MMS for expired or invalid message. -->
-  <string name="message_status_download_error">Neges wedi dod i ben neu ddim ar gael</string>
-  <!-- Display this info line with an MMS notification -->
-  <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>
-  <!-- While sending a message, if it has invalid recipient, display this message. -->
-  <string name="invalid_destination">Methu ag anfon. Derbynnydd annilys.</string>
-  <!-- While sending a message, this error is expected to be generated when user does not have
-         MMS enabled on his account. [CHAR LIMIT=NONE] -->
-  <string name="service_not_activated">Gwasanaeth heb ei actifadu ar y rhwydwaith</string>
-  <!-- If a message can't be sent because of a MMSC network problem, show this toast. [CHAR LIMIT=NONE] -->
-  <string name="service_network_problem">Methwyd ag anfon o achos problem rhwydwaith</string>
-  <!-- If a message has expired and is no longer available on MMSC, show this toast. [CHAR LIMIT=NONE] -->
-  <string name="service_message_not_found">Neges wedi dod i ben neu ddim ar gael</string>
-  <!-- Download Manager -->
-  <!-- When an error occurs downloading a new message and a subject isn't available, substitute
-         this default subject. -->
-  <string name="no_subject">(Dim pwnc)</string>
-  <!-- When an error occurs downloading a new message and the sender is unknown, substitute
-         this default text. -->
-  <string name="unknown_sender">Anfonwr anhysbys</string>
-  <string name="delivered_status_content_description">Wedi\'i derbyn</string>
-  <!-- When an error occurs downloading a new message, display this message.
-         An example: Download of message Wanna get pizza from dorkman was unsuccessful. -->
-  <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>
-  <!-- When a database error occurs due to low memory this toast is shown. -->
-  <string name="low_memory">Methwyd â chwblhau weithred y gronfa ddata gan nad oed digon o gof</string>
-  <!-- notification line 1 for "there are some failed messages" -->
-  <string name="notification_send_failures_line1_singular">Neges heb ei anfon</string>
-  <!-- notification line 1 for "there are some failed messages" -->
-  <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>
-  <!-- notification line 1 for download failed -->
-  <string name="notification_download_failures_line1_singular">Neges heb ei lawrlwytho</string>
-  <!-- notification line 1 for multiple downloads failed -->
-  <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>
-  <!-- Notification title when emergency SMS (e.g. to 911) fails to send -->
-  <string name="notification_emergency_send_failure_line1">Neges at <xliff:g id="number">%1$s</xliff:g> heb ei hanfon</string>
-  <!-- Notification content when emergency SMS fails to send -->
-  <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 hanfon ar hyn o bryd.    </string>
-  <!-- notification line 1 for new message notification on the lock screen -->
-  <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>
-  <!-- Text for starting a new conversation button in the compose UI -->
-  <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>
-  <!-- Error message when we are unable to write a picture or video file because of an error writing to storage (usually because insufficient space) -->
-  <string name="camera_error_storage_fail">Methu â chadw\'r cyfrwng</string>
-  <string name="camera_error_failure_taking_picture">Methu â chymryd llun</string>
-  <!-- Content description text for Back button on the action bar -->
-  <string name="back">Nôl</string>
-  <!-- Action menu title for showing archived conversations -->
-  <string name="action_menu_show_archived">Wedi\'u harchifo</string>
-  <!-- Action menu title for deleting selected conversations in conversation list -->
-  <string name="action_delete">Dileu</string>
-  <!-- Action menu title for archiving selected conversations in conversation list -->
-  <string name="action_archive">Archifo</string>
-  <!-- Action menu title for unarchiving selected conversations in conversation list -->
-  <string name="action_unarchive">Tynnu o\'r archif</string>
-  <!-- Action menu title for turning off notification for the selected conversations in conversation list -->
-  <string name="action_notification_off">Troi hysbysiadau i ffwrdd</string>
-  <!-- Action menu title for turning on notification for the selected conversations in conversation list -->
-  <string name="action_notification_on">Troi hysbysiadau ymlaen</string>
-  <!-- Action menu title for adding the contacts for the selected conversations in conversation list -->
-  <string name="action_add_contact">Ychwanegu cyswllt</string>
-  <!-- Action menu title for downloading failed message selected in conversation -->
-  <string name="action_download">Lawrlwytho</string>
-  <!-- Action menu title for sending failed message selected in conversation -->
-  <string name="action_send">Anfon</string>
-  <!-- Action menu title for deleting failed message selected in conversation -->
-  <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>
-  <!-- Alert dialog title to accept or decline deleting conversation(s). -->
-  <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>
-  <!-- Alert dialog accept deleting this conversation button. -->
-  <string name="delete_conversation_confirmation_button">Dileu</string>
-  <!-- Alert dialog decline deleting this conversation button. -->
-  <string name="delete_conversation_decline_button">Diddymu</string>
-  <!-- Hint text for the recipient chips text box when it's empty -->
-  <string name="recipient_hint">At</string>
-  <!-- Action menu title for multiple selection in gallery image picker -->
-  <string name="action_multiselect">Dewis mwy nag un ddelwedd</string>
-  <!-- Action menu title for confirming multiple selection in gallery image picker -->
-  <string name="action_confirm_multiselect">Cadarnhau\'r dewis</string>
-  <!-- Text for showing there are more items in the attachments than is shown (e.g. "+2") -->
-  <string name="attachment_more_items">+<xliff:g id="count">%d</xliff:g></string>
-  <!-- Failed to start recording audio -->
-  <string name="audio_recording_start_failed">Methu â recordio sain. Ceisia eto.</string>
-  <!-- Failed to replay recorded audio -->
-  <string name="audio_recording_replay_failed">Methu â chwarae sain. Ceisia eto.</string>
-  <!-- Error occurred while recording audio -->
-  <string name="audio_recording_error">Methwyd â chadw sain. Ceisia eto.</string>
-  <!-- Hint text on the audio recorder that instructs user how to start recording -->
-  <string name="audio_picker_hint_text">Taro a dal</string>
-  <!-- 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">Llun</string>
-  <!-- Shown in notifications when there's an audio clip. [CHAR LIMIT=25] -->
-  <string name="notification_audio">Clip sain</string>
-  <!-- Shown in notifications when there's a video. [CHAR LIMIT=25] -->
-  <string name="notification_video">Fideo</string>
-  <!-- Shown in notifications when there's a vcard. [CHAR LIMIT=25] -->
-  <string name="notification_vcard">Cerdyn cyswllt</string>
-  <!-- Notification action label for download MMS when set to manual downloads. [CHAR LIMIT=15] -->
-  <string name="notification_download_mms">Lawrlwytho</string>
-  <!-- Notification action label for SMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <string name="notification_reply_via_sms">Ateb trwy SMS</string>
-  <!-- Notification action label for MMS reply (visible on wearable device only). [CHAR LIMIT=15] -->
-  <string name="notification_reply_via_mms">Ateb trwy MMS</string>
-  <!-- Notification voice reply prompt (visible on wearable device only). [CHAR LIMIT=15] -->
-  <string name="notification_reply_prompt">Ateb</string>
-  <!-- The bottom line on a wearable notification that shows how many participants in the conversation -->
-  <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>
-  <!-- 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). -->
-  <string name="unknown_self_participant">Fi</string>
-  <!-- The text of the toast/snack message shown when a contact is blocked -->
-  <string name="blocked_toast_message">Cyswllt wedi\'i rwystro a\'i archifo</string>
-  <!-- The text of the toast/snack message shown when a contact is unblocked -->
-  <string name="unblocked_toast_message">Cyswllt wedi\'i dadrwystro a\'i dynnu o\'r archif</string>
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are archived.
-         Displays the number of converstions archived -->
-  <string name="archived_toast_message"><xliff:g id="count">%d</xliff:g> wedi\'u harchifo</string>
-  <!-- The text of the toast/snack message shown when the selected conversation(s) are unarchived.
-         Displays the number of conversations unarchived -->
-  <string name="unarchived_toast_message"><xliff:g id="count">%d</xliff:g> wedi\'u dad-archifo</string>
-  <!-- The text of the toast/snack message shown when a notifications turned off for selected conversations -->
-  <string name="notification_off_toast_message">Hysbysiadau i ffwrdd</string>
-  <!-- The text of the toast/snack message shown when a notifications turned on for selected conversations -->
-  <string name="notification_on_toast_message">Hysbysiadau ymlaen</string>
-  <!-- Toast shown when the user tries to send a message, and then sets Bugle as the default SMS app. -->
-  <string name="toast_after_setting_default_sms_app_for_message_send">Yn barod. Tara Anfon unwaith eto.</string>
-  <!-- Toast shown when the user successfully sets Bugle as the default SMS app. -->
-  <string name="toast_after_setting_default_sms_app">Gosodwyd Negesu fel yr ap rhagosodedig ar gyfer SMS.</string>
-  <!-- Accessibility : Content descriptinon for ImageButtons and ImageViews -->
-  <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>
-  <!-- Accessibility announcement for an incoming message -->
-  <string name="incoming_message_announcement">Neges oddi wrth <xliff:g id="sender">%s</xliff:g>: <xliff:g id="message">%s</xliff:g>.</string>
-  <!-- Accessibility description for conversation list for 1:1 conversations -->
-  <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 hanfon 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>
-  <!-- Accessibility description for conversation list for group conversations -->
-  <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 hanfon 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>
-  <!-- Accessibility description for conversation list for failed messages -->
-  <string name="failed_message_content_description">Methodd y neges. Tara i geisio eto.</string>
-  <!-- Accessibility name for a group conversation -->
-  <string name="group_conversation_description">Sgwrs gyda <xliff:g id="participants">%s</xliff:g></string>
-  <!-- Accessibility : text read on the small X icon on the subject editor -->
-  <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 llawn</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>
-  <!-- Description shown in the download manager for an attachment that the user manually saved -->
-  <string name="attachment_file_description">Atodiad MMS wedi\'i gadw</string>
-  <!-- Title for the preferences/settings activity -->
-  <string name="settings_activity_title">Gosodiadau</string>
-  <!-- Title for the archived conversations activity -->
-  <string name="archived_activity_title">Wedi\'u harchifo</string>
-  <!-- Action title: Close -->
-  <string name="action_close">Cau</string>
-  <!-- Preference category: MMS messaging -->
-  <string name="mms_messaging_category_pref_title">MMS</string>
-  <!-- Preference category: Advanced -->
-  <string name="advanced_category_pref_title">Uwch</string>
-  <!-- Preference category: Debug -->
-  <string name="debug_category_pref_title">Dadfygio</string>
-  <!-- Title for the preference for whether or to notify the user of new messages -->
-  <string name="notifications_enabled_pref_title">Hysbysiadau</string>
-  <!-- Title for the notification sound preference -->
-  <string name="notification_sound_pref_title">Sain</string>
-  <!-- What to display in the settings screen for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
-  <string name="silent_ringtone">Distaw</string>
-  <!-- Title for the preference for whether or not to vibrate with notifications -->
-  <string name="notification_vibrate_pref_title">Dirgrynu</string>
-  <string name="blocked_pref_title">Wedi\'i rhwystro</string>
-  <!-- Title for the preference for whether or not to request/show delivery reports for SMS -->
-  <string name="delivery_reports_pref_title">Adroddiadau danfon SMS</string>
-  <string name="delivery_reports_pref_summary">Gofyn am adroddiad ar gyfer pob SMS wyt ti\'n ei anfon i gadarnhau ei bod wedi cyrraedd.</string>
-  <string name="auto_retrieve_mms_pref_title">Awto-adfer</string>
-  <string name="auto_retrieve_mms_pref_summary">Nôl negeseuon MMS yn awtomatig</string>
-  <!-- Title for the preference for whether or not to auto-retrieve MMS when roaming -->
-  <string name="auto_retrieve_mms_when_roaming_pref_title">Awto adfer 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>
-  <!-- Preference title: SMS disabled (Messaging is not default SMS app) -->
-  <string name="sms_disabled_pref_title">Ap SMS rhagosodedig</string>
-  <!-- Preference title: SMS enabled (Messaging is the default SMS app) -->
-  <string name="sms_enabled_pref_title">Ap SMS rhagosodedig</string>
-  <!-- Preference summary: Current default SMS app -->
-  <string name="default_sms_app"><xliff:g id="app_name">%s</xliff:g></string>
-  <!-- Preference title: MMS phone number -->
-  <string name="mms_phone_number_pref_title">Dy rif ffôn</string>
-  <!-- Display text for phone number preference when the number is unknown -->
-  <string name="unknown_phone_number_pref_display_value">Anhysybys</string>
-  <!-- Title for the preference for playing a message send sound -->
-  <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>
-  <!-- Strings for dump sms/mms dialog -->
-  <string name="wireless_alerts_title">Hysbysiadau di-wifr</string>
-  <!-- Title of long press menu on an individual message. -->
-  <string name="message_context_menu_title">Dewisiadau neges</string>
-  <!-- Menu item to copy message text -->
-  <string name="message_context_menu_copy_text">Copïo\'r testun</string>
-  <!-- Title of long press menu for details about an individual message. -->
-  <string name="message_context_menu_view_details">Gweld manylion</string>
-  <!-- Title of long press menu for deleting an individual message. -->
-  <string name="message_context_menu_delete_message">Dileu</string>
-  <!-- Title of long press menu for forwarding an individual message. -->
-  <string name="message_context_menu_forward_message">Anfon ymlaen</string>
-  <!-- Title of "Message details" dialog -->
-  <string name="message_details_title">Manylion y neges</string>
-  <!-- Label in "Message details" dialog -->
-  <string name="message_type_label">Math:\u0020</string>
-  <!-- "Type" value in "Message details" dialog -->
-  <string name="text_message">Neges destun</string>
-  <!-- "Type" value in "Message details" dialog -->
-  <string name="multimedia_message">Neges amlgyfrwng</string>
-  <!-- Label in "Message details" dialog showing who sent the message. -->
-  <string name="from_label">Oddi wrth:\u0020</string>
-  <!-- Label in "Message details" dialog -->
-  <string name="to_address_label">At:\u0020</string>
-  <!-- Label in "Message details" dialog -->
-  <string name="sent_label">Anfonwyd:\u0020</string>
-  <!-- Label in "Message details" dialog -->
-  <string name="received_label">Derbyniwyd:\u0020</string>
-  <!-- Label in "Message details" dialog -->
-  <string name="subject_label">Pwnc:\u0020</string>
-  <!-- Label in "Message details" dialog -->
-  <string name="message_size_label">Maint:\u0020</string>
-  <!-- Label in "Message details" dialog -->
-  <string name="priority_label">Blaenoriaeth:\u0020</string>
-  <!-- Label in "Message details" dialog -->
-  <string name="sim_label">SIM:\u0020</string>
-  <!-- "Priority" value in "Message details" dialog -->
-  <string name="priority_high">Uchel</string>
-  <!-- "Priority" value in "Message details" dialog -->
-  <string name="priority_normal">Arferol</string>
-  <!-- "Priority" value in "Message details" dialog -->
-  <string name="priority_low">Isel</string>
-  <!-- SIM identified using the slot number. e.g. SIM 1 -->
-  <string name="sim_slot_identifier">SIM <xliff:g id="sim_slot_number">%s</xliff:g></string>
-  <!-- Sender to be used if the sender address has been hidden -->
-  <string name="hidden_sender_address">Cyfeiriad anfonwr cudd</string>
-  <!-- Shows when the user attempts to send message while some attachment(s) haven't finished loading -->
-  <string name="cant_send_message_while_loading_attachments">Methu ag anfon neges wrth lwytho atodiadau.</string>
-  <!-- Notifies the user when an attachment fails to load -->
-  <string name="fail_to_load_attachment">Methu â llwytho\'r atodiad. Ceisia eto.</string>
-  <!-- Shows when the user attempts to send message when there is no active subscription -->
-  <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>
-  <!-- Content description for the checkbox when selecting an item in the gallery -->
-  <string name="gallery_checkbox_content_description">Dewis yr eitem hon</string>
-  <string name="video_thumbnail_view_play_button_content_description">Chwarae fideo</string>
-  <!-- Option menu item in the conversation view that lets user view list of conversation participants and change options -->
-  <string name="action_people_and_options">Pobol a dewisiadau</string>
-  <!-- Option menu item in the conversation list view and conversation view that shows debug menu -->
-  <string name="action_debug_options">Dadfygio</string>
-  <!-- Title for the "People and Options" activity -->
-  <string name="people_and_options_activity_title">Pobol a dewisiadau</string>
-  <!-- Title for the general settings section in the "People and options" activity -->
-  <string name="general_settings_title">Cyffredinol</string>
-  <!-- Title for the list of participants in the "People and options" activity -->
-  <string name="participant_list_title">Pobl yn y sgwrs hon</string>
-  <!-- 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">Gwneud galwad</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">Anfon neges</string>
-  <!-- The hint text shown in the message compose input box prompting the user to send a message when there are multiple SIMs. -->
-  <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>
-  <!-- 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="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>
-  <!-- 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="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>
-  <!-- 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="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>
-  <!-- The hint text shown in the message compose input box when vcard(s) is attached -->
-  <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>
-  <!-- The hint text shown in the message compose input box when a single unknown attachment, or multiple different attachments are attached -->
-  <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>
-  <!-- Announcement after the user adds or removes an attachment -->
-  <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>
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users send feedback -->
-  <string name="menu_send_feedback">Anfon adborth</string>
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the app in the Google Play Store -->
-  <string name="menu_view_in_store">Gweld yn Google Play Store</string>
-  <!-- Action menu title in the HelpAndFeedbackFragment to let users view the version of Bugle -->
-  <string name="menu_version_info">Gwybodaeth am y fersiwn</string>
-  <!-- The format of the subtitle of the help activity. -->
-  <string name="subtitle_format_for_version_number">Fersiwn %1$s</string>
-  <!--  Action menu title to let users view open source license -->
-  <string name="menu_license">Trwyddedau cod agored</string>
-  <!-- Title for the per-conversation preference for whether or to notify the user of new messages -->
-  <string name="notifications_enabled_conversation_pref_title">Hysbysiadau</string>
-  <!-- Reached MMS message attachment limit -->
-  <string name="mms_attachment_limit_reached">Wedi cyrraedd mwyafswm atodiadau</string>
-  <!-- Message attachment load failed -->
-  <string name="mms_attachment_load_failed">Methwyd â llwytho atodiad.</string>
-  <!-- Alert dialog title to accept or decline adding the given phone number to your contacts. -->
-  <string name="add_contact_confirmation_dialog_title">Ychwanegu at Gysylltiadau?</string>
-  <!-- Alert dialog accept adding the given phone number to your contacts button. -->
-  <string name="add_contact_confirmation">Ychwanegu Cyswllt</string>
-  <!-- The text shown as a label before the message subject input box -->
-  <string name="compose_message_view_subject_hint_text">Pwnc</string>
-  <!-- The text shown as a label before the message subject input box -->
-  <string name="conversation_message_view_subject_text">Pwnc:\u0020</string>
-  <!-- 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">Yn llwytho cerdyn cyswllt</string>
-  <!-- Text shown on contact VCard when it failed to load -->
-  <string name="failed_loading_vcard">Methwyd â llwytho cerdyn cyswllt</string>
-  <!-- Text shown on contact VCard promping the user to tap to view the contact -->
-  <string name="vcard_tap_hint">Gweld cerdyn cyswllt</string>
-  <!-- VCard display name for when there's more than one contact, e.g. "2 contact cards" -->
-  <plurals name="vcard_multiple_display_name">
-    <item quantity="zero"><xliff:g id="count">%d</xliff:g> cysylltiadau</item>
-    <!-- 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> 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>
-  <!-- Title for the activity that shows details of VCards -->
-  <string name="vcard_detail_activity_title">Cardiau cysylltiadau</string>
-  <!-- VCard label for displaying birthdays -->
-  <string name="vcard_detail_birthday_label">Pen-blwydd</string>
-  <!-- VCard label for describing the Notes field of a contact. -->
-  <string name="vcard_detail_notes_label">Nodiadau</string>
-  <!-- Title for the message forwarding dialog -->
-  <string name="forward_message_activity_title">Anfon y neges ymlaen</string>
-  <!-- Title for the message reply dialog -->
-  <string name="reply_activity_title">Ateb</string>
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is one extra) -->
-  <string name="plus_one">+1</string>
-  <!-- String to show when eliding the number of participants in a conversation due to length (used when there is more than one extra) -->
-  <string name="plus_n">+%d</string>
-  <!-- Toast error shown when SMS functionality is disabled -->
-  <string name="sms_disabled">SMS wedi\'i analluogi</string>
-  <!-- Snackbar message that indicates users must set Messaging as their
-         default SMS application in order to send messages -->
-  <string name="requires_default_sms_app_to_send">I anfon y neges, gosoda Negesu fel yr ap SMS rhagosodedig.</string>
-  <!-- Snackbar message that indicates users must set Messaging as their default SMS application in order to perform the requested action. -->
-  <string name="requires_default_sms_app">Gosod Negesu fel yr ap SMS rhagosodedig</string>
-  <!-- Snackbar button text to switch default SMS apps shown in snackbar. -->
-  <string name="requires_default_sms_change_button">Newid</string>
-  <!-- Toast message that indicates uses must set Messaging as their
-         default SMS application in order to receive replies in the app. -->
-  <string name="recommend_set_default_sms_app">I dderbyn negeseuon, gosoda Negesu fel yr ap SMS rhagosodedig</string>
-  <!-- Toast message that indicates no preferred SIM was selected for sending the message -->
-  <string name="no_preferred_sim_selected">Nid oes SIM wedi\'i ddewis i\'w ffafrio ar gyfer anfon negeseuon SMS.</string>
-  <!-- Dialog message that indicates user must be granted permissions from the phone owner to
-         send SMS messages. -->
-  <string name="requires_sms_permissions_message">Nid yw perchennog y ddyfais yn caniatáu\'r ap hwn.</string>
-  <!-- Dialog button text that closes the application. -->
-  <string name="requires_sms_permissions_close_button">Iawn</string>
-  <!-- Toast text when creating a conversation with more participants than MMS/SMS config permits -->
-  <string name="too_many_participants">Gormod o gyfranogwyr mewn sgwrs</string>
-  <!-- Toast text when creating a conversation with an invalid participant -->
-  <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>
-  <!-- Error toast message shown when a camera image failed to attach to the message -->
-  <string name="camera_media_failure">Methwyd â llwytho delwedd camera</string>
-  <!-- A message prefix to indicate the message was sent by the user. -->
-  <string name="conversation_list_item_view_sent_from_you_prefix">Ti:\u0020</string>
-  <!-- A message prefix to indicate the message was sent by another user in a group conversation. -->
-  <string name="conversation_list_item_view_sent_from_other_prefix"><xliff:g id="firstNameOfSender">%s</xliff:g>:\u0020</string>
-  <!-- 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">Drafft</string>
-  <!-- String to show in the conversation list view when there are no messages. -->
-  <string name="conversation_list_empty_text">Pan fyddi\'n dechrau sgwrs newydd, mi fydd yn y rhestr yma</string>
-  <!-- String to show in the archived conversation list view when there are no messages. -->
-  <string name="archived_conversation_list_empty_text">Mae sgyrsiau wedi\'u harchifo yn ymddangos yma</string>
-  <!-- String to show in the conversation list view when we haven't synchronized the SMS database yet -->
-  <string name="conversation_list_first_sync_text">Yn llwytho sgyrsiau&#8230;</string>
-  <!-- Shown in conversation as the snippet when there is no text and an attached picture. [CHAR LIMIT=25] -->
-  <string name="conversation_list_snippet_picture">Llun</string>
-  <!-- Shown in conversation as the snippet when there is no text and an attached audio clip. [CHAR LIMIT=25] -->
-  <string name="conversation_list_snippet_audio_clip">Clip sain</string>
-  <!-- Shown in conversation as the snippet when there is no text and an attached video. [CHAR LIMIT=25] -->
-  <string name="conversation_list_snippet_video">Fideo</string>
-  <!-- Shown in conversation as the snippet when there is no text and an attached vcard. [CHAR LIMIT=25] -->
-  <string name="conversation_list_snippet_vcard">Cerdyn cyswllt</string>
-  <!-- Indicates that the current message will be sent via MMS -->
-  <string name="mms_text">MMS</string>
-  <!-- The string we display with the snack bar notification (very similar to toast) to undo the action that the notification is about. -->
-  <string name="snack_bar_undo">Dadwneud</string>
-  <string name="snack_bar_retry">Ail-geisio</string>
-  <!-- Hint text shown on the contact list when there's no contacts -->
-  <string name="contact_list_empty_text">Rho enw neu rif ffôn cyswllt i ddechrau neges newydd.</string>
-  <!-- Action menu title for blocking and archiving selected conversations in conversation list -->
-  <string name="action_block">Rhwystro</string>
-  <!-- Label of block contact item in People & Options for 1:1 conversation -->
-  <string name="block_contact_title">Rhwystro <xliff:g id="destination">%s</xliff:g></string>
-  <!-- Label of unblock contact item in People & Options for 1:1 conversation -->
-  <string name="unblock_contact_title">Dadrwystro <xliff:g id="destination">%s</xliff:g></string>
-  <!-- Title of block confirmation dialog -->
-  <string name="block_confirmation_title">Rhwystro <xliff:g id="destination">%s</xliff:g>?</string>
-  <!-- Text describing what happens when user is blocked via the block actionbar action -->
-  <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>
-  <!-- The title of the list of blocked contacts -->
-  <string name="blocked_contacts_title">Cysylltiadau a rhwystrwyd</string>
-  <!-- The message in a blocked contact item which indicates tapping will unblock -->
-  <string name="tap_to_unblock_message">DADRWYSTRO</string>
-  <!-- Action menu title for viewing the list of blocked contacts -->
-  <string name="view_blocked_contacts_title">Cysylltiadau a rhwystrwyd</string>
-  <!-- Content description for the button in gallery media picker to pick an image from the document library -->
-  <string name="pick_image_from_document_library_content_description">Dewis delwedd o\'r llyfrgell dogfennau</string>
-  <!-- Accessibility toast shown when a message is sending. -->
-  <string name="sending_message">Anfon neges</string>
-  <!-- Accessibility toast shown when a message is sent. -->
-  <string name="send_message_success">Anfonwyd y neges</string>
-  <!-- Error toast shown when an MMS could not be sent because mobile data was disabled. -->
-  <string name="send_message_failure_no_data">Rhwydwaith symudol wedi\'i ddiffodd. Gwiria dy osodiadau.</string>
-  <!-- Error toast shown when a message could not be sent because of airplane mode. -->
-  <string name="send_message_failure_airplane_mode">Nid yw\'n bosib anfon negeseuon ym Modd Awyren</string>
-  <!-- Error toast shown when a message could not be sent because of unspecified error. -->
-  <string name="send_message_failure">Methwyd ag anfon y neges</string>
-  <!-- Accessibility toast shown when an MMS is downloaded. -->
-  <string name="download_message_success">Neges wedi\'i lawrlwytho</string>
-  <!-- Error toast shown when an MMS could not be downloaded because mobile data was disabled. -->
-  <string name="download_message_failure_no_data">Rhwydwaith symudol wedi\'i ddiffodd. Gwiria dy osodiadau.</string>
-  <!-- Error toast shown when a message could not be downloaded because of airplane mode. -->
-  <string name="download_message_failure_airplane_mode">Nid yw\'n bosib lawrlwytho negeseuon ym Modd Awyren</string>
-  <!-- Error toast shown when a message could not be downloaded because of unspecified error. -->
-  <string name="download_message_failure">Methwyd â lawrlwytho\'r neges</string>
-  <!-- Accessibility : content description for numbers -->
-  <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>
-  <!-- Error message which shows the user a carrier specific error code such as "Unable to send message: xxxxx error 97" -->
-  <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>
-  <!-- Text prepended to the subject of a forwarded message -->
-  <string name="message_fwd">Yml: <xliff:g id="subject">%s</xliff:g></string>
-  <!-- Detailed MMS failure strings, may need to be adjusted per carrier for TA -->
-  <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 hanfon: cyfeiriad annilys</string>
-  <string name="mms_failure_outgoing_corrupt">Neges heb ei hanfon: neges annilys</string>
-  <string name="mms_failure_outgoing_content">Neges heb ei hanfon: cynnwys anghydnaws</string>
-  <string name="mms_failure_outgoing_unsupported">Neges heb ei hanfon: neges anghydnaws</string>
-  <string name="mms_failure_outgoing_too_large">Neges heb ei hanfon: rhy fawr</string>
-  <!-- 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">Neges newydd</string>
-  <string name="in_conversation_notify_new_message_action">Gweld</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-->
-  <string name="message_image_content_description">Delwedd</string>
-  <!-- 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">Methwyd â chanfod ap priodol</string>
-  <!-- Accessibility : Content description for deleting a recipient chip. -->
-  <string name="chips_delete_content_description">Tynnu\'r cyfranogwr</string>
-  <!-- Label for new message button in share intent dialog -->
-  <string name="share_new_message">Neges newydd</string>
-  <!-- Label for new message button in share intent dialog -->
-  <string name="share_cancel">Diddymu</string>
-  <!-- Screen title after user selects APNs setting option -->
-  <string name="apn_edit">Golygu pwynt mynediad</string>
-  <!-- Edit access point label summary text when no value has been set -->
-  <string name="apn_not_set">Heb ei osod</string>
-  <!-- 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">Enw</string>
-  <!-- Edit access point labels: The actual access point name-->
-  <string name="apn_apn">APN</string>
-  <!-- Edit access point labels: -->
-  <string name="apn_mmsc">MMSC</string>
-  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
-  <string name="apn_mms_proxy">Procsi MMS</string>
-  <!-- Edit access point labels: The port on the proxy used for MMS-->
-  <string name="apn_mms_port">Porth MMS</string>
-  <!-- Edit access point labels: -->
-  <string name="apn_mcc">MCC</string>
-  <!-- Edit access point labels: -->
-  <string name="apn_mnc">MNC</string>
-  <!-- Edit access point labels: The type of APN -->
-  <string name="apn_type">Math APN</string>
-  <!-- Edit access point screen menu option to delete this APN -->
-  <string name="menu_delete_apn">Dileu APN</string>
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <string name="menu_new_apn">APN newydd</string>
-  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
-  <string name="menu_save_apn">Cadw</string>
-  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-  <string name="menu_discard_apn_change">Gwaredu</string>
-  <!-- APN error dialog messages: -->
-  <string name="error_apn_name_empty">Rhaid rhoi rhywbeth yn y maes Enw.</string>
-  <!-- APN error dialog messages: -->
-  <string name="error_apn_empty">Ni all yr APN fod yn wag.</string>
-  <!-- APN error dialog messages: -->
-  <string name="error_mcc_not3">Rhaid i\'r maes MCC fod yn 3 digid.</string>
-  <!-- APN error dialog messages: -->
-  <string name="error_mnc_not23">Rhaid i\'r maes MNC fod yn 2 neu 3 digid.</string>
-  <!-- The message of dialog indicated restoring default APN settings in progress -->
-  <string name="restore_default_apn">Yn adfer rhagosodiadau APN.</string>
-  <!-- APNs screen menu option to reset default APN settings -->
-  <string name="menu_restore_default_apn">Ailosod i\'r rhagosodiad</string>
-  <!-- APNs screen toast message to inform reset default APN settings is completed -->
-  <string name="restore_default_apn_completed">Cwblhawyd ailosod rhagosodiadau APN.</string>
-  <!-- Name to assign to a Network Access Point that was saved without a name -->
-  <string name="untitled_apn">Heb deitl</string>
-  <!-- Title for Access Point Names settings -->
-  <string name="sms_apns_title">Enwau Pwyntiau Mynediad</string>
-  <!-- Title for Access Point Names settings activity -->
-  <string name="apn_settings">APNau</string>
-  <!-- APNs screen menu option to create a brand spanking new APN -->
-  <string name="menu_new">APN newydd</string>
-  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
-  <string name="apn_settings_not_available">Dyw gosodiadau Enwau Pwyntiau Mynediad ddim ar gael ar gyfer y defnyddiwr hwn.</string>
-  <!-- Alert dialog title to copy information displayed in dialog to system clipboard. -->
-  <string name="copy_to_clipboard_dialog_title">Copïo i\'r clipfwrdd?</string>
-  <!-- Alert dialog accept to copy information displayed in dialog to system clipboard. -->
-  <string name="copy_to_clipboard">Copïo</string>
-  <!-- SIM name incoming message bubbles indicating which SIM the message was delivered to -->
-  <string name="incoming_sim_name_text">at <xliff:g id="sim_name">%s</xliff:g></string>
-  <!-- The title for general settings section in the settings activity  -->
-  <string name="general_settings">Cyffredinol</string>
-  <!-- The title for advanced settings section in the settings activity  -->
-  <string name="advanced_settings">Uwch</string>
-  <!-- The title for general settings activity  -->
-  <string name="general_settings_activity_title">Gosodiadau cyffredin</string>
-  <!-- The title for advanced settings activity  -->
-  <string name="advanced_settings_activity_title">Gosodiadau uwch</string>
-  <!-- The title for sim_specific settings  -->
-  <string name="sim_specific_settings">\"<xliff:g id="sim_name">%s</xliff:g>\" SIM</string>
-  <!-- The group MMS choices in settings -->
-  <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>
-  <!-- SIM number shown in the settings when the number is not known -->
-  <string name="sim_settings_unknown_number">Rhif anhysbys</string>
-  <!-- Notification title for incoming sms/mms message for secondary user -->
-  <string name="secondary_user_new_message_title">Neges newydd</string>
-  <!-- Ticker for notification  for incoming sms/mms message for secondary user -->
-  <string name="secondary_user_new_message_ticker">Neges newydd.</string>
-  <!-- Content description for the SIM selector button in the conversation -->
-  <string name="sim_selector_button_content_description">Dewisydd SIM</string>
-  <!-- Content description for the SIM selector button with selected sim name -->
-  <string name="sim_selector_button_content_description_with_selection">Dewisydd SIM, <xliff:g id="sim">%1$s</xliff:g> wedi\'i dewis</string>
-  <!-- Custom TalkBack description for send button long click event when there's no SIM selector, i.e. edit subject -->
-  <string name="send_button_long_click_description_no_sim_selector">Golygu pwnc</string>
-  <!-- Custom TalkBack description for send button long click event when there is SIM selector -->
-  <string name="send_button_long_click_description_with_sim_selector">Dewis SIM neu olygu pwnc</string>
-  <!-- Content description for the audio record view -->
-  <string name="audio_record_view_content_description">Tara a dal i recordio sain</string>
-  <!-- Content description for new conversation button in desktop widget -->
-  <string name="widget_new_conversation_content_description">Dechrau sgwrs newydd</string>
-  <!-- Content description for widget title -->
-  <string name="widget_title_content_description">Negeseua</string>
-  <!-- Displayed name of the desktop widget that shows the list of conversations-->
-  <string name="widget_conversation_list_name">Rhestr Negeseuon</string>
-  <!-- Displayed name of the desktop widget that shows a single conversation-->
-  <string name="widget_conversation_name">Negeseua</string>
-  <!-- Content description for new message button in desktop widget -->
-  <string name="widget_new_message_content_description">Neges newydd</string>
-  <!-- Content description for conversation list button in desktop widget -->
-  <string name="widget_conversation_list_content_description">Rhestr sgyrsiau</string>
-  <!-- Shown when loading conversations in the widget -->
-  <string name="loading_conversations">Yn llwytho sgyrsiau</string>
-  <!-- Shown when loading messages in the widget -->
-  <string name="loading_messages">Yn llwytho negeseuon</string>
-  <!-- Displayed at the end of the conversation list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <string name="view_more_conversations">Gweld rhagor o sgyrsiau</string>
-  <!-- Displayed at the beginning of the message list in the widget. Tapping on this will open bugle home activity. [CHAR LIMIT=35] -->
-  <string name="view_more_messages">Gweld rhagor o negeseuon</string>
-  <!-- Toast message telling the user a conversation has been deleted -->
-  <string name="conversation_deleted">Dilëwyd y sgwrs</string>
-  <!-- Displayed when user adds a new conversation widget. Tapping on the widget in this
-          mode will bring user to the conversation selection screen -->
-  <string name="tap_to_configure">Mae\'r sgwrs wedi ei dileu. Tara i ddangos sgwrs negeseuon arall.</string>
-  <!-- Toast message telling the user that someone was blocked -->
-  <string name="update_destination_blocked">Wedi\'i rhwystro</string>
-  <!-- Toast message telling the user that someone was unblocked -->
-  <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>
-  <!-- Title for attachment chooser activity -->
-  <string name="attachment_chooser_activity_title">Dewis atodiadau</string>
-  <!-- Action menu title for confirming attachment selection in the attachment chooser -->
-  <string name="action_confirm_selection">Cadarnhau dewis</string>
-  <!-- Shows the number of selected attachments in the attachment chooser activity -->
-  <string name="attachment_chooser_selection"><xliff:g id="count">%d</xliff:g> wedi\'u dewis</string>
-  <!-- The dialog message content for when the message is over the attachment limit when composing the message -->
-  <string name="attachment_limit_reached_dialog_message_when_composing">Tynna un neu ragor o atodiadau a rhoi cynnig arall arni.</string>
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <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>
-  <!-- The dialog message content for when the message is over the attachment limit when sending the message -->
-  <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>
-  <!-- The dialog message content for when the message load failed -->
-  <string name="attachment_load_failed_dialog_message">Methodd Negeseua â llwytho\'r atodiad.</string>
-  <!-- The option to send the message anyway when the user is presented with the warning that the attachment size might be over limit -->
-  <string name="attachment_limit_reached_send_anyway">Anfon beth bynnag</string>
-  <!-- Toast message telling the user a conversation with a recipient could not be found or created -->
-  <string name="conversation_creation_failure">Methwyd â dechrau sgwrs</string>
-  <!-- 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)" -->
-  <string name="link_display_format"><xliff:g id="text">%1$s</xliff:g> (<xliff:g id="url">%2$s</xliff:g>)</string>
-  <!-- The accessibility text read when the sim chooser pops up to read the current selected sim -->
-  <string name="selected_sim_content_message"><xliff:g id="selected_sim">%s</xliff:g> wedi\'i ddewis</string>
-  <string name="work_directory_display_name">Cysylltiadau Proffil Gwaith</string>
+    <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. Tapia 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">Tapia i geisio eto</string>
+    <string name="message_status_download">Tapia 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">Tapio 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. Tapia 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_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">Tapia 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>
+    <string name="work_directory_display_name">Cysylltiadau Proffil Gwaith</string>
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 3c0fc29..d22f8ed 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Valgt lydfil</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Tryk for at vælge en</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> valgt</string>
+    <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>
+    <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="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">Valgt lydfil</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Tryk for at vælge en</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 0f37165..1e1b1ef 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Ausgewählte Audiodatei</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Tippen, um eine Auswahl zu treffen</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> ausgewählt</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="show_emoticons_pref_title">Zugriff auf Emoticons</string>
+    <string name="show_emoticons_pref_summary">Emoticons-Taste auf der Tastatur anzeigen</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">Ausgewählte Audiodatei</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Tippen, um eine Auswahl zu treffen</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 bf9ed09..c4c4aad 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Ολίσθηση για διαγραφή</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Σύρετε προς τα δεξιά για να διαγράψετε μια συζήτηση</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Πρόσβαση emoticon</string>
-  <string name="show_emoticons_pref_summary">Εμφάνιση του πλήκτρου emoticon στο πληκτρολόγιο</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="swipe_to_delete_conversation_pref_title">Ολίσθηση για διαγραφή</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Σύρετε προς τα δεξιά για να διαγράψετε μια συζήτηση</string>
+    <string name="show_emoticons_pref_title">Πρόσβαση emoticon</string>
+    <string name="show_emoticons_pref_summary">Εμφάνιση του πλήκτρου emoticon στο πληκτρολόγιο</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 f42214f..c6b5614 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Selected audio</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Tap to select</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selected</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="show_emoticons_pref_title">Emoticons access</string>
+    <string name="show_emoticons_pref_summary">Show the emoticons key on the keyboard</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">Selected audio</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Tap to select</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 f42214f..c6b5614 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Selected audio</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Tap to select</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selected</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="show_emoticons_pref_title">Emoticons access</string>
+    <string name="show_emoticons_pref_summary">Show the emoticons key on the keyboard</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">Selected audio</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Tap to select</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 f42214f..c6b5614 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Selected audio</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Tap to select</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selected</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="show_emoticons_pref_title">Emoticons access</string>
+    <string name="show_emoticons_pref_summary">Show the emoticons key on the keyboard</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">Selected audio</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Tap to select</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 d6c34bc..0000000
--- a/res/values-en-rPT/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- 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
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-eo/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</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 afe4c8b..590864d 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -16,11 +16,8 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- Audio Library Tab for MMS attachments -->
+    <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="show_emoticons_pref_title">Acceso de emoticonos</string>
+    <string name="show_emoticons_pref_summary">Mostrar el botón de emoticonos en el teclado</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 d440aea..248c2c3 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Pulsa para seleccionar</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> seleccionados</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="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="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">Pulsa para seleccionar</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 e5e629f..e74b283 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Audio seleccionado</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Toca para seleccionar</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d </xliff:g> seleccionados</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="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="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">Audio seleccionado</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Toca para seleccionar</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
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-et-rEE/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 7742160..c9a9a84 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Emotikonoen tekla</string>
-  <string name="show_emoticons_pref_summary">Erakutsi emotikonoen tekla teklatuan</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">Aukeratutako audioa</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Ukitu aukeratzeko</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> aukeratuta</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="show_emoticons_pref_title">Emotikonoen tekla</string>
+    <string name="show_emoticons_pref_summary">Erakutsi emotikonoen tekla teklatuan</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">Aukeratutako audioa</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Ukitu aukeratzeko</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
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-fa/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 00fae7c..2737a60 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Valittu äänitiedosto</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Paina valitaksesi</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> valittu</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="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="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">Valittu äänitiedosto</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Paina valitaksesi</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 d6c34bc..0000000
--- a/res/values-fr-rCA/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 4bd2bab..62fa848 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Audio sélectionné</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Appuyez pour sélectionner</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> sélectionné(s)</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="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="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">Audio sélectionné</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Appuyez pour sélectionner</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
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-fy-rNL/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</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 6bc3334..a62f957 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Audio elexido</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Toca para seleccionar</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> sleccionado</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="show_emoticons_pref_title">Acceso ás emoticonas</string>
+    <string name="show_emoticons_pref_summary">Amosar a tecla das emoticonas no teclado</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">Audio elexido</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Toca para seleccionar</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 eccffbe..a06a64a 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -16,11 +16,8 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">હટાવા માટે સ્વાઇપ કરો</string>
-  <string name="swipe_to_delete_conversation_pref_summary">વાતચીત કાઢી નાખવા જમણી બાજુ સ્વાઇપ કરો</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">ઇમોટિકન્સ વપરાશ</string>
-  <string name="show_emoticons_pref_summary">કીબોર્ડ પર લાગણીઓ કી દેખાડો</string>
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="swipe_to_delete_conversation_pref_title">હટાવા માટે સ્વાઇપ કરો</string>
+    <string name="swipe_to_delete_conversation_pref_summary">વાતચીત કાઢી નાખવા જમણી બાજુ સ્વાઇપ કરો</string>
+    <string name="show_emoticons_pref_title">ઇમોટિકન્સ વપરાશ</string>
+    <string name="show_emoticons_pref_summary">કીબોર્ડ પર લાગણીઓ કી દેખાડો</string>
 </resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-hi/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 38dfc8a..0057723 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Pristup emotikonima</string>
-  <string name="show_emoticons_pref_summary">Pokaži tipku emotikona na tipkovnici</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">Odabrani zvuk</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Dodirnite za odabir</string>
-  <string name="mediapicker_audio_list_title_selection">Odabrano <xliff:g id="count">%d</xliff:g></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="show_emoticons_pref_title">Pristup emotikonima</string>
+    <string name="show_emoticons_pref_summary">Pokaži tipku emotikona na tipkovnici</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">Odabrani zvuk</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Dodirnite za odabir</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 ae71240..8099ec1 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Kiválasztott hang</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Érintse meg a kiválasztáshoz</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="COUNT">%d</xliff:g> kiválasztva</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="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="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">Kiválasztott hang</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Érintse meg a kiválasztáshoz</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 d6c34bc..0000000
--- a/res/values-hy-rAM/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index ecd2354..a02392a 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Akses emoticon</string>
-  <string name="show_emoticons_pref_summary">Tampilkan tombol emoticon di keyboard</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 terpilih</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Ketuk untuk memilih</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> terpilih</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="show_emoticons_pref_title">Akses emoticon</string>
+    <string name="show_emoticons_pref_summary">Tampilkan tombol emoticon di keyboard</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 terpilih</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Ketuk untuk memilih</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 d6c34bc..0000000
--- a/res/values-is-rIS/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 63cee3a..da47371 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Audio selezionato</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Tocca per selezionare</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selezionati</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="show_emoticons_pref_title">Accesso alle emoticon</string>
+    <string name="show_emoticons_pref_summary">Mostra il pulsante delle emoticon sulla tastiera</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">Audio selezionato</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Tocca per selezionare</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 ccc8fff..aba3b0a 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">החלק כדי למחוק</string>
-  <string name="swipe_to_delete_conversation_pref_summary">החלק ימינה כדי למחוק שיחה</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">גישה לרגישונים</string>
-  <string name="show_emoticons_pref_summary">הצג את לחצן הרגישונים במקלדת</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="swipe_to_delete_conversation_pref_title">החלק כדי למחוק</string>
+    <string name="swipe_to_delete_conversation_pref_summary">החלק ימינה כדי למחוק שיחה</string>
+    <string name="show_emoticons_pref_title">גישה לרגישונים</string>
+    <string name="show_emoticons_pref_summary">הצג את לחצן הרגישונים במקלדת</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 5b6e9e8..ec01e6a 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">スワイプして削除</string>
-  <string name="swipe_to_delete_conversation_pref_summary">右にスワイプしてスレッドを削除する</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">絵文字アクセス</string>
-  <string name="show_emoticons_pref_summary">キーボードに絵文字キーを表示する</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="swipe_to_delete_conversation_pref_title">スワイプして削除</string>
+    <string name="swipe_to_delete_conversation_pref_summary">右にスワイプしてスレッドを削除する</string>
+    <string name="show_emoticons_pref_title">絵文字アクセス</string>
+    <string name="show_emoticons_pref_summary">キーボードに絵文字キーを表示する</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
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-ka-rGE/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</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 d6c34bc..0000000
--- a/res/values-kab-rDZ/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- 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 d6c34bc..0000000
--- a/res/values-kk-rKZ/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- 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 d6c34bc..0000000
--- a/res/values-km-rKH/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- 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 d8e8048..5a8cd85 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -16,11 +16,7 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">ಅಳಿಸಲು ಸ್ವೈಪ್ ಮಾಡಿ</string>
-  <string name="swipe_to_delete_conversation_pref_summary">ಒಂದು ಸಂವಾದವನ್ನು ಅಳಿಸಲು ಬಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">ಭಾವನೆಯ ಪ್ರವೇಶ</string>
-  <string name="show_emoticons_pref_summary">ಕೀಬೋರ್ಡ್ ಮೇಲೆ ಭಾವನೆಗಳ ಪ್ರಮುಖ ತೋರಿಸಿ</string>
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="swipe_to_delete_conversation_pref_title">ಅಳಿಸಲು ಸ್ವೈಪ್ ಮಾಡಿ</string>
+    <string name="swipe_to_delete_conversation_pref_summary">ಒಂದು ಸಂವಾದವನ್ನು ಅಳಿಸಲು ಬಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ</string>
+    <string name="show_emoticons_pref_summary">ಕೀಬೋರ್ಡ್ ಮೇಲೆ ಭಾವನೆಗಳ ಪ್ರಮುಖ ತೋರಿಸಿ</string>
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index e9bafc6..43d19e6 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">밀어서 삭제</string>
-  <string name="swipe_to_delete_conversation_pref_summary">오른쪽으로 밀어 대화 삭제</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">이모티콘 표시</string>
-  <string name="show_emoticons_pref_summary">키보드에 이모티콘 키를 표시합니다</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="swipe_to_delete_conversation_pref_title">밀어서 삭제</string>
+    <string name="swipe_to_delete_conversation_pref_summary">오른쪽으로 밀어 대화 삭제</string>
+    <string name="show_emoticons_pref_title">이모티콘 표시</string>
+    <string name="show_emoticons_pref_summary">키보드에 이모티콘 키를 표시합니다</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
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-ku/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</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 d6c34bc..0000000
--- a/res/values-ky-rKG/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- 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 4ff5919..bff2509 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -16,16 +16,13 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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_title_selection"><xliff:g id="count">%d</xliff:g> ausgewielt</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="show_emoticons_pref_title">Zougrëff op Smileyen</string>
+    <string name="show_emoticons_pref_summary">Smiley-Tast op der Tastatur uweisen</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_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 d6c34bc..0000000
--- a/res/values-lo-rLA/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-lt/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-lv/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-mk-rMK/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- 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 d7b80d3..f85b725 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -16,11 +16,8 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">ഇല്ലാതാക്കാൻ സ്വൈപ്പുചെയ്യുക</string>
-  <string name="swipe_to_delete_conversation_pref_summary">ഒരു സംഭാഷണം ഇല്ലാതാക്കാന്‍ വലതുവശത്തെക്ക് സ്വൈപ്ചെയ്യുക</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">ഇമോട്ടിക്കോൺ ആക്സസ്</string>
-  <string name="show_emoticons_pref_summary">കീബോർഡിലെ ഇമോഷനുകളുടെ കീ കാണിക്കുക</string>
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="swipe_to_delete_conversation_pref_title">ഇല്ലാതാക്കാൻ സ്വൈപ്പുചെയ്യുക</string>
+    <string name="swipe_to_delete_conversation_pref_summary">ഒരു സംഭാഷണം ഇല്ലാതാക്കാന്‍ വലതുവശത്തെക്ക് സ്വൈപ്ചെയ്യുക</string>
+    <string name="show_emoticons_pref_title">ഇമോട്ടിക്കോൺ ആക്സസ്</string>
+    <string name="show_emoticons_pref_summary">കീബോർഡിലെ ഇമോഷനുകളുടെ കീ കാണിക്കുക</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 d6c34bc..0000000
--- a/res/values-mn-rMN/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- 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 7390cd8..f059ddf 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -16,11 +16,8 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">हटवण्यासाठी स्वाइप करा</string>
-  <string name="swipe_to_delete_conversation_pref_summary">संभाषण हटवन्यासाठी उजविकडे स्वाइप करा</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">इमोटीकन्स अॅक्सेस</string>
-  <string name="show_emoticons_pref_summary">किबोर्ड वरील इमोटीकन्स कि दाखवा</string>
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="swipe_to_delete_conversation_pref_title">हटवण्यासाठी स्वाइप करा</string>
+    <string name="swipe_to_delete_conversation_pref_summary">संभाषण हटवन्यासाठी उजविकडे स्वाइप करा</string>
+    <string name="show_emoticons_pref_title">इमोटीकन्स अॅक्सेस</string>
+    <string name="show_emoticons_pref_summary">किबोर्ड वरील इमोटीकन्स कि दाखवा</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 d6c34bc..0000000
--- a/res/values-ms-rMY/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- 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 d6c34bc..0000000
--- a/res/values-my-rMM/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 06c5b3a..1b0209e 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Uttrykksikoners tilgang</string>
-  <string name="show_emoticons_pref_summary">Vis uttrykksikoner-tasten på tastaturet</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">Valgt lyd</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Trykk for å velge</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> valgt</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="show_emoticons_pref_title">Uttrykksikoners tilgang</string>
+    <string name="show_emoticons_pref_summary">Vis uttrykksikoner-tasten på tastaturet</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">Valgt lyd</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Trykk for å velge</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 d6c34bc..0000000
--- a/res/values-ne-rNP/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index d68357c..7fa922b 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Geselecteerde audio</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Tik om te selecteren</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> geselecteerd</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="show_emoticons_pref_title">Toegang tot emoticons</string>
+    <string name="show_emoticons_pref_summary">Emoticons-toets op het toetsenbord weergeven</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">Geselecteerde audio</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Tik om te selecteren</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 1dadccb..339a0b3 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -16,11 +16,8 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
   <string name="swipe_to_delete_conversation_pref_title">ବିଲୋପ କରିବାକୁ ସ୍ଵାଇପ୍ କରନ୍ତୁ</string>
   <string name="swipe_to_delete_conversation_pref_summary">ବିଲୋପ କରିବା ପାଇଁ ଡାହାଣକୁ ସ୍ଵାଇପ୍ କରନ୍ତୁ</string>
-  <!-- Show emoticons -->
   <string name="show_emoticons_pref_title">ଇମୋଟିକନ୍‍ ଆକ୍ସେସ୍</string>
   <string name="show_emoticons_pref_summary">ସୋ ଦ ଇମୋକସନ କି ଅନ ଦି କିବୋର୍ଡ଼</string>
-  <!-- Audio Library Tab for MMS attachments -->
 </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 d6c34bc..0000000
--- a/res/values-pa-rIN/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index a4040cb..119e870 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Wybrany dźwięk</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Dotknij, aby wybrać</string>
-  <string name="mediapicker_audio_list_title_selection">Wybrano: <xliff:g id="count">%d</xliff:g></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="show_emoticons_pref_title">Dostęp do emotikon</string>
+    <string name="show_emoticons_pref_summary">Pokaż klawisz emotikon na klawiaturze</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">Wybrany dźwięk</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Dotknij, aby wybrać</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 4d8f46e..640a009 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Áudio selecionado</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Toque para selecionar</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selecionado(s)</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="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="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">Áudio selecionado</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Toque para selecionar</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 19f1e76..b9b0589 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Áudio selecionado</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Toque para selecionar</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selecionado(s)</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="show_emoticons_pref_title">Acesso a emojis</string>
+    <string name="show_emoticons_pref_summary">Mostrar a tecla dos emojis no teclado</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">Áudio selecionado</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Toque para selecionar</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 d6c34bc..0000000
--- a/res/values-rm/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 962374a..6791a8e 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Acces emoticoane</string>
-  <string name="show_emoticons_pref_summary">Arată emoticoane pe tastatură</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">Audio selectat</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Atingeți pentru a selecta</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selectate</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="show_emoticons_pref_title">Acces emoticoane</string>
+    <string name="show_emoticons_pref_summary">Arată emoticoane pe tastatură</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">Audio selectat</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Atingeți pentru a selecta</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 965f99d..9df11dd 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Свайп для удаления</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Свайп вправо для удаления разговора</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Доступ к смайлам</string>
-  <string name="show_emoticons_pref_summary">Показать кнопку смайлов на клавиатуре</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="swipe_to_delete_conversation_pref_title">Свайп для удаления</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Свайп вправо для удаления разговора</string>
+    <string name="show_emoticons_pref_title">Доступ к смайлам</string>
+    <string name="show_emoticons_pref_summary">Показать кнопку смайлов на клавиатуре</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 a6e542a..5ad319f 100644
--- a/res/values-sc-rIT/cm_strings.xml
+++ b/res/values-sc-rIT/cm_strings.xml
@@ -16,9 +16,6 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-  <string name="mediapicker_audio_list_item_selected_content_description">Àudio ischertadu</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Incarca pro ischertare</string>
+    <string name="mediapicker_audio_list_item_selected_content_description">Àudio ischertadu</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Incarca pro ischertare</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
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-si-rLK/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 4064265..048408a 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Vybraný zvuk</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Vybrať dotykom</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> vybraný</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="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="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">Vybraný zvuk</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Vybrať dotykom</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 bcd876b..b3d34b1 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Izbrani zvok</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Tapnite za izbiro</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> izbranih</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="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="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">Izbrani zvok</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Tapnite za izbiro</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 f515ffd..bdafcd4 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Audio e zgjedhur</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Shtyp për të zgjedhur</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> të zgjedhura</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="show_emoticons_pref_title">Aksesi i emotikonave</string>
+    <string name="show_emoticons_pref_summary">Trego tastin e emotikonave në tastjerë</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">Audio e zgjedhur</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Shtyp për të 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 6eb35af..5fc8f9f 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Брисање превлачењем</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Превуците удесно да бисте избрисали конверзацију.</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Приступ емотиконима</string>
-  <string name="show_emoticons_pref_summary">Прикажите дугме са емотиконима на тастатури.</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="swipe_to_delete_conversation_pref_title">Брисање превлачењем</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Превуците удесно да бисте избрисали конверзацију.</string>
+    <string name="show_emoticons_pref_title">Приступ емотиконима</string>
+    <string name="show_emoticons_pref_summary">Прикажите дугме са емотиконима на тастатури.</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 a29e013..80701c3 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -16,14 +16,11 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Tryck för att välja</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> vald</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="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="mediapicker_audio_list_title">Välj ljud</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Tryck för att välja</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 d6c34bc..0000000
--- a/res/values-sw/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- 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 4718cfb..11df7a1 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -16,11 +16,8 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">நீக்குவதற்கு தேய்க்கவும்</string>
-  <string name="swipe_to_delete_conversation_pref_summary">ஒரு உரையாடல் நீக்குவதற்கு வலது பக்கமாக தேய்க்கவும்</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">எமோடிகான்கள் அணுகல்</string>
-  <string name="show_emoticons_pref_summary">விசைப்பலகையில் உள்ள எமோடிகான் விசையை காண்பிக்கவும்</string>
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="swipe_to_delete_conversation_pref_title">நீக்குவதற்கு தேய்க்கவும்</string>
+    <string name="swipe_to_delete_conversation_pref_summary">ஒரு உரையாடல் நீக்குவதற்கு வலது பக்கமாக தேய்க்கவும்</string>
+    <string name="show_emoticons_pref_title">எமோடிகான்கள் அணுகல்</string>
+    <string name="show_emoticons_pref_summary">விசைப்பலகையில் உள்ள எமோடிகான் விசையை காண்பிக்கவும்</string>
 </resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 22c3b34..e8a1bfa 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -16,11 +16,8 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">తొలగించడానికి స్వైప్ చెయ్యండి</string>
-  <string name="swipe_to_delete_conversation_pref_summary">ఒక సంభాషణను తొలగించడానికి కుడి ప్రక్కన స్వైప్ చెయ్యండి</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">ఎమోటికన్స్ యాక్సెస్</string>
-  <string name="show_emoticons_pref_summary">కీబోర్డ్ మీద ఎమోటికన్స్ కీ చూపించు</string>
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="swipe_to_delete_conversation_pref_title">తొలగించడానికి స్వైప్ చెయ్యండి</string>
+    <string name="swipe_to_delete_conversation_pref_summary">ఒక సంభాషణను తొలగించడానికి కుడి ప్రక్కన స్వైప్ చెయ్యండి</string>
+    <string name="show_emoticons_pref_title">ఎమోటికన్స్ యాక్సెస్</string>
+    <string name="show_emoticons_pref_summary">కీబోర్డ్ మీద ఎమోటికన్స్ కీ చూపించు</string>
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 7da03d9..437e018 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -16,11 +16,8 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">กวาดนิ้วเพื่อลบ</string>
-  <string name="swipe_to_delete_conversation_pref_summary">กวาดนิ้วไปทางขวาเพื่อลบการสนทนา</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">การเข้าถึงอีโมติคอน</string>
-  <string name="show_emoticons_pref_summary">แสดงแป้นอีโมติคอนบนแป้นพิมพ์</string>
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="swipe_to_delete_conversation_pref_title">กวาดนิ้วเพื่อลบ</string>
+    <string name="swipe_to_delete_conversation_pref_summary">กวาดนิ้วไปทางขวาเพื่อลบการสนทนา</string>
+    <string name="show_emoticons_pref_title">การเข้าถึงอีโมติคอน</string>
+    <string name="show_emoticons_pref_summary">แสดงแป้นอีโมติคอนบนแป้นพิมพ์</string>
 </resources>
diff --git a/res/values-tl/cm_strings.xml b/res/values-tl/cm_strings.xml
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-tl/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 4cdbd05..a163f7e 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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">Seçili ses</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Seçmek için dokunun</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> seçildi</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="show_emoticons_pref_title">Emoji erişimi</string>
+    <string name="show_emoticons_pref_summary">Klavyede emoji tuşunu göster</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">Seçili ses</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Seçmek için dokunun</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 13169b7..1507349 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -16,11 +16,8 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">سۈرۈلسە ئۆچۈرىدۇ</string>
-  <string name="swipe_to_delete_conversation_pref_summary">دىئالوگنى ئۆچۈرۈش ئۈچۈن ئوڭغا سىيرىڭ</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">ئىپادە بەلگىسىنى كۆرسىتىش</string>
-  <string name="show_emoticons_pref_summary">كونۇپكا تاختىسىدا ئىپادە بەلگىسىنى كۆرسىتىش</string>
-  <!-- Audio Library Tab for MMS attachments -->
+    <string name="swipe_to_delete_conversation_pref_title">سۈرۈلسە ئۆچۈرىدۇ</string>
+    <string name="swipe_to_delete_conversation_pref_summary">دىئالوگنى ئۆچۈرۈش ئۈچۈن ئوڭغا سىيرىڭ</string>
+    <string name="show_emoticons_pref_title">ئىپادە بەلگىسىنى كۆرسىتىش</string>
+    <string name="show_emoticons_pref_summary">كونۇپكا تاختىسىدا ئىپادە بەلگىسىنى كۆرسىتىش</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 fd7b5a2..3937a4c 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">Проведіть для видалення</string>
-  <string name="swipe_to_delete_conversation_pref_summary">Проведіть вправо для видалення бесіди</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">Доступ до емограм</string>
-  <string name="show_emoticons_pref_summary">Показувати кнопку емограм на клавіатурі</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="swipe_to_delete_conversation_pref_title">Проведіть для видалення</string>
+    <string name="swipe_to_delete_conversation_pref_summary">Проведіть вправо для видалення бесіди</string>
+    <string name="show_emoticons_pref_title">Доступ до емограм</string>
+    <string name="show_emoticons_pref_summary">Показувати кнопку емограм на клавіатурі</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 d6c34bc..0000000
--- a/res/values-ur-rPK/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- 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 d6c34bc..0000000
--- a/res/values-uz-rUZ/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 159f2a1..e6bf0b8 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- 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>
-  <!-- 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>
-  <!-- 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 đã chọn</string>
-  <string name="mediapicker_audio_list_item_unselected_content_description">Chạm để chọn</string>
-  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> đã chọn</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="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="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 đã chọn</string>
+    <string name="mediapicker_audio_list_item_unselected_content_description">Chạm để 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 77faaec..7368117 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">滑动删除邮件</string>
-  <string name="swipe_to_delete_conversation_pref_summary">向右滑动以删除会话</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">访问表情符号</string>
-  <string name="show_emoticons_pref_summary">在键盘上显示表情符号键</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="swipe_to_delete_conversation_pref_title">滑动删除邮件</string>
+    <string name="swipe_to_delete_conversation_pref_summary">向右滑动以删除会话</string>
+    <string name="show_emoticons_pref_title">访问表情符号</string>
+    <string name="show_emoticons_pref_summary">在键盘上显示表情符号键</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
deleted file mode 100644
index d6c34bc..0000000
--- a/res/values-zh-rHK/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 7ae0c81..572e712 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -16,18 +16,15 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- Swipe to delete conversation -->
-  <string name="swipe_to_delete_conversation_pref_title">滑動刪除</string>
-  <string name="swipe_to_delete_conversation_pref_summary">向右滑動即可刪除對話</string>
-  <!-- Show emoticons -->
-  <string name="show_emoticons_pref_title">表情符號使用</string>
-  <string name="show_emoticons_pref_summary">在鍵盤上顯示表情符號按鍵</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="swipe_to_delete_conversation_pref_title">滑動刪除</string>
+    <string name="swipe_to_delete_conversation_pref_summary">向右滑動即可刪除對話</string>
+    <string name="show_emoticons_pref_title">表情符號使用</string>
+    <string name="show_emoticons_pref_summary">在鍵盤上顯示表情符號按鍵</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 d6c34bc..0000000
--- a/res/values-zu/cm_strings.xml
+++ /dev/null
@@ -1,22 +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">
-  <!-- Swipe to delete conversation -->
-  <!-- Show emoticons -->
-  <!-- Audio Library Tab for MMS attachments -->
-</resources>