Revert "Update Messaging app with msim changes from klp-sprout"

Bug 18373926 Revert the msim-aware Messaging app back to the original Messaging app. Change-Id: I1b47b78d3d86580b8f1cd1d73ddbb94a417e845b
author: Tom Taylor <tomtaylor@google.com> 2014-11-13 11:49:06 -0800
committer: Tom Taylor <tomtaylor@google.com> 2014-11-13 11:49:06 -0800
commit: a277f438d33872b9a0f1611fb8a86a918765f04b (patch)
tree: db76dae863325d29aac809e0abce45b3c06ceae4
parent: 0f5099dfc908e0ea76b68b69b46b864039b52552 (diff)
download: Mms-a277f438d33872b9a0f1611fb8a86a918765f04b.tar.gz
227 files changed, 1456 insertions, 7958 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 36e475f6..ea7429b6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -191,10 +191,6 @@
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:label="@string/preferences_title" />
 
-        <activity android:name=".ui.SubSelectActivity"
-            android:theme="@style/MmsHoloTheme"
-            android:configChanges="orientation|screenSize|keyboardHidden"/>
-
         <receiver android:name=".transaction.PushReceiver"
             android:permission="android.permission.BROADCAST_WAP_PUSH">
             <intent-filter>
@@ -266,9 +262,6 @@
             <intent-filter>
                 <action android:name="android.provider.Telephony.SIM_FULL" />
             </intent-filter>
-            <intent-filter>
-                <action android:name="com.android.mms.ui.SIM_FULL_VIEWED" />
-            </intent-filter>
         </receiver>
 
         <receiver android:name=".transaction.SmsRejectedReceiver">
diff --git a/CleanSpec.mk b/CleanSpec.mk
index b84e1b65..070b1115 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -44,6 +44,9 @@
 #$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
 #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
 
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Mms*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/*/obj/APPS/Mms*)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/proguard.flags b/proguard.flags
index 01c8744d..36ed61f6 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,3 +1,7 @@
  -keep class com.android.mms.ui.MmsThumbnailPresenter {
 *;
+}
+
+-keep class com.android.mms.ui.SlideshowPresenter {
+*;
 }
 \ No newline at end of file
diff --git a/res/drawable-hdpi/sim_background_locked.9.png b/res/drawable-hdpi/sim_background_locked.9.png
deleted file mode 100644
index 227cc48d..00000000
--- a/res/drawable-hdpi/sim_background_locked.9.png
+++ /dev/null
diff --git a/res/drawable-mdpi/sim_background_locked.9.png b/res/drawable-mdpi/sim_background_locked.9.png
deleted file mode 100644
index b28b12b4..00000000
--- a/res/drawable-mdpi/sim_background_locked.9.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/sim_background_locked.9.png b/res/drawable-xhdpi/sim_background_locked.9.png
deleted file mode 100644
index 25260717..00000000
--- a/res/drawable-xhdpi/sim_background_locked.9.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/sim_background_locked.9.png b/res/drawable-xxhdpi/sim_background_locked.9.png
deleted file mode 100644
index 227cc48d..00000000
--- a/res/drawable-xxhdpi/sim_background_locked.9.png
+++ /dev/null
diff --git a/res/layout/conversation_list_screen.xml b/res/layout/conversation_list_screen.xml
index bf3fa084..0d14f49d 100644
--- a/res/layout/conversation_list_screen.xml
+++ b/res/layout/conversation_list_screen.xml
@@ -20,7 +20,8 @@
 
 <RelativeLayout  xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"  >
+    android:layout_height="match_parent"
+    android:focusable="true"  >
 
     <ListView android:id="@android:id/list"
         style="?android:attr/listViewWhiteStyle"
diff --git a/res/layout/message_list_item_recv.xml b/res/layout/message_list_item_recv.xml
index f7f9b8b2..c1491285 100644
--- a/res/layout/message_list_item_recv.xml
+++ b/res/layout/message_list_item_recv.xml
@@ -65,34 +65,13 @@
                     android:textColor="#ff000000"
                     android:textSize="16sp" />
 
-                <TextView android:id="@+id/expires_view"
-                        android:background="@drawable/listitem_background"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:paddingLeft="@dimen/message_item_text_padding_left_right"
-                        android:paddingRight="3dip"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="@color/text_hairline"
-                        android:visibility="gone" />
-
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="8dip"
                     android:paddingLeft="@dimen/message_item_text_padding_left_right"
-                    android:baselineAligned="true"
                     android:orientation="horizontal" >
 
-                    <TextView android:id="@+id/sim_status"
-                        android:layout_width="wrap_content"
-                        android:layout_height="16dp"
-                        android:linksClickable="false"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="#ffffffff"
-                        android:textSize="9dip"
-                        android:layout_marginRight="6dip"
-                        android:layout_gravity="bottom" />
-
                     <TextView android:id="@+id/date_view"
                         android:background="@drawable/listitem_background"
                         android:layout_width="wrap_content"
diff --git a/res/layout/message_list_item_send.xml b/res/layout/message_list_item_send.xml
index 76af62bf..b2ddf5e0 100755..100644
--- a/res/layout/message_list_item_send.xml
+++ b/res/layout/message_list_item_send.xml
@@ -72,7 +72,6 @@
                     android:layout_marginBottom="8dip"
                     android:paddingRight="@dimen/message_item_text_padding_left_right"
                     android:gravity="right"
-                    android:baselineAligned="true"
                     android:orientation="horizontal" >
 
                     <ImageView
@@ -99,16 +98,6 @@
                         android:src="@drawable/ic_sms_mms_details"
                         android:visibility="gone" />
 
-                    <TextView android:id="@+id/sim_status"
-                        android:layout_width="wrap_content"
-                        android:layout_height="16dp"
-                        android:linksClickable="false"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="#ffffffff"
-                        android:textSize="9dip"
-                        android:layout_marginRight="6dip"
-                        android:layout_gravity="bottom" />
-
                     <TextView android:id="@+id/date_view"
                         android:background="@drawable/listitem_background"
                         android:layout_width="wrap_content"
diff --git a/res/layout/sub_select_item.xml b/res/layout/sub_select_item.xml
deleted file mode 100755
index 1e4c7b15..00000000
--- a/res/layout/sub_select_item.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Copyright (C) 2014 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.
- */
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-    <com.android.mms.ui.SubscriptionView
-        android:id="@+id/subItem"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        />
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:orientation="vertical" >
-        <CheckBox
-            android:id="@+id/subCheckBox"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:focusable="false"
-            android:clickable="false"
-            />
-       </LinearLayout>
-
-</LinearLayout>
-\ No newline at end of file
diff --git a/res/layout/subscription_item_layout.xml b/res/layout/subscription_item_layout.xml
deleted file mode 100644
index 2f9e5777..00000000
--- a/res/layout/subscription_item_layout.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright (C) 2014 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.
-*/
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" >
-    <RelativeLayout
-        android:layout_width="48dip"
-        android:layout_height="32dip"
-        android:id="@+id/sub_color"
-        android:layout_marginEnd="6dip"
-        android:layout_centerVertical="true">
-    <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/sub_short_number"
-            android:layout_marginBottom="2dip"
-            android:layout_marginEnd="4dip"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentBottom="true"
-            android:textSize="12sp"
-            android:singleLine="true"
-            android:textColor="@android:color/white"
-            android:includeFontPadding="false"/>
-    </RelativeLayout>
-    <RelativeLayout
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_centerVertical="true">
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/sub_name"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/sub_number"
-            android:layout_below="@+id/sub_name"
-            android:layout_alignStart="@+id/sub_name"
-            android:singleLine="true"
-            android:ellipsize="none"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"/>
-    </RelativeLayout>
-</LinearLayout>
-\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 76889978..3e4ba2ba 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Klank"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Stel aantal boodskappe om te stoor"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Stil"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Vra watter SIM om te gebruik elke keer wanneer \'n boodskap gestuur word"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Herwin outomaties"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Gaan haal boodskappe outomaties"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Outoherwinning wanneer swerf"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Boodskappe is nie jou SMS-program nie"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> is jou SMS-program"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Jy kan dit verander in Instellings"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Kies SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM-gleuf <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Kanselleer"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Tans gekose SIM is nie teenwoordig nie. Kies jou verstek-SIM in stelselinstellings."</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 27ad59ee..941df395 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ድምፅ"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"ለማስቀመጥ የመልዕክቶች ቁጥር አዘጋጅ"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"ፀጥታ"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"መልዕክት በሚላክበት ጊዜ ሁሉ የትኛው ሲም ጥቅም ላይ እንደሚውል ጠይቅ"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"ባለ ብዙ-ሲም"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"በራስ- ሰርስረህ አውጣ"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"በራስ ሰር መልዕክቶች ሰርስረህ አውጣ"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"በእንቅስቃሴ ላይ በራስ- ሰርስረህ አውጣ"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Messaging የእርስዎ ኤስ ኤም ኤስ መተግበሪያ አይደለም"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> የእርስዎ ኤስ ኤም ኤስ መተግበሪያ ነው"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"ይህን በቅንብሮች ውስጥ መቀየር ይችላሉ"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"ሲም ይምረጡ"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM ማስገቢያ <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"ተወው"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"አሁን የተመረጠው ሲም አይገኝም። በስርዓት ቅንብሮቸ ውስጥ ነባሪ ሲምዎን ይምረጡ።"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index e4c1790d..1137d079 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"الصوت"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"تعيين عدد الرسائل التي سيتم حفظها"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"صامت"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"‏السؤال عن بطاقة SIM المراد استخدامها في كل مرة يتم إرسال رسالة"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"‏بطاقات SIM متعددة"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"استرداد تلقائي"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"استرداد الرسائل تلقائيًا"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"استرداد تلقائي للتجوال"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"‏المراسلة ليس تطبيقك للرسائل القصيرة SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"‏<xliff:g id="APPNAME">%s</xliff:g> هو تطبيق الرسائل القصيرة SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"يمكنك تغيير ذلك من الإعدادات"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"‏تحديد SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"‏SIM‏ <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"‏فتحة SIM‏ <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"إلغاء"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"‏بطاقة SIM المحددة حاليًا غير موجودة. اختر بطاقة SIM الافتراضية في إعدادات النظام."</string>
 </resources>
diff --git a/res/values-az-rAZ/arrays.xml b/res/values-az-rAZ/arrays.xml
new file mode 100644
index 00000000..90029c8e
--- /dev/null
+++ b/res/values-az-rAZ/arrays.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ * Copyright (C) 2008 Esmertec AG.
+ * Copyright (C) 2008 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:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="default_smiley_names">
+    <item msgid="1831934949361041701">"Xoşbəxt"</item>
+    <item msgid="1601611480575517120">"Kədərli"</item>
+    <item msgid="1531181614218625881">"Gözvurma"</item>
+    <item msgid="3858808057949077894">"Sallanmış dil"</item>
+    <item msgid="7835238297967185651">"Təəccüb"</item>
+    <item msgid="1756223535005296033">"Öpüş"</item>
+    <item msgid="1093906245140165107">"Çığırtı"</item>
+    <item msgid="888834839864150170">"Xodgedən"</item>
+    <item msgid="6320683740534773967">"Pulağız"</item>
+    <item msgid="6610111212478853990">"Ayaq ağızda"</item>
+    <item msgid="1706035208563940251">"Utanmış"</item>
+    <item msgid="9079275787422313427">"Mələk"</item>
+    <item msgid="4630490399784004880">"Qərarsız"</item>
+    <item msgid="7002574538342357456">"Ağlayan"</item>
+    <item msgid="850324578089267455">"Möhürlü dodaqlar"</item>
+    <item msgid="6334637439528489607">"Gülüş"</item>
+    <item msgid="7602915122893958066">"Çaşqın"</item>
+    <item msgid="3939233701582771068">"Ürək"</item>
+    <item msgid="1414759480575851587">"Dəli"</item>
+    <item msgid="8479809115158836070">"Saxta təbəssüm"</item>
+    <item msgid="638612939305162424">"İfadəsiz sifət"</item>
+  </string-array>
+  <string-array name="empty_subject_strings">
+    <item msgid="7691141505407124426">"mövzu yoxdur"</item>
+  </string-array>
+</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
deleted file mode 100644
index 552bbd18..00000000
--- a/res/values-az/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1503967887341230795">"Mesajlaşma"</string>
-    <string name="new_message" msgid="1530369762346003973">"Yeni mesaj"</string>
-    <string name="menu_call_back" msgid="7538482331117914146">"<xliff:g id="NAME">%s</xliff:g> zəng edin"</string>
-    <string name="menu_send_email" msgid="671366308915241664">"<xliff:g id="NAME">%s</xliff:g> elektron məktub göndərin"</string>
-    <string name="menu_compose_new" msgid="3763437973691046238">"Yazın"</string>
-    <string name="menu_preferences" msgid="4693148116114749414">"Ayarlar"</string>
-    <string name="menu_add_address_to_contacts" msgid="4491980950419914944">"<xliff:g id="CONTACTEMAILORNUMBER">%s</xliff:g> Camaata əlavə edin"</string>
-    <string name="menu_call" msgid="5877123227307074690">"Zəng"</string>
-    <string name="menu_search" msgid="2289469305728821360">"Axtarın"</string>
-    <string name="menu_delete_all" msgid="808729454898114735">"Bütün mövzuları silin"</string>
-    <string name="menu_delete" msgid="1851666911396479006">"Mövzunu silin"</string>
-    <string name="menu_view" msgid="7448852683948080108">"Mövzuya baxın"</string>
-    <string name="menu_debug_dump" msgid="6855869130206549643">"DEBUG DUMP"</string>
-    <string name="refreshing" msgid="987335057871404222">"Təzələnir ..."</string>
-    <string name="menu_cell_broadcasts" msgid="5646161375983084660">"Şəbəkə yayımları"</string>
-    <string name="has_draft" msgid="2487465595514636160">"Qaralama"</string>
-    <string name="no_subject_view" msgid="7795086723069563537">"(Mövzusuz)"</string>
-    <string name="messagelist_sender_self" msgid="3579016854116401602">"Mən"</string>
-    <string name="view_slideshow" msgid="4990460971211388453">"Slaydşouya baxın"</string>
-    <string name="view_message_details" msgid="7613457646645796831">"Detallara baxın"</string>
-    <string name="view_delivery_report" msgid="8219095994071575215">"Raporta baxın"</string>
-    <string name="delete_message" msgid="6442394955910357234">"Silin"</string>
-    <string name="expire_on" msgid="4436268382742593921">"Bitir: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="kilobyte" msgid="534782148965716631">"KB"</string>
-    <string name="undelivered_msg_dialog_title" msgid="7479433403599785755">"Çatdırılmamış mesaj"</string>
-    <string name="undelivered_msg_dialog_body" msgid="4789268239627694551">"Mesaj göndərilə bilmədi.\nCəhd edildi: <xliff:g id="MESSAGE">%s</xliff:g>."</string>
-    <string name="undelivered_sms_dialog_body" msgid="4203703285563450868">"Bu mesajı göndərmək mümkün olmadı."</string>
-    <string name="delete_thread" msgid="757258847736632791">"Mövzunu silin"</string>
-    <string name="menu_forward" msgid="9026858380050046756">"Yönləndirin"</string>
-    <string name="download" msgid="4488877642230207631">"Endir"</string>
-    <string name="downloading" msgid="1779557575565350637">"Endirilir"</string>
-    <string name="inline_subject" msgid="4057621785274119260">"&lt;Mövzu: <xliff:g id="SUBJECT">%s</xliff:g>&gt;"</string>
-    <string name="drm_protected_text" msgid="1396394157870730742">"* DRM qorunmuş mətn *"</string>
-    <string name="insufficient_drm_rights" msgid="6989074725969164383">"Yetərsiz DRM haqları aşkarlandı."</string>
-    <string name="copy_message_text" msgid="4296252229544252834">"Mətni köçürün"</string>
-    <string name="message_options" msgid="6838806653341967550">"Mesaj seçimləri"</string>
-    <string name="slideshow_options" msgid="3501759384739796431">"Slaydşou variantları"</string>
-    <string name="done" msgid="7479926268660505871">"Hazırdır"</string>
-    <string name="move_up" msgid="7307578107431739359">"Yuxarıya keçin"</string>
-    <string name="move_down" msgid="6356509518429479053">"Aşağıya keçin"</string>
-    <string name="remove_slide" msgid="2225604354024914900">"Slaydı yığışdırın"</string>
-    <string name="add_slide" msgid="9140721399423564187">"Slayd əlavə edin"</string>
-    <string name="add_slide_hint" msgid="7351356961076244584">"Yeni slayd yaratmaq üçün toxunun."</string>
-    <string name="discard_slideshow" msgid="5054239124146413609">"Slaydşoudan imtina edin"</string>
-    <string name="slide_show_part" msgid="5077675385448696846">"Bölüm <xliff:g id="PART">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="remove_text" msgid="2164068850029476539">"Mətni yığışdırın"</string>
-    <string name="add_picture" msgid="7819574884962571479">"Şəkil əlavə edin"</string>
-    <string name="remove_picture" msgid="6378701749074289096">"Şəkli yığışdırın"</string>
-    <string name="add_music" msgid="3827442822987116233">"Musiqi əlavə edin"</string>
-    <string name="remove_music" msgid="858889733416015223">"Musiqini yığışdırın"</string>
-    <string name="add_video" msgid="7816866867806595144">"Video əlavə edin"</string>
-    <string name="remove_video" msgid="5258603891528497799">"Videonu yığışdırın"</string>
-    <string name="to_hint" msgid="224029549150332986">"Kimə"</string>
-    <string name="subject_hint" msgid="4296714962311604126">"Mövzu"</string>
-    <string name="add_attachment" msgid="7103751293360532684">"Qoşma"</string>
-    <string name="add_subject" msgid="7616134948428265870">"Mövzu əlavə edin"</string>
-    <string name="discard" msgid="1624800293064498479">"İmtina et"</string>
-    <string name="view" msgid="7929667761715467136">"Göstər"</string>
-    <string name="replace" msgid="7587904998114459388">"Əvəz edin"</string>
-    <string name="remove" msgid="4625444913256213175">"Yığışdır"</string>
-    <string name="send" msgid="4589898724889248486">"Göndər"</string>
-    <string name="mms" msgid="1587631213714914559">"MMS"</string>
-    <string name="send_mms" msgid="2933162044872550662">"MMS göndər"</string>
-    <string name="all_threads" msgid="2663426830306307194">"Bütün mövzular"</string>
-    <string name="type_to_compose_text_enter_to_send" msgid="3539985471008581265">"Mesaj yazın"</string>
-    <string name="open_keyboard_to_compose_message" msgid="7860109685511253191">"Mesaj yazmaq üçün klaviaturanı açın"</string>
-    <string name="compressing" msgid="1961357529661045180">"Şəkil çox böyükdür: Sıxılır…"</string>
-    <string name="unsupported_media_format" msgid="1350489690977363764">"Dəstəklənməyən <xliff:g id="NAME">%1$s</xliff:g> format."</string>
-    <string name="select_different_media" msgid="6241623357299382183">"Başqa bir <xliff:g id="NAME">%1$s</xliff:g> seçin."</string>
-    <string name="exceed_message_size_limitation" msgid="6027753647094742437">"Mesaj ölçüsü limiti keçib"</string>
-    <string name="message_too_big_for_video" msgid="2639367545165352543">"Bu mesaj video qoşulması üçün çox böyükdür."</string>
-    <string name="failed_to_add_media" msgid="7207464170168708485">"<xliff:g id="NAME">%1$s</xliff:g> adını mesajınıza əlavə edə bilməzsiniz."</string>
-    <string name="failed_to_resize_image" msgid="5608354151631833669">"Şəklin ölçüsü dəyişdirilməyib."</string>
-    <string name="resize_image_error_information" msgid="3783200130776554475">"Ölçüsü dəyişdiriləndən sonra da bu şəkil göndərilmək üçün çox böyükdür."</string>
-    <string name="forward_prefix" msgid="276280492803486464">"Yönləndir: "</string>
-    <string name="discard_message_reason" msgid="2667664943003796133">"Sizin mesajınız etibarlı alıcıları olmadığına görə imtina edildi."</string>
-    <string name="has_invalid_recipient" msgid="1485388396900997383">"Etibarsız alıcı(lar): &lt;<xliff:g id="NAME">%1$s</xliff:g>&gt;"</string>
-    <string name="invalid_destination" msgid="4573835601024786416">"Etibarsız hədəf ünvanı."</string>
-    <string name="service_not_activated" msgid="9178218144019626176">"Xidmət şəbəkədə aktivləşdirilməyib."</string>
-    <string name="service_message_not_found" msgid="1908877102600048515">"Mesajın vaxtı keçib, və ya əlçatımlı deyil."</string>
-    <string name="service_network_problem" msgid="4583269174855943025">"Şəbəkə probleminə görə göndərilə bilmədi."</string>
-    <string name="invalid_recipient_message" msgid="6465343105010999068">"Alıcıları düzgün yazın, yoxsa onlar mesaj almayacaqlar."</string>
-    <string name="cannot_send_message" msgid="3414307479833622644">"Mesaj göndərilə bilmir."</string>
-    <string name="cannot_send_message_reason" msgid="8745080126044054343">"Mesajınızın etibarlı alıcıları yoxdur."</string>
-    <string name="cannot_forward_drm_obj" msgid="5047623751430559077">"Mesaja daxil edilmiş DRM obyekt yönləndirilə bilməz."</string>
-    <string name="converting_to_picture_message" msgid="2980023239017588627">"Multimedia mesajina çevrilir…"</string>
-    <string name="cannot_add_slide_anymore" msgid="4631404749618820994">"Daha çox slayd əlavə oluna bilmir."</string>
-    <string name="cannot_add_picture_and_video" msgid="4954353772391381447">"Bir slayda video və şəkil əlavə oluna bilmir."</string>
-    <string name="cannot_save_message" msgid="3375907366965264446">"Mesaj saxlana bilmir."</string>
-    <string name="message_saved_as_draft" msgid="2503018972659880692">"Mesaj qaralama şəklində saxlandı."</string>
-    <string name="too_many_recipients" msgid="7003415094007176931">"Mesajın alıcıları həddən çoxdur (<xliff:g id="CURRENTCOUNT">%1$s</xliff:g>). <xliff:g id="MAXLIMIT">%2$s</xliff:g> nəfərə qədər alıcı ola bilər."</string>
-    <string name="too_many_attachments" msgid="3774037894899750070">"<xliff:g id="MAXLIMIT">%1$s</xliff:g> qoşmaya qədər limit var. Yalnız ilk <xliff:g id="CURRENTCOUNT">%2$s</xliff:g> əlavə olunacaq."</string>
-    <string name="adding_attachments_title" msgid="2034535554212405529">"Qoşmalar əlavə olunur"</string>
-    <string name="adding_attachments" msgid="5871373105122355632">"Elementlərin slaydşouya əlavə olunmasını gözləyin."</string>
-    <string name="building_slideshow_title" msgid="1232338692400726385">"Slaydşou hazırlanır"</string>
-    <string name="cannot_play_audio" msgid="253920977253666735">"Audio oxuna bilmir."</string>
-    <string name="preview" msgid="5438149136136446756">"önizləmə"</string>
-    <string name="preview_slideshow" msgid="6824095909448728427">"önizləmə"</string>
-    <string name="replace_image" msgid="3171240952601443619">"Şəkli əvəz edin"</string>
-    <string name="duration_sec" msgid="6617032324007824096">"Müddət (<xliff:g id="DURATION">%s</xliff:g> san)"</string>
-    <string name="duration_selector_title" msgid="5981097971537625852">"Slayd üçün müddət "</string>
-    <string name="layout_selector_title" msgid="7344600117972450771">"Slaydşou tərtibatı "</string>
-    <string name="layout_top" msgid="6811021650398972346">"Tərtibat (yuxarı)"</string>
-    <string name="layout_bottom" msgid="5822765871095491843">"Tərtibat (aşağı)"</string>
-    <string name="type_to_compose_text_or_leave_blank" msgid="7769792471457574059">"Mesaj yazın, ya da boş buraxın"</string>
-    <string name="duration_not_a_number" msgid="2856636898040421237">"Müddət rəqəm olmalıdır."</string>
-    <string name="duration_zero" msgid="3549377790195185977">"Müddət sıfır saniyədən çox olmalıdır."</string>
-    <string name="secs" msgid="6886003523109967972">"saniyə"</string>
-  <string-array name="select_dialog_items">
-    <item msgid="4840183714016984112">"1 saniyə"</item>
-    <item msgid="3734955613666864447">"2 saniyə"</item>
-    <item msgid="6032232473048379828">"3 saniyə"</item>
-    <item msgid="5978471781525927827">"4 saniyə"</item>
-    <item msgid="4888440297621208402">"5 saniyə"</item>
-    <item msgid="6047246213264166841">"6 saniyə"</item>
-    <item msgid="2327501250056533797">"7 saniyə"</item>
-    <item msgid="3400770414689795703">"8 saniyə"</item>
-    <item msgid="4358760614161107970">"9 saniyə"</item>
-    <item msgid="2618179407176906471">"10 saniyə"</item>
-    <item msgid="7786079681602275449">"Digər"</item>
-  </string-array>
-    <string name="menu_view_contact" msgid="1414670584423909451">"Kontakta baxın"</string>
-    <string name="menu_add_to_contacts" msgid="1258127580972228970">"Camaata əlavə edin"</string>
-    <string name="hidden_sender_address" msgid="2776075636669924968">"Gizli göndərən ünvanı"</string>
-    <string name="yes" msgid="3246158147503160811">"OK"</string>
-    <string name="no" msgid="4289742508556913860">"Ləğv et"</string>
-    <string name="set" msgid="4642365398263275979">"Ayarlayın"</string>
-    <string name="play" msgid="1888432400937785115">"Oxudun"</string>
-    <string name="edit" msgid="5912118407791492696">"Düzəliş edin"</string>
-    <string name="try_to_send" msgid="1996751738286080976">"Göndərməyə cəhd edin"</string>
-    <string name="preferences_title" msgid="6650089610332670157">"Ayarlar"</string>
-    <string name="restore_default" msgid="7165341506551155053">"İlkin ayarları bərpa edin"</string>
-    <string name="pref_notification_settings_title" msgid="6420782563630369776">"Bildirişlər"</string>
-    <string name="pref_mms_settings_title" msgid="55618772118264355">"Multimedia (MMS) mesajları"</string>
-    <string name="pref_sms_settings_title" msgid="5173078369851066881">"Mətn (SMS) mesajları"</string>
-    <string name="pref_sms_storage_title" msgid="9001233319190616445">"Yaddaş"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"SIM kartınızda saxlanan mesajları idarə edin"</string>
-    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"Hər göndərdiyiniz mesaja çatdırılma raportu tələb edin"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"Hər göndərdiyiniz mesaj üçün oxunmuş raport tələb edin"</string>
-    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"Hər göndərdiyiniz mesaj üçün çatdırılma raportu tələb edin"</string>
-    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"Limitlər aşılandan sonra köhnə mesajları silin"</string>
-    <string name="pref_summary_delete_limit" msgid="597128041393045216">"Hər söhbətə <xliff:g id="COUNT">%1$s</xliff:g> mesaj"</string>
-    <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"Bir neçə alıcının olduğu halda bir mesaj göndərmək üçün MMS istifadə edin"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"SIM kart mesajlarını idarə edin"</string>
-    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"Çatdırılma raportları"</string>
-    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"Qrup mesajlaşması"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Oxunmuş raportlar"</string>
-    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Çatdırılma raportları"</string>
-    <string name="pref_title_auto_delete" msgid="7227835692631701134">"Köhnə mesajları silin"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"Mətn mesajı limiti"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"Multimedia mesaj limiti"</string>
-    <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Bildirişlər"</string>
-    <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibrasiya"</string>
-    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Səs"</string>
-    <string name="pref_messages_to_save" msgid="3202539743892934926">"Yadda saxlamaq üçün mesajların nömrəsini ayarlayın"</string>
-    <string name="silent_ringtone" msgid="7981237991326592780">"Səssiz"</string>
-    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Avtomatik əldə edin"</string>
-    <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Mesajları avtomatik alın"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Rouminq zamanı avtomatik əldə edin"</string>
-    <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"Rouminq zamanı mesajları avtomatik alın"</string>
-    <string name="confirm_dialog_title" msgid="2187213750475782725">"Silinsin?"</string>
-    <string name="confirm_dialog_locked_title" msgid="8179085718150932242">"Kilidli mesaj silinsin mi?"</string>
-  <plurals name="confirm_delete_conversation">
-    <item quantity="one" msgid="7509396981963472833">"Bir söhbət silinəcək."</item>
-    <item quantity="other" msgid="4076915774012081811">"<xliff:g id="NUMBER">%1$s</xliff:g> söhbət silinəcək."</item>
-  </plurals>
-    <string name="confirm_delete_conversation" msgid="6115966687389279855">"Bütün mövzu silinəcək."</string>
-    <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"Bütün mövzular silinəcək."</string>
-    <string name="confirm_delete_message" msgid="9121480656609809591">"Mesaj silinəcək."</string>
-    <string name="confirm_delete_locked_message" msgid="7203411948190100955">"Bu kilidli mesaj silinsin mi?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"SIM kartdakı bütün mesajlar silinəcək."</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"SIM kartdakı bu mesaj silinəcək."</string>
-    <string name="delete_unlocked" msgid="7545321606698162261">"Kilidli mesajları silin"</string>
-    <string name="delete" msgid="1409973060081564612">"Silin"</string>
-    <string name="select_conversations" msgid="7816517565640002844">"Söhbət seçin"</string>
-    <string name="no_conversations" msgid="6773767655149258445">"Söhbət yoxdur."</string>
-    <string name="loading_conversations" msgid="5510430408235967094">"Söhbətlər yüklənir."</string>
-    <string name="cannot_get_details" msgid="850292987983026806">"Detallar əldə oluna bilmir"</string>
-    <string name="message_details_title" msgid="9223295113731634528">"Mesaj detalları"</string>
-    <string name="message_type_label" msgid="7975373966795945566">"Növ "</string>
-    <string name="text_message" msgid="8196464345251877972">"Mətn mesajı"</string>
-    <string name="multimedia_message" msgid="1512644521083533071">"Multimedia mesajı"</string>
-    <string name="multimedia_notification" msgid="4124031788554972308">"Multimedia mesajı bildirişi"</string>
-    <string name="from_label" msgid="2055117571548171397">"Göndərən "</string>
-    <string name="to_address_label" msgid="5837363600471845801">"Kimə "</string>
-    <string name="bcc_label" msgid="530867161453958774">"Nüsxəni gizli alan "</string>
-    <string name="sent_label" msgid="2722190650145251584">"Göndərilmiş: "</string>
-    <string name="received_label" msgid="8618029024731693906">"Alınmış: "</string>
-    <string name="saved_label" msgid="4183160415593488207">"Saxlanmış: "</string>
-    <string name="subject_label" msgid="8721241914144101631">"Mövzu "</string>
-    <string name="message_size_label" msgid="4698016210013319786">"Mesaj ölçüsü: "</string>
-    <string name="priority_label" msgid="7397600367853359607">"Prioritet: "</string>
-    <string name="priority_high" msgid="5627897207952009214">"Yüksək"</string>
-    <string name="priority_normal" msgid="5715227727384683550">"Normal"</string>
-    <string name="priority_low" msgid="8928782666023373987">"Aşağı"</string>
-    <string name="message_class_label" msgid="5115748690481550562">"Mesaj sinfi: "</string>
-    <string name="error_code_label" msgid="5810068247647058769">"Xəta kodu: "</string>
-    <string name="menu_edit" msgid="3056513240155967777">"Düzəliş edin"</string>
-    <string name="menu_delete_messages" msgid="2610286783513247420">"Mesajları silin"</string>
-    <string name="menu_lock" msgid="7603793126077557472">"Kilidləyin"</string>
-    <string name="menu_unlock" msgid="6662865558677424039">"Kilidini açın"</string>
-    <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"Planşet yaddaşına köçürün"</string>
-    <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"Telefonun yaddaşına köçürün"</string>
-    <string name="sim_delete" msgid="610790510655316922">"Silin"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"SIM kartdakı mətn mesajları"</string>
-    <string name="sim_view" msgid="1997173541766393706">"Göstər"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"SIM kartda mesaj yoxdur."</string>
-    <string name="delivery_header_title" msgid="5361719578869045764">"Raport"</string>
-    <string name="status_none" msgid="8253075950774894961">"(Heç nə)"</string>
-    <string name="status_pending" msgid="2739860824607984892">"Gözlənilir"</string>
-    <string name="status_read" msgid="7576195253780627332">"Oxunmuş"</string>
-    <string name="status_received" msgid="7264334589461906965">"Gəlmiş"</string>
-    <string name="status_failed" msgid="1998776666856593544">"Uğursuz"</string>
-    <string name="status_unread" msgid="8555305495998700198">"Oxunmamış"</string>
-    <string name="status_rejected" msgid="2613641949065942678">"Rədd edilmiş"</string>
-    <string name="recipient_label" msgid="3922667485312634446">"Alıcı: "</string>
-    <string name="status_label" msgid="7283375460919181660">"Status: "</string>
-    <string name="delivered_label" msgid="3514011729156932928">"Çatdırıldı: "</string>
-    <string name="attach_image" msgid="6439985727687107742">"Şəkillər"</string>
-    <string name="attach_take_photo" msgid="4280601313184373837">"Şəkil çəkin"</string>
-    <string name="attach_video" msgid="4264272693501538294">"Videolar"</string>
-    <string name="attach_record_video" msgid="3099814114743078615">"Video çəkin"</string>
-    <string name="attach_sound" msgid="3149325985970669609">"Audio"</string>
-    <string name="attach_record_sound" msgid="6011431304469858929">"Səs yazılır"</string>
-    <string name="attach_slideshow" msgid="3497422151091037063">"Slaydşou"</string>
-    <string name="select_bottom_text" msgid="4201966447623311931">"Alt mətn"</string>
-    <string name="select_top_text" msgid="6734183477539197815">"Üst mətn"</string>
-    <string name="delivery_toast_body" msgid="5960519861835727013">"Mesaj %s tərəfindən alındı."</string>
-    <string name="notification_multiple" msgid="7684007285202109490">"<xliff:g id="COUNT">%s</xliff:g> oxunmamış mesaj."</string>
-    <string name="notification_multiple_title" msgid="332602028959557541">"Yeni mesajlar"</string>
-    <string name="notification_failed_multiple" msgid="6192531993698497229">"<xliff:g id="COUNT">%s</xliff:g> mesaj göndərilə bilmədi."</string>
-    <string name="notification_failed_multiple_title" msgid="1112032024904397126">"Mesajlar göndərilmədi"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"SIM kart dolub"</string>
-    <string name="sim_full_body" msgid="6241664980790322925">"Bir az yer açmaq üçün bəzi mesajları silin."</string>
-    <string name="sms_full_title" msgid="6041287140125011854">"Mətn mesajı yaddaşı doludur"</string>
-    <string name="sms_full_body" msgid="4885861852397651868">"Yaddaş dolu olduğu üçün gələn mesaj rədd edilməli oldu. Köhnə mesajları silin ki, yeniləri üçün yer olsun."</string>
-    <string name="sms_rejected_title" msgid="8548394922491529811">"Mətn mesajı rədd edildi"</string>
-    <string name="sms_rejected_body" msgid="7813671133968158562">"Gələn mesaj naməlum səbəblərdən rədd edilməli oldu."</string>
-    <string name="type_audio" msgid="3842064092332309756">"audio"</string>
-    <string name="type_picture" msgid="4091928975383609443">"şəkil"</string>
-    <string name="type_video" msgid="8521556159545168441">"video"</string>
-    <string name="confirm" msgid="3155110885840591914">"Təsdiq edin"</string>
-    <string name="message_send_read_report" msgid="6997117678914261250">"Oxunmuş raport göndəriləcək."</string>
-    <string name="message_queued" msgid="7975945623873194737">"Hazırda mesaj göndərilə bilmir. Xidmət əlçatımlı olan zaman göndəriləcək."</string>
-    <string name="fdn_check_failure" msgid="7880740763778173551">"Yalnız sabit yığım nömrələrinə mesaj göndərə bilərsiniz."</string>
-    <string name="no_subject" msgid="4168963736134552285">"(Mövzusuz)"</string>
-    <string name="unknown_sender" msgid="4929330613278853635">"Naməlum göndərən"</string>
-    <string name="dl_failure_notification" msgid="8097699679464396537">"<xliff:g id="SUBJECT">%1$s</xliff:g> mesajı <xliff:g id="FROM">%2$s</xliff:g> bölməsindən endirilə bilmir."</string>
-    <string name="rate_limit_surpassed" msgid="1347801608211628177">"Təsdiqləyin"</string>
-    <string name="confirm_rate_limit" msgid="234228299751243067">"Böyük sayda multimedia mesajları göndərilir. Göndərilsin?"</string>
-    <string name="message_download_failed_title" msgid="5722226064394767921">"Mesaj endirilmədi"</string>
-    <string name="message_send_failed_title" msgid="3469894907399046372">"Mesaj göndərilmədi"</string>
-    <string name="message_failed_body" msgid="3421296112073915245">"Mesaja yenidən baxıb təkrarlamaq üçün toxunun"</string>
-    <string name="download_later" msgid="5531365714424360903">"İndi endirilə bilmir. Sonra cəhd edin."</string>
-    <string name="no_apn" msgid="505932916503312015">"Cihazda heç bir APN təyin olunmayıb."</string>
-    <string name="select_audio" msgid="3528161449756771832">"Audio seçin"</string>
-    <string name="copy_to_sdcard" msgid="757028609638184856">"Qoşmanı yadda saxlayın"</string>
-    <string name="copy_to_sdcard_success" msgid="7948625615155992014">"Qoşma yadda saxlanıldı."</string>
-    <string name="copy_to_sdcard_fail" msgid="4944606369631916737">"Qoşmanı yadda saxlamaq alınmadı."</string>
-    <string name="save_ringtone" msgid="2310157075045201051">"Zəng səsi edin"</string>
-    <string name="saved_ringtone" msgid="3847363932276708626">"Zəng səsi qeyd edildi."</string>
-    <string name="saved_ringtone_fail" msgid="4778500070919251116">"Zəng səsi qeyd edilə bilmədi."</string>
-    <string name="menu_insert_smiley" msgid="4964504393061025071">"Smayl qoyun"</string>
-    <string name="menu_group_participants" msgid="4288356090262299071">"Qrup iştirakçıları"</string>
-    <string name="select_link_title" msgid="3371818607625768447">"Fəaliyyət seçin"</string>
-    <string name="slide_number" msgid="1923958526266726635">"Slayd <xliff:g id="NUMBER">%s</xliff:g>"</string>
-  <plurals name="slide_duration">
-    <item quantity="one" msgid="1654101988340583935">"<xliff:g id="NUMBER">%s</xliff:g> san"</item>
-    <item quantity="few" msgid="7887190171856293871">"<xliff:g id="NUMBER">%s</xliff:g> saniyə"</item>
-    <item quantity="other" msgid="3736425355579939863">"<xliff:g id="NUMBER">%s</xliff:g> saniyə"</item>
-  </plurals>
-    <string name="delivery_report_activity" msgid="2957463094232916364">"Çatdırılma raportu"</string>
-    <string name="storage_limits_activity" msgid="8810530813311077716">"Yaddaş limitləri"</string>
-    <string name="change_duration_activity" msgid="7048606979485031693">"Müddəti Dəyişin"</string>
-    <string name="edit_slideshow_activity" msgid="8751493388760050529">"Slaydşouya düzəliş edin"</string>
-    <string name="recipient_list_activity" msgid="1254938236543727019">"Qrup iştirakçıları"</string>
-    <string name="edit_slide_activity" msgid="8752829671778696983">"Slayda düzəliş edin"</string>
-    <string name="slideshow_activity" msgid="5658249461317434432">"Slaydşou"</string>
-    <string name="class_0_message_activity" msgid="6631339964159861048">"Klass 0 mesaj"</string>
-    <string name="search_label" msgid="6042598929386174964">"Mesajlaşma"</string>
-    <string name="search_hint" msgid="7273727663577472044">"Mesajlaşmada axtarın"</string>
-    <string name="search" msgid="7560238620274735199">"Mesajlaşma"</string>
-    <string name="search_setting_description" msgid="4104004595086437572">"Mesajlarınızda yazın"</string>
-    <string name="search_empty" msgid="2109551478056039278">"Üst-üstə düşmürlər."</string>
-  <plurals name="search_results_title">
-    <item quantity="one" msgid="4657073733087431350">"<xliff:g id="NUMBER">%1$s</xliff:g> \"<xliff:g id="SEARCH">%2$s</xliff:g>\" üçün nəticə"</item>
-    <item quantity="other" msgid="6196382287749539209">"<xliff:g id="NUMBER">%1$s</xliff:g> \"<xliff:g id="SEARCH">%2$s</xliff:g>\" üçün nəticələr"</item>
-  </plurals>
-    <string name="search_history" msgid="4127805495662693154">"\"<xliff:g id="SEARCH">%2$s</xliff:g>\" üçün <xliff:g id="COUNT">%1$s</xliff:g> nəticə"</string>
-    <string name="confirm_clear_search_title" msgid="8510295993632032904">"Təmizlə"</string>
-    <string name="confirm_clear_search_text" msgid="8731877031837077478">"Axtarış tarixçəsi təmizlənəcək"</string>
-    <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Axtarış tarixçəsini təmizləyin"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"Öncəki Mesajlaşma axtarışlarını Axtarış qutusunda göstərməkdən təmizləyin"</string>
-    <string name="save" msgid="6847069284991531310">"Yadda saxla"</string>
-    <string name="storage_limits_title" msgid="7074684882530693016">"Mesajlara limit qoyun"</string>
-    <string name="storage_limits_message" msgid="2010501485394745696">"Hər söhbət üçün saxlayacağınız mesajların sayını məhdudlaşdırmaq istəyirsiniz mi?"</string>
-    <string name="storage_limits_setting" msgid="4952781049308537373">"Limitləri ayarlayın"</string>
-    <string name="storage_limits_setting_dismiss" msgid="1433841310158458034">"Limit yoxdur"</string>
-    <string name="too_many_unsent_mms" msgid="4436493698891224126">"Mesajı indi göndərmək olmur. Həddən çox göndərilməmiş multimedia mesajları var."</string>
-    <string name="sending_message" msgid="2054406576361149715">"GÖNDƏRİLİR ..."</string>
-    <string name="pick_too_many_recipients" msgid="650087588867628044">"Həddən çox alıcı var"</string>
-    <string name="adding_recipients" msgid="2962810172527532357">"Alıcılar əlavə olunur…"</string>
-    <string name="draft_separator" msgid="5402575086540243019">", "</string>
-    <string name="message_count_format" msgid="4434763220590778012">" <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="message_count_notification" msgid="3629968600032690007">"<xliff:g id="NUMBER">%1$s</xliff:g> yeni mesaj"</string>
-  <plurals name="message_count_notification_overflow">
-    <item quantity="one" msgid="3340591167508150806">"+ <xliff:g id="NUMBER">%1$s</xliff:g> başqa mesaj"</item>
-    <item quantity="other" msgid="1393002799298501480">"+ <xliff:g id="NUMBER">%1$s</xliff:g> başqa mesajlar"</item>
-  </plurals>
-    <string name="error_state" msgid="5177386717626893507">"Ziddiyyətli status"</string>
-    <string name="error_state_text" msgid="7918866106335387710">"Mövzuların və alıcıların statusu ziddiyyətlidir. Lütfən, baq raportunu bu ünvana göndərin: http://go/droidanizer"</string>
-  <plurals name="recipient_count">
-    <item quantity="other" msgid="7338580381574463136">"<xliff:g id="NUMBER">%1$s</xliff:g> nəfər"</item>
-  </plurals>
-    <string name="disable_notifications_dialog_message" msgid="7644011234972074096">"Varsayılan mesaj tətbiqindən mətn mesajı bildirişinin dublikasiya olunması dayandırılsın?"</string>
-    <string name="view_more_conversations" msgid="7275920132410734671">"Daha çox söhbətə baxın"</string>
-    <string name="attachment_audio" msgid="2867960243300539143">"Audio"</string>
-    <string name="attachment_slideshow" msgid="5867689101881763318">"Slaydşou"</string>
-    <string name="attachment_video" msgid="4252062022156694591">"Video"</string>
-    <string name="attachment_picture" msgid="3709286281567284296">"Şəkil"</string>
-    <string name="notification_separator" msgid="2334673105226536422">"  "</string>
-    <string name="enumeration_comma" msgid="213598026698964628">", "</string>
-    <string name="message_timestamp_format" msgid="4188999027493614617">"<xliff:g id="STRING_0">%1$s</xliff:g> - <xliff:g id="STRING_1">%2$s</xliff:g>"</string>
-    <string name="storage_warning_title" msgid="7124740686325942375">"Telefonunuzun yaddaşı doludur"</string>
-    <string name="storage_warning_content" msgid="1100367816649962354">"Siz yeni SMS/MMS mesajları almayacaqsınız"</string>
-    <string name="label_mms_send_outbox_msg" msgid="3395185162973061099">"MMS Oyandırma"</string>
-    <string name="desc_mms_send_outbox_msg" msgid="1837156781311437148">"Bütün MMS\'ləri gedənlər qutusundan şəbəkəyə göndərin"</string>
-</resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
deleted file mode 100644
index 2f013606..00000000
--- a/res/values-be/arrays.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- * Copyright (C) 2008 Esmertec AG.
- * Copyright (C) 2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="empty_subject_strings">
-    <item msgid="7691141505407124426">"без тэмы"</item>
-  </string-array>
-</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
deleted file mode 100644
index aedffe39..00000000
--- a/res/values-be/strings.xml
+++ /dev/null
@@ -1,372 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1503967887341230795">"Паведамленні"</string>
-    <string name="new_message" msgid="1530369762346003973">"Новае паведамленне"</string>
-    <string name="menu_call_back" msgid="7538482331117914146">"Выклік карыстальнiка <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_send_email" msgid="671366308915241664">"Адправіць паведамленне электроннай пошты для карыстальнiка <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_compose_new" msgid="3763437973691046238">"Напісаць"</string>
-    <string name="menu_preferences" msgid="4693148116114749414">"Налады"</string>
-    <string name="menu_add_address_to_contacts" msgid="4491980950419914944">"Дадаць <xliff:g id="CONTACTEMAILORNUMBER">%s</xliff:g> у кантакты"</string>
-    <string name="menu_call" msgid="5877123227307074690">"Выклік"</string>
-    <string name="menu_search" msgid="2289469305728821360">"Пошук"</string>
-    <string name="menu_delete_all" msgid="808729454898114735">"Выдаліць усе ланцужкi"</string>
-    <string name="menu_delete" msgid="1851666911396479006">"Выдаліць галіну"</string>
-    <string name="menu_view" msgid="7448852683948080108">"Прагляд галіны"</string>
-    <string name="menu_debug_dump" msgid="6855869130206549643">"DEBUG DUMP"</string>
-    <string name="refreshing" msgid="987335057871404222">"Абнаўленне..."</string>
-    <string name="menu_cell_broadcasts" msgid="5646161375983084660">"Мабільнае вяшчанне"</string>
-    <string name="has_draft" msgid="2487465595514636160">"Чарнавік"</string>
-    <string name="no_subject_view" msgid="7795086723069563537">"(Без тэмы)"</string>
-    <string name="messagelist_sender_self" msgid="3579016854116401602">"Я"</string>
-    <string name="view_slideshow" msgid="4990460971211388453">"Прагледзець слайд-шоу"</string>
-    <string name="view_message_details" msgid="7613457646645796831">"Прагледзець звесткі"</string>
-    <string name="view_delivery_report" msgid="8219095994071575215">"Прагледзець справаздачу"</string>
-    <string name="delete_message" msgid="6442394955910357234">"Выдаліць"</string>
-    <string name="expire_on" msgid="4436268382742593921">"Мінае: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="kilobyte" msgid="534782148965716631">"Кб"</string>
-    <string name="undelivered_msg_dialog_title" msgid="7479433403599785755">"Недастаўленыя паведамленні"</string>
-    <string name="undelivered_msg_dialog_body" msgid="4789268239627694551">"Немагчыма адправіць паведамленне.\nСпроба: <xliff:g id="MESSAGE">%s</xliff:g>."</string>
-    <string name="undelivered_sms_dialog_body" msgid="4203703285563450868">"Немагчыма адправіць гэта паведамленне."</string>
-    <string name="delete_thread" msgid="757258847736632791">"Выдаліць галіну"</string>
-    <string name="menu_forward" msgid="9026858380050046756">"Наперад"</string>
-    <string name="download" msgid="4488877642230207631">"Спампаваць"</string>
-    <string name="downloading" msgid="1779557575565350637">"Запампоўванне"</string>
-    <string name="inline_subject" msgid="4057621785274119260">"&lt;Тэма: <xliff:g id="SUBJECT">%s</xliff:g> &gt;"</string>
-    <string name="drm_protected_text" msgid="1396394157870730742">"* тэкст, абаронены DRM *"</string>
-    <string name="insufficient_drm_rights" msgid="6989074725969164383">"Недастаткова правоў DRM."</string>
-    <string name="copy_message_text" msgid="4296252229544252834">"Капіяваць тэкст"</string>
-    <string name="message_options" msgid="6838806653341967550">"Параметры паведамлення"</string>
-    <string name="slideshow_options" msgid="3501759384739796431">"Параметры слайд-шоу"</string>
-    <string name="done" msgid="7479926268660505871">"Зроблена"</string>
-    <string name="move_up" msgid="7307578107431739359">"Перанесці уверх"</string>
-    <string name="move_down" msgid="6356509518429479053">"Перанесці ўніз"</string>
-    <string name="remove_slide" msgid="2225604354024914900">"Выдаліць слайд"</string>
-    <string name="add_slide" msgid="9140721399423564187">"Дадаць слайд"</string>
-    <string name="add_slide_hint" msgid="7351356961076244584">"Націсніце, каб стварыць новы слайд."</string>
-    <string name="discard_slideshow" msgid="5054239124146413609">"Адмяніць слайд-шоу"</string>
-    <string name="slide_show_part" msgid="5077675385448696846">"Частка <xliff:g id="PART">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="remove_text" msgid="2164068850029476539">"Выдаліць тэкст"</string>
-    <string name="add_picture" msgid="7819574884962571479">"Дадаць малюнак"</string>
-    <string name="remove_picture" msgid="6378701749074289096">"Выдаліць малюнак"</string>
-    <string name="add_music" msgid="3827442822987116233">"Дадаць музыку"</string>
-    <string name="remove_music" msgid="858889733416015223">"Выдаліць музыку"</string>
-    <string name="add_video" msgid="7816866867806595144">"Дадаць відэа"</string>
-    <string name="remove_video" msgid="5258603891528497799">"Выдаліць відэа"</string>
-    <string name="to_hint" msgid="224029549150332986">"Каму"</string>
-    <string name="subject_hint" msgid="4296714962311604126">"Тэма"</string>
-    <string name="add_attachment" msgid="7103751293360532684">"Далучыць"</string>
-    <string name="add_subject" msgid="7616134948428265870">"Дадаць тэму"</string>
-    <string name="discard" msgid="1624800293064498479">"Адхіліць"</string>
-    <string name="view" msgid="7929667761715467136">"Прагледзець"</string>
-    <string name="replace" msgid="7587904998114459388">"Замяніць"</string>
-    <string name="remove" msgid="4625444913256213175">"Выдаліць"</string>
-    <string name="send" msgid="4589898724889248486">"Адправіць"</string>
-    <string name="mms" msgid="1587631213714914559">"MMS"</string>
-    <string name="send_mms" msgid="2933162044872550662">"Адправіць MMS"</string>
-    <string name="all_threads" msgid="2663426830306307194">"Усе галіны"</string>
-    <string name="type_to_compose_text_enter_to_send" msgid="3539985471008581265">"Увесці паведамленне"</string>
-    <string name="open_keyboard_to_compose_message" msgid="7860109685511253191">"Адкрыць клавіятуру, каб увесці паведамленне"</string>
-    <!-- no translation found for sending_disabled_not_default_app (6685337318181265136) -->
-    <skip />
-    <!-- no translation found for compose_disabled_toast (1838175321052707875) -->
-    <skip />
-    <string name="compressing" msgid="1961357529661045180">"Малюнак занадта вялікі. Сцісканне..."</string>
-    <string name="unsupported_media_format" msgid="1350489690977363764">"Фармат <xliff:g id="NAME">%1$s</xliff:g> не падтрымліваецца."</string>
-    <string name="select_different_media" msgid="6241623357299382183">"Выберыце iншы варыянт: <xliff:g id="NAME">%1$s</xliff:g>."</string>
-    <string name="exceed_message_size_limitation" msgid="6027753647094742437">"Дасягнута абмежаванне на памер паведамлення."</string>
-    <string name="message_too_big_for_video" msgid="2639367545165352543">"Паведамленне занадта вялікае, каб далучыць відэа."</string>
-    <string name="failed_to_add_media" msgid="7207464170168708485">"На жаль, вы не можаце дадаць карыстальнiка <xliff:g id="NAME">%1$s</xliff:g> да свайго паведамлення."</string>
-    <string name="failed_to_resize_image" msgid="5608354151631833669">"Памер малюнка не зменены."</string>
-    <string name="resize_image_error_information" msgid="3783200130776554475">"Нават пры змене памераў гэта выява занадта вялікая для перадачы."</string>
-    <string name="forward_prefix" msgid="276280492803486464">"Пераслаць: "</string>
-    <string name="discard_message_reason" msgid="2667664943003796133">"Вашае паведамленне будзе адхіленае, таму што яно не мае сапраўдных атрымальнікаў."</string>
-    <string name="has_invalid_recipient" msgid="1485388396900997383">"Несапраўдны атрымальнік(-і): &lt;<xliff:g id="NAME">%1$s</xliff:g>&gt;"</string>
-    <string name="invalid_destination" msgid="4573835601024786416">"Недапушчальны адрас прызначэння."</string>
-    <string name="service_not_activated" msgid="9178218144019626176">"Паслуга не актываваная ў сетцы."</string>
-    <string name="service_message_not_found" msgid="1908877102600048515">"Паведамленне пратэрмінаванае або недаступнае."</string>
-    <string name="service_network_problem" msgid="4583269174855943025">"Не атрымалася адправіць з-за праблем сеткi."</string>
-    <string name="invalid_recipient_message" msgid="6465343105010999068">"Выпраўце атрымальнікаў, інакш яны не атрымаюць паведамленне."</string>
-    <string name="cannot_send_message" msgid="3414307479833622644">"Не атрымлiваецца адправіць паведамленне"</string>
-    <string name="cannot_send_message_reason" msgid="8745080126044054343">"У вашага паведамлення няма сапраўдных атрымальнікаў."</string>
-    <string name="cannot_forward_drm_obj" msgid="5047623751430559077">"Нельга перанакiраваць аб\'ект DRM з паведамлення."</string>
-    <string name="converting_to_picture_message" msgid="2980023239017588627">"Пераўтварэнне ў мультымедыйнае паведамленне..."</string>
-    <string name="cannot_add_slide_anymore" msgid="4631404749618820994">"Не атрымліваецца дадаць слайды."</string>
-    <string name="cannot_add_picture_and_video" msgid="4954353772391381447">"Немагчыма дадаць відэа і фатаграфію ў адзін слайд."</string>
-    <string name="cannot_save_message" msgid="3375907366965264446">"Немагчыма захаваць паведамленне."</string>
-    <string name="message_saved_as_draft" msgid="2503018972659880692">"Паведамленне захаванае як чарнавік."</string>
-    <string name="too_many_recipients" msgid="7003415094007176931">"Занадта шмат атрымальнікаў (<xliff:g id="CURRENTCOUNT">%1$s</xliff:g>). Максімальная колькасць атрымальнікаў: <xliff:g id="MAXLIMIT">%2$s</xliff:g>."</string>
-    <string name="too_many_attachments" msgid="3774037894899750070">"Максімальная колькасць укладанняў: <xliff:g id="MAXLIMIT">%1$s</xliff:g>. Будуць дададзеныя толькі першыя <xliff:g id="CURRENTCOUNT">%2$s</xliff:g>."</string>
-    <string name="adding_attachments_title" msgid="2034535554212405529">"Даданне далучэнняў"</string>
-    <string name="adding_attachments" msgid="5871373105122355632">"Пачакайце, пакуль у слайд-шоу дадаюцца элементы."</string>
-    <string name="building_slideshow_title" msgid="1232338692400726385">"Будаванне слайд-шоу"</string>
-    <string name="cannot_play_audio" msgid="253920977253666735">"Не атрымліваецца прайграць аўдыё."</string>
-    <string name="preview" msgid="5438149136136446756">"Папярэдні прагляд"</string>
-    <string name="preview_slideshow" msgid="6824095909448728427">"Папярэдні прагляд"</string>
-    <string name="replace_image" msgid="3171240952601443619">"Замяніце малюнак"</string>
-    <string name="duration_sec" msgid="6617032324007824096">"Працягласць (<xliff:g id="DURATION">%s</xliff:g> с.)"</string>
-    <string name="duration_selector_title" msgid="5981097971537625852">"Працягласць паказу слайда "</string>
-    <string name="layout_selector_title" msgid="7344600117972450771">"Кампаноўка слайд-шоу "</string>
-    <string name="layout_top" msgid="6811021650398972346">"Кампаноўка (верх)"</string>
-    <string name="layout_bottom" msgid="5822765871095491843">"Кампаноўка (ніз)"</string>
-    <string name="type_to_compose_text_or_leave_blank" msgid="7769792471457574059">"Увядзіце паведамленне або пакіньце поле пустым"</string>
-    <string name="duration_not_a_number" msgid="2856636898040421237">"Працягласць павінна быць выяўлена лічбамі."</string>
-    <string name="duration_zero" msgid="3549377790195185977">"Працягласць павінна быць больш за нуль секунд."</string>
-    <string name="secs" msgid="6886003523109967972">"с."</string>
-  <string-array name="select_dialog_items">
-    <item msgid="4840183714016984112">"1 секунда"</item>
-    <item msgid="3734955613666864447">"2 секунды"</item>
-    <item msgid="6032232473048379828">"3 секунды"</item>
-    <item msgid="5978471781525927827">"4 секунды"</item>
-    <item msgid="4888440297621208402">"5 секунд"</item>
-    <item msgid="6047246213264166841">"30 секунд"</item>
-    <item msgid="2327501250056533797">"7 секунд"</item>
-    <item msgid="3400770414689795703">"8 секунд"</item>
-    <item msgid="4358760614161107970">"9 секунд"</item>
-    <item msgid="2618179407176906471">"10 секунд"</item>
-    <item msgid="7786079681602275449">"Іншае"</item>
-  </string-array>
-    <string name="menu_view_contact" msgid="1414670584423909451">"Прагледзець кантакт"</string>
-    <string name="menu_add_to_contacts" msgid="1258127580972228970">"Дадаць у кантакты"</string>
-    <string name="hidden_sender_address" msgid="2776075636669924968">"Адрас адпраўшчыка утоены"</string>
-    <string name="yes" msgid="3246158147503160811">"ОК"</string>
-    <string name="no" msgid="4289742508556913860">"Адмяніць"</string>
-    <string name="set" msgid="4642365398263275979">"Задаць"</string>
-    <string name="play" msgid="1888432400937785115">"Прайграць"</string>
-    <string name="edit" msgid="5912118407791492696">"Рэдагаваць"</string>
-    <string name="try_to_send" msgid="1996751738286080976">"Паспрабаваць адправіць"</string>
-    <string name="preferences_title" msgid="6650089610332670157">"Налады"</string>
-    <string name="restore_default" msgid="7165341506551155053">"Аднавіць значэнні па змаўчанні"</string>
-    <string name="pref_notification_settings_title" msgid="6420782563630369776">"Апавяшчэнні"</string>
-    <string name="pref_mms_settings_title" msgid="55618772118264355">"Мультымедыйныя паведамленнi (MMS)"</string>
-    <string name="pref_sms_settings_title" msgid="5173078369851066881">"Тэкставыя паведамленні (SMS)"</string>
-    <string name="pref_sms_storage_title" msgid="9001233319190616445">"Сховішча"</string>
-    <!-- no translation found for pref_title_sms_disabled (1441894740130104326) -->
-    <skip />
-    <!-- no translation found for pref_summary_sms_disabled (8975773722051230744) -->
-    <skip />
-    <!-- no translation found for pref_title_sms_enabled (1857849790200375277) -->
-    <skip />
-    <!-- no translation found for pref_summary_sms_enabled (2106125420361911250) -->
-    <skip />
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"Кіраваць паведамленнямі, якія захоўваюцца на SIM-карце"</string>
-    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"Запытаць справаздачу аб дастаўцы для кожнага паведамлення, адпраўленнага вамі"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"Запытаць справаздачу аб прачытанні для кожнага паведамлення, адпраўленага вамі"</string>
-    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"Запытаць справаздачу аб дастаўцы для кожнага паведамлення, адпраўленага вамі"</string>
-    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"Выдаляць старыя паведамленні пасля дасягнення абмежавання"</string>
-    <string name="pref_summary_delete_limit" msgid="597128041393045216">"Паведамленняў у размове: <xliff:g id="COUNT">%1$s</xliff:g>"</string>
-    <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"Выкарыстоўвайце MMS для адпраўкі аднаго паведамлення пры наяўнасці некалькіх атрымальнікаў"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"Кiраванне паведамленнямі на SIM-карце"</string>
-    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"Справаздачы аб дастаўцы"</string>
-    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"Групавыя паведамленні"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Справаздачы аб прачытанні"</string>
-    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Справаздачы аб дастаўцы"</string>
-    <string name="pref_title_auto_delete" msgid="7227835692631701134">"Выдаліць старыя паведамленні"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"Абмежаванне тэкставых паведамленняў"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"Абмежаванне мультымедыйных паведамленняў"</string>
-    <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Апавяшчэнні"</string>
-    <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Вібраваць"</string>
-    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Гук"</string>
-    <string name="pref_messages_to_save" msgid="3202539743892934926">"Усталяваць колькасць паведамленняў для захавання"</string>
-    <string name="silent_ringtone" msgid="7981237991326592780">"Ціхі рэжым"</string>
-    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Атрымліваць аўтаматычна"</string>
-    <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Аўтаматычна атрымліваць паведамленні"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Аўтаматычна атрымліваць у роўмінгу"</string>
-    <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"Аўтаматычна атрымліваць паведамленні ў роўмінгу"</string>
-    <string name="confirm_dialog_title" msgid="2187213750475782725">"Выдаліць?"</string>
-    <string name="confirm_dialog_locked_title" msgid="8179085718150932242">"Выдаліць заблакаванае паведамленне?"</string>
-  <plurals name="confirm_delete_conversation">
-    <item quantity="one" msgid="7509396981963472833">"Адна размова будзе выдалена."</item>
-    <item quantity="other" msgid="4076915774012081811">"Будзе выдалена размоў: <xliff:g id="NUMBER">%1$s</xliff:g>."</item>
-  </plurals>
-    <string name="confirm_delete_conversation" msgid="6115966687389279855">"Уся галіна будзе выдаленая."</string>
-    <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"Усе галіны будуць выдалены."</string>
-    <string name="confirm_delete_message" msgid="9121480656609809591">"Паведамленне будзе выдаленае."</string>
-    <string name="confirm_delete_locked_message" msgid="7203411948190100955">"Выдаліць гэта заблакаванае паведамленне?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"Усе паведамленні будуць выдалены з SIM-карты."</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"Гэта паведамленне будзе выдалена з SIM-карты."</string>
-    <string name="delete_unlocked" msgid="7545321606698162261">"Выдаліць заблакаваныя паведамленнi"</string>
-    <string name="delete" msgid="1409973060081564612">"Выдаліць"</string>
-    <string name="select_conversations" msgid="7816517565640002844">"Выберыце размовы"</string>
-    <string name="no_conversations" msgid="6773767655149258445">"Няма размоў."</string>
-    <string name="loading_conversations" msgid="5510430408235967094">"Загрузка ланцужкоў."</string>
-    <string name="cannot_get_details" msgid="850292987983026806">"Падрабязнасцi не атрыманы."</string>
-    <string name="message_details_title" msgid="9223295113731634528">"Падрабязнасці паведамлення"</string>
-    <string name="message_type_label" msgid="7975373966795945566">"Тып: "</string>
-    <string name="text_message" msgid="8196464345251877972">"Тэкставае паведамленне"</string>
-    <string name="multimedia_message" msgid="1512644521083533071">"Мультымедыйнае паведамленне"</string>
-    <string name="multimedia_notification" msgid="4124031788554972308">"Апавяшчэнні мультымедыйных паведамленняў"</string>
-    <string name="from_label" msgid="2055117571548171397">"Ад: "</string>
-    <string name="to_address_label" msgid="5837363600471845801">"Каму: "</string>
-    <string name="bcc_label" msgid="530867161453958774">"Утоеная копія: "</string>
-    <string name="sent_label" msgid="2722190650145251584">"Дасланыя: "</string>
-    <string name="received_label" msgid="8618029024731693906">"Атрымана: "</string>
-    <string name="saved_label" msgid="4183160415593488207">"Захавана: "</string>
-    <string name="subject_label" msgid="8721241914144101631">"Тэма: "</string>
-    <string name="message_size_label" msgid="4698016210013319786">"Памер паведамлення: "</string>
-    <string name="priority_label" msgid="7397600367853359607">"Прыярытэт: "</string>
-    <string name="priority_high" msgid="5627897207952009214">"Высокі"</string>
-    <string name="priority_normal" msgid="5715227727384683550">"Звычайны"</string>
-    <string name="priority_low" msgid="8928782666023373987">"Нізкі"</string>
-    <string name="message_class_label" msgid="5115748690481550562">"Клас паведамлення: "</string>
-    <string name="error_code_label" msgid="5810068247647058769">"Код памылкі: "</string>
-    <string name="menu_edit" msgid="3056513240155967777">"Рэдагаваць"</string>
-    <string name="menu_delete_messages" msgid="2610286783513247420">"Выдаліць паведамленні"</string>
-    <string name="menu_lock" msgid="7603793126077557472">"Заблакаваць"</string>
-    <string name="menu_unlock" msgid="6662865558677424039">"Разблакаваць"</string>
-    <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"Капіяваць у памяць планшэта"</string>
-    <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"Капіяваць у памяць тэлефона"</string>
-    <string name="sim_delete" msgid="610790510655316922">"Выдаліць"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"Тэкставыя паведамленні на SIM-карце"</string>
-    <string name="sim_view" msgid="1997173541766393706">"Прагледзець"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"На SIM-карце няма паведамленняў."</string>
-    <string name="delivery_header_title" msgid="5361719578869045764">"Справаздача"</string>
-    <string name="status_none" msgid="8253075950774894961">"(Няма)"</string>
-    <string name="status_pending" msgid="2739860824607984892">"У чаканні"</string>
-    <string name="status_read" msgid="7576195253780627332">"Прачытана"</string>
-    <string name="status_received" msgid="7264334589461906965">"Атрымана"</string>
-    <string name="status_failed" msgid="1998776666856593544">"Няўдала"</string>
-    <string name="status_unread" msgid="8555305495998700198">"Непрачытаны"</string>
-    <string name="status_rejected" msgid="2613641949065942678">"Адхілена"</string>
-    <string name="recipient_label" msgid="3922667485312634446">"Атрымальнік: "</string>
-    <string name="status_label" msgid="7283375460919181660">"Стан: "</string>
-    <string name="delivered_label" msgid="3514011729156932928">"Пастаўляецца: "</string>
-    <string name="attach_image" msgid="6439985727687107742">"Малюнкі"</string>
-    <string name="attach_take_photo" msgid="4280601313184373837">"Захоп малюнка"</string>
-    <string name="attach_video" msgid="4264272693501538294">"Відэа"</string>
-    <string name="attach_record_video" msgid="3099814114743078615">"Захоп відэа"</string>
-    <string name="attach_sound" msgid="3149325985970669609">"Аўдыё"</string>
-    <string name="attach_record_sound" msgid="6011431304469858929">"Запісаць аўдыё"</string>
-    <string name="attach_slideshow" msgid="3497422151091037063">"Слайд-шоу"</string>
-    <string name="select_bottom_text" msgid="4201966447623311931">"Тэкст унізе"</string>
-    <string name="select_top_text" msgid="6734183477539197815">"Тэкст уверсе"</string>
-    <string name="delivery_toast_body" msgid="5960519861835727013">"Карыстальнiк %s атрымаў паведамленне."</string>
-    <string name="notification_multiple" msgid="7684007285202109490">"Непрачытаных паведамленняў: <xliff:g id="COUNT">%s</xliff:g>."</string>
-    <string name="notification_multiple_title" msgid="332602028959557541">"Новыя паведамленні"</string>
-    <string name="notification_failed_multiple" msgid="6192531993698497229">"Немагчыма даслаць паведамленнi: <xliff:g id="COUNT">%s</xliff:g>."</string>
-    <string name="notification_failed_multiple_title" msgid="1112032024904397126">"Паведамленні не адпраўлены"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"SIM-карта поўная"</string>
-    <string name="sim_full_body" msgid="6241664980790322925">"Выдаліце некаторыя паведамленні, каб вызваліць месца."</string>
-    <string name="sms_full_title" msgid="6041287140125011854">"Памяць тэкставых паведамленняў запоўненая"</string>
-    <string name="sms_full_body" msgid="4885861852397651868">"Уваходнае паведамленне было адхілена з-за перапаўнення памяці. Выдаліце старыя паведамленні."</string>
-    <string name="sms_rejected_title" msgid="8548394922491529811">"Тэкставае паведамленне адхіленае"</string>
-    <string name="sms_rejected_body" msgid="7813671133968158562">"Уваходнае паведамленне было адхілена па невядомай прычыне."</string>
-    <string name="type_audio" msgid="3842064092332309756">"аўдыё"</string>
-    <string name="type_picture" msgid="4091928975383609443">"малюнак"</string>
-    <string name="type_video" msgid="8521556159545168441">"Відэа"</string>
-    <string name="confirm" msgid="3155110885840591914">"Пацвердзіць"</string>
-    <string name="message_send_read_report" msgid="6997117678914261250">"Справаздача аб прачытанні будзе адпраўленая."</string>
-    <string name="message_queued" msgid="7975945623873194737">"Зараз нельга адправiць паведамленне. Яно будзе адпраўлена, калі з\'явiцца доступ да службы."</string>
-    <string name="fdn_check_failure" msgid="7880740763778173551">"Вы можаце адпраўляць паведамленні толькі на фіксаваныя нумары."</string>
-    <string name="no_subject" msgid="4168963736134552285">"(Без тэмы)"</string>
-    <string name="unknown_sender" msgid="4929330613278853635">"Невядомы адпраўнік"</string>
-    <string name="dl_failure_notification" msgid="8097699679464396537">"Не атрымалася спампаваць паведамленне <xliff:g id="SUBJECT">%1$s</xliff:g> ад <xliff:g id="FROM">%2$s</xliff:g>."</string>
-    <string name="rate_limit_surpassed" msgid="1347801608211628177">"Пацвердзіць"</string>
-    <string name="confirm_rate_limit" msgid="234228299751243067">"Адпраўляецца вялікая колькасць мультымедыйных паведамленняў. Гэта дапушчальна?"</string>
-    <string name="message_download_failed_title" msgid="5722226064394767921">"Паведамленне не спампаванае"</string>
-    <string name="message_send_failed_title" msgid="3469894907399046372">"Паведамленне не адпраўленае"</string>
-    <string name="message_failed_body" msgid="3421296112073915245">"Нацiснiце, каб прагледзець паведамленне, і паўтарыце спробу."</string>
-    <string name="download_later" msgid="5531365714424360903">"Не атрымлiваецца спампаваць зараз. Паўтарыце спробу пазней."</string>
-    <!-- no translation found for no_apn (505932916503312015) -->
-    <skip />
-    <string name="select_audio" msgid="3528161449756771832">"Выберыце аўдыё"</string>
-    <string name="copy_to_sdcard" msgid="757028609638184856">"Захаваць укладанне"</string>
-    <string name="copy_to_sdcard_success" msgid="7948625615155992014">"Далучаны файл захаваны."</string>
-    <string name="copy_to_sdcard_fail" msgid="4944606369631916737">"Немагчыма захаваць далучэнне."</string>
-    <string name="save_ringtone" msgid="2310157075045201051">"Захаваць як рынгтон"</string>
-    <string name="saved_ringtone" msgid="3847363932276708626">"Рынгтон захаваны."</string>
-    <string name="saved_ringtone_fail" msgid="4778500070919251116">"Немагчыма захаваць мелодыю."</string>
-    <string name="menu_group_participants" msgid="4288356090262299071">"Удзельнікi групы"</string>
-    <string name="select_link_title" msgid="3371818607625768447">"Выберыце дзеянне"</string>
-    <string name="slide_number" msgid="1923958526266726635">"Слайд <xliff:g id="NUMBER">%s</xliff:g>"</string>
-  <plurals name="slide_duration">
-    <item quantity="one" msgid="1654101988340583935">"<xliff:g id="NUMBER">%s</xliff:g> сек"</item>
-    <item quantity="few" msgid="7887190171856293871">"<xliff:g id="NUMBER">%s</xliff:g> с."</item>
-    <item quantity="other" msgid="3736425355579939863">"<xliff:g id="NUMBER">%s</xliff:g> с."</item>
-  </plurals>
-    <string name="delivery_report_activity" msgid="2957463094232916364">"Справаздача аб дастаўцы"</string>
-    <string name="storage_limits_activity" msgid="8810530813311077716">"Абмежаваннi сховішча"</string>
-    <string name="change_duration_activity" msgid="7048606979485031693">"Змяніць працягласць"</string>
-    <string name="edit_slideshow_activity" msgid="8751493388760050529">"Рэдагаваць слайд-шоу"</string>
-    <string name="recipient_list_activity" msgid="1254938236543727019">"Удзельнікi групы"</string>
-    <string name="edit_slide_activity" msgid="8752829671778696983">"Рэдагаваць слайд"</string>
-    <string name="slideshow_activity" msgid="5658249461317434432">"Слайд-шоу"</string>
-    <string name="class_0_message_activity" msgid="6631339964159861048">"Паведамленне класа 0"</string>
-    <string name="search_label" msgid="6042598929386174964">"Паведамленні"</string>
-    <string name="search_hint" msgid="7273727663577472044">"Пошук у паведамленнях"</string>
-    <string name="search" msgid="7560238620274735199">"Паведамленні"</string>
-    <string name="search_setting_description" msgid="4104004595086437572">"Тэкст у вашых паведамленнях"</string>
-    <string name="search_empty" msgid="2109551478056039278">"Няма супадзенняў."</string>
-  <plurals name="search_results_title">
-    <item quantity="one" msgid="4657073733087431350">"Вынікаў па запыце \"<xliff:g id="SEARCH">%2$s</xliff:g>\": <xliff:g id="NUMBER">%1$s</xliff:g>"</item>
-    <item quantity="other" msgid="6196382287749539209">"Вынікаў па запыце \"<xliff:g id="SEARCH">%2$s</xliff:g>\": <xliff:g id="NUMBER">%1$s</xliff:g>"</item>
-  </plurals>
-    <string name="search_history" msgid="4127805495662693154">"Вынікаў пошуку \"<xliff:g id="SEARCH">%2$s</xliff:g>\": <xliff:g id="COUNT">%1$s</xliff:g>"</string>
-    <string name="confirm_clear_search_title" msgid="8510295993632032904">"Ачысціць"</string>
-    <string name="confirm_clear_search_text" msgid="8731877031837077478">"Гісторыя пошуку будзе выдаленая."</string>
-    <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Ачысціць гісторыю пошуку"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"Ачысціць поле пошуку паведамленняў ад папярэдніх запытаў"</string>
-    <string name="save" msgid="6847069284991531310">"Захаваць"</string>
-    <string name="storage_limits_title" msgid="7074684882530693016">"Паведамленні пра абмежаванні"</string>
-    <string name="storage_limits_message" msgid="2010501485394745696">"Абмежаваць колькасць паведамленняў, якія захоўваюца пры размове?"</string>
-    <string name="storage_limits_setting" msgid="4952781049308537373">"Задаць абмежаванні"</string>
-    <string name="storage_limits_setting_dismiss" msgid="1433841310158458034">"Без абмежаванняў"</string>
-    <string name="too_many_unsent_mms" msgid="4436493698891224126">"Не атрымліваецца адправіць паведамленне. Занадта шмат неадпраўленых мультымедыйных паведамленняў."</string>
-    <string name="sending_message" msgid="2054406576361149715">"АДПРАЎКА..."</string>
-    <string name="pick_too_many_recipients" msgid="650087588867628044">"Занадта шмат атрымальнікаў"</string>
-    <string name="adding_recipients" msgid="2962810172527532357">"Даданне атрымальнікаў..."</string>
-    <string name="draft_separator" msgid="5402575086540243019">", "</string>
-    <string name="message_count_format" msgid="4434763220590778012">" <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="message_count_notification" msgid="3629968600032690007">"Новыя паведамленнi: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-  <plurals name="message_count_notification_overflow">
-    <item quantity="one" msgid="3340591167508150806">"+ яшчэ <xliff:g id="NUMBER">%1$s</xliff:g> паведамленне"</item>
-    <item quantity="other" msgid="1393002799298501480">"+ яшчэ <xliff:g id="NUMBER">%1$s</xliff:g> паведамл."</item>
-  </plurals>
-    <string name="error_state" msgid="5177386717626893507">"Супярэчлівы стан"</string>
-    <string name="error_state_text" msgid="7918866106335387710">"Супярэчлівыя станы ланцужкоў і атрымальнікаў. Скапіруйце справаздачу аб памылцы і дашліце яе са старонкi http://go/droidanizer"</string>
-  <plurals name="recipient_count">
-    <item quantity="other" msgid="7338580381574463136">"Людзей: <xliff:g id="NUMBER">%1$s</xliff:g>"</item>
-  </plurals>
-    <string name="disable_notifications_dialog_message" msgid="7644011234972074096">"Перастаць капiраваць тэкставыя апавяшчэннi з прыкладання па змаўчанні \"Паведамленні\"?"</string>
-    <string name="view_more_conversations" msgid="7275920132410734671">"Прагледзець iншыя размовы"</string>
-    <string name="attachment_audio" msgid="2867960243300539143">"Гук"</string>
-    <string name="attachment_slideshow" msgid="5867689101881763318">"Слайд-шоу"</string>
-    <string name="attachment_video" msgid="4252062022156694591">"Відэа"</string>
-    <string name="attachment_picture" msgid="3709286281567284296">"Выява"</string>
-    <string name="notification_separator" msgid="2334673105226536422">"  "</string>
-    <string name="enumeration_comma" msgid="213598026698964628">", "</string>
-    <string name="message_timestamp_format" msgid="4188999027493614617">"<xliff:g id="STRING_0">%1$s</xliff:g>—<xliff:g id="STRING_1">%2$s</xliff:g>"</string>
-    <!-- no translation found for storage_warning_title (7124740686325942375) -->
-    <skip />
-    <!-- no translation found for storage_warning_content (1100367816649962354) -->
-    <skip />
-    <!-- no translation found for label_mms_send_outbox_msg (3395185162973061099) -->
-    <skip />
-    <!-- no translation found for desc_mms_send_outbox_msg (1837156781311437148) -->
-    <skip />
-    <!-- no translation found for banner_sms_promo_title_initial (510014388581481569) -->
-    <skip />
-    <!-- no translation found for banner_sms_promo_title_application (8123569785369713254) -->
-    <skip />
-    <!-- no translation found for banner_sms_promo_message (3536714414252763826) -->
-    <skip />
-</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 8e8a1c3d..503bcde4 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Звук"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Задайте броя съобщения за запазване"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Тих режим"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Да се извежда запитване коя SIM карта да се използва при всяко изпращане на съобщение"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Няколко SIM карти"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Автоматично извличане"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Автоматично извличане на съобщения"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Автоматично извличане при роуминг"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Съобщения не е приложението ви за SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> е приложението ви за SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Можете да промените това от „Настройки“"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Избиране на SIM карта"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM карта <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Слот <xliff:g id="SUBID">%1$d</xliff:g> за SIM карта"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Отказ"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Понастоящем избраната SIM карта не е налице. Изберете стандартната си от системните настройки."</string>
 </resources>
diff --git a/res/values-bn-rBD/arrays.xml b/res/values-bn-rBD/arrays.xml
index c6f9816b..5563b2f5 100644
--- a/res/values-bn-rBD/arrays.xml
+++ b/res/values-bn-rBD/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"কোনো বিষয় নেই"</item>
-    <item msgid="2214945158821871846">"বিষয়হীন"</item>
   </string-array>
 </resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
index 284b7d9c..53ba5e8a 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn-rBD/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -162,14 +162,14 @@
     <string name="pref_summary_sms_disabled" msgid="8975773722051230744">"বার্তাপ্রেরণকে আপনার ডিফল্ট SMS অ্যাপ্লিকেশান করতে স্পর্শ করুন"</string>
     <string name="pref_title_sms_enabled" msgid="1857849790200375277">"SMS সক্ষমিত"</string>
     <string name="pref_summary_sms_enabled" msgid="2106125420361911250">"আপনার ডিফল্ট SMS অ্যাপ্লিকেশান পরিবর্তন করতে স্পর্শ করুন"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"আপনার সিম কার্ডে সঞ্চিত বার্তাগুলি পরিচালনা করুন"</string>
+    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"আপনার SIM কার্ডে সঞ্চিত বার্তাগুলি পরিচালনা করুন"</string>
     <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"আপনি যে বার্তা পাঠাবেন তার প্রতিটির জন্য বিতরণ প্রতিবেদনের অনুরোধ করুন"</string>
     <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"আপনি যে বার্তা পাঠাবেন তার প্রতিটির জন্য পঠিত প্রতিবেদনের অনুরোধ করুন"</string>
     <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"আপনি যে বার্তা পাঠাবেন তার প্রতিটির জন্য বিতরণ প্রতিবেদনের অনুরোধ করুন"</string>
     <string name="pref_summary_auto_delete" msgid="7719538116486177613">"পুরানো বার্তাগুলির সীমা পৌঁছে গেলে সেগুলিকে মুছে দিন"</string>
     <string name="pref_summary_delete_limit" msgid="597128041393045216">"কথোপকথন প্রতি <xliff:g id="COUNT">%1$s</xliff:g>টি বার্তা"</string>
     <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"যখন একাধিক প্রাপক রয়েছে তখন একটি বার্তা পাঠাতে MMS ব্যবহার করুন"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"সিম কার্ডের বার্তাগুলি মুছে দিন"</string>
+    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"SIM কার্ডের বার্তাগুলি মুছে দিন"</string>
     <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"বিতরণ প্রতিবেদনগুলি"</string>
     <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"গোষ্ঠীর মধ্যে বার্তাপ্রেরণ"</string>
     <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"প্রতিবেদনগুলি পড়ুন"</string>
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ধ্বনি"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"কতগুলি বার্তা সংরক্ষণ করবেন তা সেট করুন"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"নীরব"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"প্রত্যেক বার একটি বার্তা পাঠানোর সময় কোন সিম ব্যবহার করা হবে তা  জিজ্ঞাসা করুন"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"মাল্টি-সিম"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"স্বতঃ-উদ্ধার"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"স্বয়ংক্রিয়ভাবে বার্তাগুলি পুনরুদ্ধার করুন"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"রোমিং থাকাকালীন স্বতঃ-উদ্ধার"</string>
@@ -198,8 +196,8 @@
     <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"সমস্ত থ্রেড মুছে ফেলা হবে।"</string>
     <string name="confirm_delete_message" msgid="9121480656609809591">"বার্তাটি মুছে ফেলা হবে।"</string>
     <string name="confirm_delete_locked_message" msgid="7203411948190100955">"এই লক করা বার্তাটি মুছবেন?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"সিম কার্ডের সমস্ত বার্তা মুছে ফেলা হবে।"</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"সিম কার্ডের এই বার্তা মুছে ফেলা হবে।"</string>
+    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"SIM কার্ডের সমস্ত বার্তা মুছে ফেলা হবে।"</string>
+    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"SIM কার্ডের এই বার্তা মুছে ফেলা হবে।"</string>
     <string name="delete_unlocked" msgid="7545321606698162261">"লক করা বার্তাগুলি মুছে দিন"</string>
     <string name="delete" msgid="1409973060081564612">"মুছুন"</string>
     <string name="select_conversations" msgid="7816517565640002844">"কথোপকথনগুলি চয়ন করুন"</string>
@@ -232,9 +230,9 @@
     <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"ট্যাবলেট মেমরিতে কপি করুন"</string>
     <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"ফোন মেমরিতে কপি করুন"</string>
     <string name="sim_delete" msgid="610790510655316922">"মুছুন"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"সিম কার্ডের পাঠ্য বার্তাগুলি"</string>
+    <string name="sim_manage_messages_title" msgid="3989147182100584333">"SIM কার্ডের পাঠ্য বার্তাগুলি"</string>
     <string name="sim_view" msgid="1997173541766393706">"দেখুন"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"সিম কার্ডে কোনো বার্তা নেই।"</string>
+    <string name="sim_empty" msgid="2356766833071636297">"SIM কার্ডে কোনো বার্তা নেই।"</string>
     <string name="delivery_header_title" msgid="5361719578869045764">"প্রতিবেদন করুন"</string>
     <string name="status_none" msgid="8253075950774894961">"(কোনো কিছুই নয়)"</string>
     <string name="status_pending" msgid="2739860824607984892">"মুলতুবি"</string>
@@ -260,7 +258,7 @@
     <string name="notification_multiple_title" msgid="332602028959557541">"নতুন বার্তা"</string>
     <string name="notification_failed_multiple" msgid="6192531993698497229">"<xliff:g id="COUNT">%s</xliff:g>টি বার্তা পাঠানো যায়নি"</string>
     <string name="notification_failed_multiple_title" msgid="1112032024904397126">"বার্তাগুলি পাঠানো যায়নি"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"সিম কার্ড পূর্ণ"</string>
+    <string name="sim_full_title" msgid="1809829051697702810">"SIM কার্ড পূর্ণ"</string>
     <string name="sim_full_body" msgid="6241664980790322925">"আরো বার্তার জন্য জায়গা করতে কিছু বার্তা মুছে দিন।"</string>
     <string name="sms_full_title" msgid="6041287140125011854">"পাঠ্য বার্তার মেমরি সম্পূর্ণ"</string>
     <string name="sms_full_body" msgid="4885861852397651868">"মেমরি পূর্ণ হয়ে যাওয়ার কারণে একটি ইনকামিং বার্তা প্রত্যাখ্যাত হয়েছে। কিছু পুরানো বার্তা মুছে দিন।"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"বার্তাপ্রেরণ আপনার SMS অ্যাপ্লিকেশান নয়"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> হল আপনার SMS অ্যাপ্লিকেশান"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"আপনি সেটিংসে এটি পরিবর্তন করতে পারেন"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"সিম নির্বাচন করুন"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"সিম <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"সিম স্লট <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"বাতিল করুন"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"বর্তমানে নির্বাচিত সিম-টি এখানে নেই। সিস্টেম সেটিংসে আপনার ডিফল্ট সিম নির্বাচন করুন।"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 8137b084..533fbaeb 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"So"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Definiu el nombre de missatges que voleu desar"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Silenci"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Demana quina SIM s\'ha de fer servir cada vegada que s\'envia un missatge."</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Recuperació automàtica"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Recupera automàticament els missatges"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"En itinerància"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Missatgeria no és la teva aplicació per als SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> és la teva aplicació per als SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Pots canviar-ho a la configuració"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Selecció de la targeta SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Ranura per a la targeta SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Cancel·la"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"La targeta SIM seleccionada no està disponible. Tria la targeta SIM predeterminada a la configuració del sistema."</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b9f2f4f3..ec7f743d 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Zvuk"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Nastavit počet ukládaných zpráv"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Tichý"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Před každým odesláním zprávy se zeptat, která SIM karta se má použít"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Více SIM karet"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatické načítání"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Automaticky načítat zprávy"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Autonačítání za roamingu"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Aplikace SMS a MMS není vaší aplikací pro zprávy SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> je vaše aplikace pro zprávy SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Můžete to změnit v části Nastavení."</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Vybrat SIM kartu"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM karta <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Slot na SIM kartu <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Zrušit"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Aktuálně vybraná SIM karta se zde nenachází. Výchozí SIM kartu vyberete v nastavení systému."</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 4976c9d4..0f55cc38 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Lyd"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Angiv det antal beskeder, der skal gemmes"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Lydløs"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Spørg, hvilket SIM-kort du vil bruge, hver gang der sendes en meddelelse"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatisk hentning"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Hent automatisk beskeder"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Aut. hent. under roaming"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Beskeder er ikke din standardapp til sms-beskeder"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> er din standardapp til sms-beskeder"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Du kan ændre dette i Indstillinger"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Vælg SIM-kort"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM-nummer <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM Slot <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Annuller"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Det SIM-kort, du har valgt, findes ikke i enheden. Vælg dit standard SIM-kort i systemindstillingerne."</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8703eabd..647463f7 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Töne"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Anzahl der zu speichernden Nachrichten festlegen"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Lautlos"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Beim Senden einer Nachricht jedes Mal nach der zu verwendenden SIM fragen"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatisch abrufen"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Nachrichten automatisch empfangen"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automatischer Roaming-Abruf"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"SMS/MMS ist nicht Ihre SMS-App."</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> ist Ihre SMS-App."</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Sie können dies unter \"Einstellungen\" ändern."</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"SIM-Karte auswählen"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM-Karte <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM-Kartenschacht <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Abbrechen"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Die aktuell ausgewählte SIM-Karte ist nicht vorhanden. Wählen Sie in den Systemeinstellungen Ihre Standard-SIM-Karte."</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0e304629..a6228677 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Ήχος"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Ορισμός αριθμού μηνυμάτων για αποθήκευση"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Σίγαση"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Να γίνεται ερώτηση για την κάρτα SIM που θα χρησιμοποιείται κάθε φορά που αποστέλλεται ένα μήνυμα"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Πολλές SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Αυτόματη ανάκτηση"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Αυτόματη ανάκτηση μηνυμάτων"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Αυτόματη ανάκτηση περιαγωγής"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Η Ανταλλαγή μηνυμάτων δεν αποτελεί την προεπιλεγμένη εφαρμογή SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> αποτελεί την εφαρμογή SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Αυτό μπορείτε να το αλλάξετε στην περιοχή \"Ρυθμίσεις\"."</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Επιλογή κάρτας SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Υποδοχή κάρτας SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Ακύρωση"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Δεν υπάρχει η τρέχουσα επιλεγμένη SIM. Επιλέξτε την προεπιλεγμένη SIM στις ρυθμίσεις συστήματος."</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index bdbc8578..c607de2e 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Sound"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Set number of messages to save"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Silent"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Ask which SIM to use every time a message is sent"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Auto-retrieve"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Automatically retrieve messages"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Roaming auto-retrieve"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Messaging is not your SMS app"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> is your SMS app"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"You can change this in Settings"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Select SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM Slot <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Cancel"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Current selected SIM is not present. Choose your default SIM in system settings."</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index bdbc8578..c607de2e 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Sound"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Set number of messages to save"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Silent"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Ask which SIM to use every time a message is sent"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Auto-retrieve"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Automatically retrieve messages"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Roaming auto-retrieve"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Messaging is not your SMS app"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> is your SMS app"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"You can change this in Settings"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Select SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM Slot <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Cancel"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Current selected SIM is not present. Choose your default SIM in system settings."</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 117543a4..217d634b 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Sonido"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Establecer el número de mensajes que se deben guardar"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Silencioso"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Preguntar qué SIM utilizar cada vez que se envíe un mensaje"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"MultiSIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Recuperación automática"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Recuperar mensajes automáticamente"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Recuperación automática en roaming"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Centro de Mensajes no es tu aplicación de SMS."</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> es tu aplicación de SMS."</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Puedes cambiar esta opción en la Configuración."</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Seleccionar SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Ranura de SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Cancelar"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"La SIM seleccionada actualmente no está presente. Selecciona la SIM predeterminada en la configuración del sistema."</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 91f1dea6..7d6ccc8b 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -182,9 +182,7 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Sonido"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Elige el número de mensajes que quieres guardar"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Silencio"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Preguntar qué SIM utilizar cada vez que se envíe un mensaje"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"MultiSIM"</string>
-    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Autorrecuperar"</string>
+    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Recuperar automáticamente"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Recuperar mensajes automáticamente"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"En itinerancia"</string>
     <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"Recuperar mensajes automáticamente en itinerancia"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Mensajes no es tu aplicación de SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> es tu aplicación de SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Puedes cambiar esta opción en Ajustes"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Seleccionar SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Ranura de SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Cancelar"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"La SIM seleccionada en este momento no está presente. Selecciona tu SIM predeterminada en ajustes del sistema."</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index fe1d1c72..8e7b7899 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Heli"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Määrake sõnumite arv salvestamiseks"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Hääletu"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Küsi sõnumi saatmisel iga kord, millist SIM-kaarti kasutada"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Mitu SIM-kaarti"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Võta automaatselt vastu"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Võta sõnumid automaatselt vastu"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automaatne vastuvõtmine rändlusel"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Sõnumside ei ole teie SMS-ide rakendus"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> on teie SMS-ide rakendus"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Seda saab muuta menüüs Seaded"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"SIM-kaardi valimine"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM-kaart <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM-kaardi pesa <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Tühista"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Praegu valitud SIM-kaart puudub. Valige süsteemiseadetes vaike-SIM-kaart."</string>
 </resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
deleted file mode 100644
index 0463547f..00000000
--- a/res/values-et/arrays.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- * Copyright (C) 2008 Esmertec AG.
- * Copyright (C) 2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="default_smiley_names">
-    <item msgid="1831934949361041701">"Õnnelik"</item>
-    <item msgid="1601611480575517120">"Kurb"</item>
-    <item msgid="1531181614218625881">"Silmapilgutus"</item>
-    <item msgid="3858808057949077894">"Keel väljas"</item>
-    <item msgid="7835238297967185651">"Üllatunud"</item>
-    <item msgid="1756223535005296033">"Suudlus"</item>
-    <item msgid="1093906245140165107">"Karjumine"</item>
-    <item msgid="888834839864150170">"Lahe"</item>
-    <item msgid="6320683740534773967">"Rahasuu"</item>
-    <item msgid="6610111212478853990">"Loba-aps"</item>
-    <item msgid="1706035208563940251">"Piinlik"</item>
-    <item msgid="9079275787422313427">"Ingel"</item>
-    <item msgid="4630490399784004880">"Otsustusvõimetu"</item>
-    <item msgid="7002574538342357456">"Nutt"</item>
-    <item msgid="850324578089267455">"Suletud suu"</item>
-    <item msgid="6334637439528489607">"Naer"</item>
-    <item msgid="7602915122893958066">"Segaduses"</item>
-    <item msgid="3939233701582771068">"Süda"</item>
-    <item msgid="1414759480575851587">"Vihane"</item>
-    <item msgid="8479809115158836070">"Muie"</item>
-    <item msgid="638612939305162424">"Ükskõikne nägu"</item>
-  </string-array>
-  <string-array name="empty_subject_strings">
-    <item msgid="7691141505407124426">"teemat ei ole"</item>
-  </string-array>
-</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
deleted file mode 100644
index 7ed04e15..00000000
--- a/res/values-et/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1503967887341230795">"Sõnumside"</string>
-    <string name="new_message" msgid="1530369762346003973">"Uus sõnum"</string>
-    <string name="menu_call_back" msgid="7538482331117914146">"Helista kasutajale <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_send_email" msgid="671366308915241664">"Saada meil kasutajale <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_compose_new" msgid="3763437973691046238">"Koosta"</string>
-    <string name="menu_preferences" msgid="4693148116114749414">"Seaded"</string>
-    <string name="menu_add_address_to_contacts" msgid="4491980950419914944">"Lisa <xliff:g id="CONTACTEMAILORNUMBER">%s</xliff:g> valikusse Inimesed"</string>
-    <string name="menu_call" msgid="5877123227307074690">"Helista"</string>
-    <string name="menu_search" msgid="2289469305728821360">"Otsing"</string>
-    <string name="menu_delete_all" msgid="808729454898114735">"Kustuta kõik lõimed"</string>
-    <string name="menu_delete" msgid="1851666911396479006">"Kustuta lõim"</string>
-    <string name="menu_view" msgid="7448852683948080108">"Kuva lõim"</string>
-    <string name="menu_debug_dump" msgid="6855869130206549643">"SILU TÕMMIST"</string>
-    <string name="refreshing" msgid="987335057871404222">"Värskendamine ..."</string>
-    <string name="menu_cell_broadcasts" msgid="5646161375983084660">"Kärjeteated"</string>
-    <string name="has_draft" msgid="2487465595514636160">"Mustand"</string>
-    <string name="no_subject_view" msgid="7795086723069563537">"(Teema puudub)"</string>
-    <string name="messagelist_sender_self" msgid="3579016854116401602">"Mina"</string>
-    <string name="view_slideshow" msgid="4990460971211388453">"Kuva slaidiseanss"</string>
-    <string name="view_message_details" msgid="7613457646645796831">"Vaadake üksikasju"</string>
-    <string name="view_delivery_report" msgid="8219095994071575215">"Kuva aruanne"</string>
-    <string name="delete_message" msgid="6442394955910357234">"Kustuta"</string>
-    <string name="expire_on" msgid="4436268382742593921">"Aegub: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="kilobyte" msgid="534782148965716631">"kB"</string>
-    <string name="undelivered_msg_dialog_title" msgid="7479433403599785755">"Kohaletoimetamata sõnum"</string>
-    <string name="undelivered_msg_dialog_body" msgid="4789268239627694551">"Seda sõnumit ei saa saata.\nProoviti saata: <xliff:g id="MESSAGE">%s</xliff:g>."</string>
-    <string name="undelivered_sms_dialog_body" msgid="4203703285563450868">"Sõnumit ei saa saata."</string>
-    <string name="delete_thread" msgid="757258847736632791">"Kustuta lõim"</string>
-    <string name="menu_forward" msgid="9026858380050046756">"Edasta"</string>
-    <string name="download" msgid="4488877642230207631">"Laadi alla"</string>
-    <string name="downloading" msgid="1779557575565350637">"Allalaadimine"</string>
-    <string name="inline_subject" msgid="4057621785274119260">"&lt;Teema: <xliff:g id="SUBJECT">%s</xliff:g>&gt;"</string>
-    <string name="drm_protected_text" msgid="1396394157870730742">"* DRM-iga kaitstud tekst *"</string>
-    <string name="insufficient_drm_rights" msgid="6989074725969164383">"Tuvastati ebapiisavad DRM-õigused."</string>
-    <string name="copy_message_text" msgid="4296252229544252834">"Kopeeri tekst"</string>
-    <string name="message_options" msgid="6838806653341967550">"Sõnumi valikud"</string>
-    <string name="slideshow_options" msgid="3501759384739796431">"Slaidiseansi valikud"</string>
-    <string name="done" msgid="7479926268660505871">"Valmis"</string>
-    <string name="move_up" msgid="7307578107431739359">"Liiguta üles"</string>
-    <string name="move_down" msgid="6356509518429479053">"Liiguta alla"</string>
-    <string name="remove_slide" msgid="2225604354024914900">"Eemalda slaid"</string>
-    <string name="add_slide" msgid="9140721399423564187">"Lisa slaid"</string>
-    <string name="add_slide_hint" msgid="7351356961076244584">"Puudutage uue slaidi loomiseks."</string>
-    <string name="discard_slideshow" msgid="5054239124146413609">"Loobu slaidiseansist"</string>
-    <string name="slide_show_part" msgid="5077675385448696846">"Osa <xliff:g id="PART">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="remove_text" msgid="2164068850029476539">"Eemalda tekst"</string>
-    <string name="add_picture" msgid="7819574884962571479">"Lisa pilt"</string>
-    <string name="remove_picture" msgid="6378701749074289096">"Eemalda pilt"</string>
-    <string name="add_music" msgid="3827442822987116233">"Lisa muusika"</string>
-    <string name="remove_music" msgid="858889733416015223">"Eemalda muusika"</string>
-    <string name="add_video" msgid="7816866867806595144">"Lisa video"</string>
-    <string name="remove_video" msgid="5258603891528497799">"Eemalda video"</string>
-    <string name="to_hint" msgid="224029549150332986">"Saaja"</string>
-    <string name="subject_hint" msgid="4296714962311604126">"Teema"</string>
-    <string name="add_attachment" msgid="7103751293360532684">"Lisa manus"</string>
-    <string name="add_subject" msgid="7616134948428265870">"Lisa teema"</string>
-    <string name="discard" msgid="1624800293064498479">"Loobu"</string>
-    <string name="view" msgid="7929667761715467136">"Kuva"</string>
-    <string name="replace" msgid="7587904998114459388">"Asenda"</string>
-    <string name="remove" msgid="4625444913256213175">"Eemalda"</string>
-    <string name="send" msgid="4589898724889248486">"Saada"</string>
-    <string name="mms" msgid="1587631213714914559">"MMS"</string>
-    <string name="send_mms" msgid="2933162044872550662">"MMS-i saatmine"</string>
-    <string name="all_threads" msgid="2663426830306307194">"Kõik lõimed"</string>
-    <string name="type_to_compose_text_enter_to_send" msgid="3539985471008581265">"Tippige sõnum"</string>
-    <string name="open_keyboard_to_compose_message" msgid="7860109685511253191">"Sõnumi tippimiseks avage klaviatuur"</string>
-    <string name="compressing" msgid="1961357529661045180">"Pilt on liiga suur. Tihendamine…"</string>
-    <string name="unsupported_media_format" msgid="1350489690977363764">"Vormingut <xliff:g id="NAME">%1$s</xliff:g> ei toetata."</string>
-    <string name="select_different_media" msgid="6241623357299382183">"Valige teine <xliff:g id="NAME">%1$s</xliff:g>."</string>
-    <string name="exceed_message_size_limitation" msgid="6027753647094742437">"Sõnumi suuruspiirang on saavutatud."</string>
-    <string name="message_too_big_for_video" msgid="2639367545165352543">"Sõnum on video lisamiseks liiga suur."</string>
-    <string name="failed_to_add_media" msgid="7207464170168708485">"Üksust <xliff:g id="NAME">%1$s</xliff:g> ei saa sõnumisse lisada."</string>
-    <string name="failed_to_resize_image" msgid="5608354151631833669">"Pildi suurust ei muudetud."</string>
-    <string name="resize_image_error_information" msgid="3783200130776554475">"Isegi pärast pildi suuruse muutmist on see saatmiseks ikka liiga suur."</string>
-    <string name="forward_prefix" msgid="276280492803486464">"Edasi: "</string>
-    <string name="discard_message_reason" msgid="2667664943003796133">"Teie sõnumist loobutakse, kuna sel pole kehtivaid saajaid."</string>
-    <string name="has_invalid_recipient" msgid="1485388396900997383">"Vale(d) saaja(d): &lt;<xliff:g id="NAME">%1$s</xliff:g>&gt;"</string>
-    <string name="invalid_destination" msgid="4573835601024786416">"Kehtetu sihtkoha-aadress."</string>
-    <string name="service_not_activated" msgid="9178218144019626176">"Teenus pole võrgus aktiveeritud."</string>
-    <string name="service_message_not_found" msgid="1908877102600048515">"Sõnum on aegunud või pole saadaval."</string>
-    <string name="service_network_problem" msgid="4583269174855943025">"Ei saanud saata võrguprobleemi tõttu."</string>
-    <string name="invalid_recipient_message" msgid="6465343105010999068">"Parandage adressaate, muidu ei saa nad sõnumit kätte."</string>
-    <string name="cannot_send_message" msgid="3414307479833622644">"Sõnumit ei saa saata"</string>
-    <string name="cannot_send_message_reason" msgid="8745080126044054343">"Teie sõnumil pole kehtivaid saajaid."</string>
-    <string name="cannot_forward_drm_obj" msgid="5047623751430559077">"Sõnumisse lisatud DRM-objekti ei saa edastada."</string>
-    <string name="converting_to_picture_message" msgid="2980023239017588627">"Multimeediumsõnumiks teisendamine…"</string>
-    <string name="cannot_add_slide_anymore" msgid="4631404749618820994">"Rohkem slaide ei saa lisada."</string>
-    <string name="cannot_add_picture_and_video" msgid="4954353772391381447">"Videot ja pilti ei saa ühele slaidile lisada."</string>
-    <string name="cannot_save_message" msgid="3375907366965264446">"Sõnumit ei saa salvestada."</string>
-    <string name="message_saved_as_draft" msgid="2503018972659880692">"Sõnum salvestati mustandina."</string>
-    <string name="too_many_recipients" msgid="7003415094007176931">"Sõnumil on liiga palju adressaate <xliff:g id="CURRENTCOUNT">%1$s</xliff:g>. Limiidiks on <xliff:g id="MAXLIMIT">%2$s</xliff:g> adressaati."</string>
-    <string name="too_many_attachments" msgid="3774037894899750070">"Maksimaalne manuste arv on <xliff:g id="MAXLIMIT">%1$s</xliff:g>. Lisatakse vaid <xliff:g id="CURRENTCOUNT">%2$s</xliff:g> esimest."</string>
-    <string name="adding_attachments_title" msgid="2034535554212405529">"Manuste lisamine"</string>
-    <string name="adding_attachments" msgid="5871373105122355632">"Oodake, kuni üksused lisatakse slaidiseanssi."</string>
-    <string name="building_slideshow_title" msgid="1232338692400726385">"Slaidiseansi koostamine"</string>
-    <string name="cannot_play_audio" msgid="253920977253666735">"Heli ei saa esitada."</string>
-    <string name="preview" msgid="5438149136136446756">"Eelvaade"</string>
-    <string name="preview_slideshow" msgid="6824095909448728427">"Eelvaade"</string>
-    <string name="replace_image" msgid="3171240952601443619">"Vaheta pilt"</string>
-    <string name="duration_sec" msgid="6617032324007824096">"Kestus (<xliff:g id="DURATION">%s</xliff:g> s)"</string>
-    <string name="duration_selector_title" msgid="5981097971537625852">"Slaidi kestus "</string>
-    <string name="layout_selector_title" msgid="7344600117972450771">"Slaidiseansi paigutus "</string>
-    <string name="layout_top" msgid="6811021650398972346">"Paigutus (ülal)"</string>
-    <string name="layout_bottom" msgid="5822765871095491843">"Paigutus (all)"</string>
-    <string name="type_to_compose_text_or_leave_blank" msgid="7769792471457574059">"Tippige sõnum või jätke tühjaks"</string>
-    <string name="duration_not_a_number" msgid="2856636898040421237">"Kestus peab olema sisestatud arvuna."</string>
-    <string name="duration_zero" msgid="3549377790195185977">"Kestus peab olema pikem kui null sekundit."</string>
-    <string name="secs" msgid="6886003523109967972">"s"</string>
-  <string-array name="select_dialog_items">
-    <item msgid="4840183714016984112">"1 sekund"</item>
-    <item msgid="3734955613666864447">"2 sekundit"</item>
-    <item msgid="6032232473048379828">"3 sekundit"</item>
-    <item msgid="5978471781525927827">"4 sekundit"</item>
-    <item msgid="4888440297621208402">"5 sekundit"</item>
-    <item msgid="6047246213264166841">"6 sekundit"</item>
-    <item msgid="2327501250056533797">"7 sekundit"</item>
-    <item msgid="3400770414689795703">"8 sekundit"</item>
-    <item msgid="4358760614161107970">"9 sekundit"</item>
-    <item msgid="2618179407176906471">"10 sekundit"</item>
-    <item msgid="7786079681602275449">"Muu"</item>
-  </string-array>
-    <string name="menu_view_contact" msgid="1414670584423909451">"Kuva kontakt"</string>
-    <string name="menu_add_to_contacts" msgid="1258127580972228970">"Lisa valikusse Inimesed"</string>
-    <string name="hidden_sender_address" msgid="2776075636669924968">"Varjatud saatja aadress"</string>
-    <string name="yes" msgid="3246158147503160811">"OK"</string>
-    <string name="no" msgid="4289742508556913860">"Tühista"</string>
-    <string name="set" msgid="4642365398263275979">"Määra"</string>
-    <string name="play" msgid="1888432400937785115">"Esita"</string>
-    <string name="edit" msgid="5912118407791492696">"Muuda"</string>
-    <string name="try_to_send" msgid="1996751738286080976">"Proovi saata"</string>
-    <string name="preferences_title" msgid="6650089610332670157">"Seaded"</string>
-    <string name="restore_default" msgid="7165341506551155053">"Taasta vaikeseaded"</string>
-    <string name="pref_notification_settings_title" msgid="6420782563630369776">"Teatised"</string>
-    <string name="pref_mms_settings_title" msgid="55618772118264355">"Multimeediumsõnumid (MMS-id)"</string>
-    <string name="pref_sms_settings_title" msgid="5173078369851066881">"Tekstsõnumid (SMS-id)"</string>
-    <string name="pref_sms_storage_title" msgid="9001233319190616445">"Salvestamine"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"SIM-kaardile salvestatud sõnumite haldamine"</string>
-    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"Küsi kohaletoimetuskinnitust iga saadetud sõnumi kohta"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"Küsi lugemiskinnitust iga saadetud sõnumi kohta"</string>
-    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"Küsi kohaletoimetuskinnitust iga saadetud sõnumi kohta"</string>
-    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"Kustuta vanad sõnumid limiidini jõudmisel"</string>
-    <string name="pref_summary_delete_limit" msgid="597128041393045216">"<xliff:g id="COUNT">%1$s</xliff:g> sõnumit vestluse kohta"</string>
-    <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"MMS-i kasutamine, kui mitmele kontaktile tuleb saata üks sõnum"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"Halda SIM-kaardi sõnumeid"</string>
-    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"Kohaletoimetamisaruanded"</string>
-    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"Grupi sõnumiside"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Loe aruandeid"</string>
-    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Kohaletoimetamisaruanded"</string>
-    <string name="pref_title_auto_delete" msgid="7227835692631701134">"Kustuta vanad sõnumid"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"Tekstsõnumi piirang"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"Multimeediumsõnumi limiit"</string>
-    <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Teadistused"</string>
-    <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibreering"</string>
-    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Heli"</string>
-    <string name="pref_messages_to_save" msgid="3202539743892934926">"Määrake sõnumite arv salvestamiseks"</string>
-    <string name="silent_ringtone" msgid="7981237991326592780">"Hääletu"</string>
-    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Võta automaatselt vastu"</string>
-    <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Võta sõnumid automaatselt vastu"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automaatne vastuvõtmine rändlusel"</string>
-    <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"Võta rändluse ajal sõnumid automaatselt vastu"</string>
-    <string name="confirm_dialog_title" msgid="2187213750475782725">"Kas kustutada?"</string>
-    <string name="confirm_dialog_locked_title" msgid="8179085718150932242">"Kustutan lukustatud sõnumi?"</string>
-  <plurals name="confirm_delete_conversation">
-    <item quantity="one" msgid="7509396981963472833">"Üks vestlus kustutatakse."</item>
-    <item quantity="other" msgid="4076915774012081811">"<xliff:g id="NUMBER">%1$s</xliff:g> vestlus(t) kustutatakse."</item>
-  </plurals>
-    <string name="confirm_delete_conversation" msgid="6115966687389279855">"Kogu lõim kustutatakse."</string>
-    <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"Kõik lõimed kustutatakse."</string>
-    <string name="confirm_delete_message" msgid="9121480656609809591">"Sõnum kustutatakse."</string>
-    <string name="confirm_delete_locked_message" msgid="7203411948190100955">"Kas kustutada see lukustatud sõnum?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"Kõik SIM-kaardil olevad sõnumid kustutatakse."</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"SIM-kaardil olev sõnum kustutatakse."</string>
-    <string name="delete_unlocked" msgid="7545321606698162261">"Kustuta lukustatud sõnumid"</string>
-    <string name="delete" msgid="1409973060081564612">"Kustuta"</string>
-    <string name="select_conversations" msgid="7816517565640002844">"Vestluste valimine"</string>
-    <string name="no_conversations" msgid="6773767655149258445">"Vestluseid pole."</string>
-    <string name="loading_conversations" msgid="5510430408235967094">"Meilivestluste laadimine."</string>
-    <string name="cannot_get_details" msgid="850292987983026806">"Üksikasju ei õnnestu hankida."</string>
-    <string name="message_details_title" msgid="9223295113731634528">"Sõnumi üksikasjad"</string>
-    <string name="message_type_label" msgid="7975373966795945566">"Tüüp: "</string>
-    <string name="text_message" msgid="8196464345251877972">"Tekstsõnum"</string>
-    <string name="multimedia_message" msgid="1512644521083533071">"Multimeediumsõnum"</string>
-    <string name="multimedia_notification" msgid="4124031788554972308">"Multimeediumsõnumi teatis"</string>
-    <string name="from_label" msgid="2055117571548171397">"Saatja: "</string>
-    <string name="to_address_label" msgid="5837363600471845801">"Saaja: "</string>
-    <string name="bcc_label" msgid="530867161453958774">"Pimekoopia: "</string>
-    <string name="sent_label" msgid="2722190650145251584">"Saadetud: "</string>
-    <string name="received_label" msgid="8618029024731693906">"Vastu võetud: "</string>
-    <string name="saved_label" msgid="4183160415593488207">"Salvestatud: "</string>
-    <string name="subject_label" msgid="8721241914144101631">"Teema: "</string>
-    <string name="message_size_label" msgid="4698016210013319786">"Sõnumi suurus: "</string>
-    <string name="priority_label" msgid="7397600367853359607">"Prioriteet: "</string>
-    <string name="priority_high" msgid="5627897207952009214">"Kõrge"</string>
-    <string name="priority_normal" msgid="5715227727384683550">"Tavaline"</string>
-    <string name="priority_low" msgid="8928782666023373987">"Madal"</string>
-    <string name="message_class_label" msgid="5115748690481550562">"Sõnumiklass: "</string>
-    <string name="error_code_label" msgid="5810068247647058769">"Veakood: "</string>
-    <string name="menu_edit" msgid="3056513240155967777">"Muuda"</string>
-    <string name="menu_delete_messages" msgid="2610286783513247420">"Kustuta sõnumid"</string>
-    <string name="menu_lock" msgid="7603793126077557472">"Lukus"</string>
-    <string name="menu_unlock" msgid="6662865558677424039">"Luku avamine"</string>
-    <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"Tahvelarvuti mällu kopeerimine"</string>
-    <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"Kopeeri telefonimällu"</string>
-    <string name="sim_delete" msgid="610790510655316922">"Kustuta"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"Tekstsõnumid SIM-kaardil"</string>
-    <string name="sim_view" msgid="1997173541766393706">"Kuva"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"SIM-kaardil pole sõnumeid."</string>
-    <string name="delivery_header_title" msgid="5361719578869045764">"Teata"</string>
-    <string name="status_none" msgid="8253075950774894961">"(Puudub)"</string>
-    <string name="status_pending" msgid="2739860824607984892">"Ootel"</string>
-    <string name="status_read" msgid="7576195253780627332">"Loetud"</string>
-    <string name="status_received" msgid="7264334589461906965">"Vastuvõetud"</string>
-    <string name="status_failed" msgid="1998776666856593544">"Ebaõnnestus"</string>
-    <string name="status_unread" msgid="8555305495998700198">"Lugemata"</string>
-    <string name="status_rejected" msgid="2613641949065942678">"Tagasi lükatud"</string>
-    <string name="recipient_label" msgid="3922667485312634446">"Saaja: "</string>
-    <string name="status_label" msgid="7283375460919181660">"Olek: "</string>
-    <string name="delivered_label" msgid="3514011729156932928">"Kohale toimetatud: "</string>
-    <string name="attach_image" msgid="6439985727687107742">"Pildid"</string>
-    <string name="attach_take_photo" msgid="4280601313184373837">"Jäädvusta pilt"</string>
-    <string name="attach_video" msgid="4264272693501538294">"Videod"</string>
-    <string name="attach_record_video" msgid="3099814114743078615">"Jäädvusta video"</string>
-    <string name="attach_sound" msgid="3149325985970669609">"Heli"</string>
-    <string name="attach_record_sound" msgid="6011431304469858929">"Salvesta heli"</string>
-    <string name="attach_slideshow" msgid="3497422151091037063">"Slaidiseanss"</string>
-    <string name="select_bottom_text" msgid="4201966447623311931">"Tekst all"</string>
-    <string name="select_top_text" msgid="6734183477539197815">"Tekst üleval"</string>
-    <string name="delivery_toast_body" msgid="5960519861835727013">"Sõnumi võttis vastu %s."</string>
-    <string name="notification_multiple" msgid="7684007285202109490">"<xliff:g id="COUNT">%s</xliff:g> lugemata sõnumit."</string>
-    <string name="notification_multiple_title" msgid="332602028959557541">"Uued sõnumid"</string>
-    <string name="notification_failed_multiple" msgid="6192531993698497229">"<xliff:g id="COUNT">%s</xliff:g> sõnumit ei olnud võimalik saata"</string>
-    <string name="notification_failed_multiple_title" msgid="1112032024904397126">"Sõnumeid ei saadetud"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"SIM-kaart on täis"</string>
-    <string name="sim_full_body" msgid="6241664980790322925">"Sõnumitele ruumi tegemiseks kustutage mõned sõnumid."</string>
-    <string name="sms_full_title" msgid="6041287140125011854">"Tekstsõnumite mälu täis"</string>
-    <string name="sms_full_body" msgid="4885861852397651868">"Sissetulev sõnum lükati tagasi, kuna mälu on täis. Kustutage osa vanu sõnumeid."</string>
-    <string name="sms_rejected_title" msgid="8548394922491529811">"Tekstsõnum tagasi lükatud"</string>
-    <string name="sms_rejected_body" msgid="7813671133968158562">"Sissetulev sõnum lükati teadmata põhjusel tagasi."</string>
-    <string name="type_audio" msgid="3842064092332309756">"heli"</string>
-    <string name="type_picture" msgid="4091928975383609443">"pilt"</string>
-    <string name="type_video" msgid="8521556159545168441">"video"</string>
-    <string name="confirm" msgid="3155110885840591914">"Kinnitus"</string>
-    <string name="message_send_read_report" msgid="6997117678914261250">"Saadetakse lugemisaruanne."</string>
-    <string name="message_queued" msgid="7975945623873194737">"Teie sõnumit ei saa praegu saata. See saadetakse, kui teenus muutub kättesaadavaks."</string>
-    <string name="fdn_check_failure" msgid="7880740763778173551">"Saate sõnumeid saata vaid fikseeritud numbritele."</string>
-    <string name="no_subject" msgid="4168963736134552285">"(Teema puudub)"</string>
-    <string name="unknown_sender" msgid="4929330613278853635">"Tundmatu saatja"</string>
-    <string name="dl_failure_notification" msgid="8097699679464396537">"Ei saa laadida alla sõnumit <xliff:g id="SUBJECT">%1$s</xliff:g> saatjalt <xliff:g id="FROM">%2$s</xliff:g>."</string>
-    <string name="rate_limit_surpassed" msgid="1347801608211628177">"Kinnitus"</string>
-    <string name="confirm_rate_limit" msgid="234228299751243067">"Saadetakse suur hulk multimeediumsõnumeid. Kas see sobib?"</string>
-    <string name="message_download_failed_title" msgid="5722226064394767921">"Sõnumit ei laaditud alla"</string>
-    <string name="message_send_failed_title" msgid="3469894907399046372">"Sõnumit ei saadetud"</string>
-    <string name="message_failed_body" msgid="3421296112073915245">"Puudutage sõnumi ülevaatamiseks ja proovige uuesti."</string>
-    <string name="download_later" msgid="5531365714424360903">"Praegu ei saa alla laadida. Proovige hiljem uuesti."</string>
-    <string name="no_apn" msgid="505932916503312015">"Seadmes pole APN-i täpsustatud."</string>
-    <string name="select_audio" msgid="3528161449756771832">"Heli valimine"</string>
-    <string name="copy_to_sdcard" msgid="757028609638184856">"Manuse salvestamine"</string>
-    <string name="copy_to_sdcard_success" msgid="7948625615155992014">"Manus on salvestatud."</string>
-    <string name="copy_to_sdcard_fail" msgid="4944606369631916737">"Manust ei saanud salvestada."</string>
-    <string name="save_ringtone" msgid="2310157075045201051">"Salvesta helinaks"</string>
-    <string name="saved_ringtone" msgid="3847363932276708626">"Helin on salvestatud."</string>
-    <string name="saved_ringtone_fail" msgid="4778500070919251116">"Helinat ei saanud salvestada."</string>
-    <string name="menu_insert_smiley" msgid="4964504393061025071">"Sisesta emotikon"</string>
-    <string name="menu_group_participants" msgid="4288356090262299071">"Rühma osalejad"</string>
-    <string name="select_link_title" msgid="3371818607625768447">"Toimingu valimine"</string>
-    <string name="slide_number" msgid="1923958526266726635">"Slaid <xliff:g id="NUMBER">%s</xliff:g>"</string>
-  <plurals name="slide_duration">
-    <item quantity="one" msgid="1654101988340583935">"<xliff:g id="NUMBER">%s</xliff:g> s"</item>
-    <item quantity="few" msgid="7887190171856293871">"<xliff:g id="NUMBER">%s</xliff:g> s"</item>
-    <item quantity="other" msgid="3736425355579939863">"<xliff:g id="NUMBER">%s</xliff:g> s"</item>
-  </plurals>
-    <string name="delivery_report_activity" msgid="2957463094232916364">"Kohaletoimetamisaruanne"</string>
-    <string name="storage_limits_activity" msgid="8810530813311077716">"Mäluruumi limiidid"</string>
-    <string name="change_duration_activity" msgid="7048606979485031693">"Muuda kestust"</string>
-    <string name="edit_slideshow_activity" msgid="8751493388760050529">"Muuda slaidiseanssi"</string>
-    <string name="recipient_list_activity" msgid="1254938236543727019">"Rühma osalejad"</string>
-    <string name="edit_slide_activity" msgid="8752829671778696983">"Muuda slaidi"</string>
-    <string name="slideshow_activity" msgid="5658249461317434432">"Slaidiseanss"</string>
-    <string name="class_0_message_activity" msgid="6631339964159861048">"0-klassi sõnum"</string>
-    <string name="search_label" msgid="6042598929386174964">"Sõnumside"</string>
-    <string name="search_hint" msgid="7273727663577472044">"Sõnumside otsing"</string>
-    <string name="search" msgid="7560238620274735199">"Sõnumside"</string>
-    <string name="search_setting_description" msgid="4104004595086437572">"Tekst teie sõnumites"</string>
-    <string name="search_empty" msgid="2109551478056039278">"Vasted puuduvad."</string>
-  <plurals name="search_results_title">
-    <item quantity="one" msgid="4657073733087431350">"<xliff:g id="NUMBER">%1$s</xliff:g> tulemust otsingule „<xliff:g id="SEARCH">%2$s</xliff:g>”"</item>
-    <item quantity="other" msgid="6196382287749539209">"<xliff:g id="NUMBER">%1$s</xliff:g> tulemust otsingule „<xliff:g id="SEARCH">%2$s</xliff:g>”"</item>
-  </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> tulemust otsingule „<xliff:g id="SEARCH">%2$s</xliff:g>”"</string>
-    <string name="confirm_clear_search_title" msgid="8510295993632032904">"Kustuta"</string>
-    <string name="confirm_clear_search_text" msgid="8731877031837077478">"Otsinguajalugu kustutatakse."</string>
-    <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Otsinguajaloo kustutamine"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"Kustuta sõnumside varasemate otsingute kuvamine otsingukastis"</string>
-    <string name="save" msgid="6847069284991531310">"Salvesta"</string>
-    <string name="storage_limits_title" msgid="7074684882530693016">"Sõnumite piirang"</string>
-    <string name="storage_limits_message" msgid="2010501485394745696">"Kas piirata vestluse kohta salvestatud sõnumite arvu?"</string>
-    <string name="storage_limits_setting" msgid="4952781049308537373">"Määra piirangud"</string>
-    <string name="storage_limits_setting_dismiss" msgid="1433841310158458034">"Piirangud puuduvad"</string>
-    <string name="too_many_unsent_mms" msgid="4436493698891224126">"Sõnumit ei saa praegu saata. Liiga palju saatmata multimeediumsõnumeid."</string>
-    <string name="sending_message" msgid="2054406576361149715">"SAATMINE ..."</string>
-    <string name="pick_too_many_recipients" msgid="650087588867628044">"Liiga palju saajaid"</string>
-    <string name="adding_recipients" msgid="2962810172527532357">"Saajate lisamine…"</string>
-    <string name="draft_separator" msgid="5402575086540243019">", "</string>
-    <string name="message_count_format" msgid="4434763220590778012">" <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="message_count_notification" msgid="3629968600032690007">"<xliff:g id="NUMBER">%1$s</xliff:g> uut sõnumit"</string>
-  <plurals name="message_count_notification_overflow">
-    <item quantity="one" msgid="3340591167508150806">"+ veel <xliff:g id="NUMBER">%1$s</xliff:g> sõnum"</item>
-    <item quantity="other" msgid="1393002799298501480">"+ veel <xliff:g id="NUMBER">%1$s</xliff:g> sõnumit"</item>
-  </plurals>
-    <string name="error_state" msgid="5177386717626893507">"Olek ei ole järjepidev"</string>
-    <string name="error_state_text" msgid="7918866106335387710">"Lõimede ja saajate olek on ebaühtlane. Looge veaaruanne ja edastage see aadressil http://go/droidanizer"</string>
-  <plurals name="recipient_count">
-    <item quantity="other" msgid="7338580381574463136">"<xliff:g id="NUMBER">%1$s</xliff:g> inimest"</item>
-  </plurals>
-    <string name="disable_notifications_dialog_message" msgid="7644011234972074096">"Kas peatada sõnumiside vaikerakenduse tekstsõnumite topeltteatised?"</string>
-    <string name="view_more_conversations" msgid="7275920132410734671">"Kuva rohkem vestlusi"</string>
-    <string name="attachment_audio" msgid="2867960243300539143">"Heli"</string>
-    <string name="attachment_slideshow" msgid="5867689101881763318">"Slaidiseanss"</string>
-    <string name="attachment_video" msgid="4252062022156694591">"Video"</string>
-    <string name="attachment_picture" msgid="3709286281567284296">"Pilt"</string>
-    <string name="notification_separator" msgid="2334673105226536422">"  "</string>
-    <string name="enumeration_comma" msgid="213598026698964628">", "</string>
-    <string name="message_timestamp_format" msgid="4188999027493614617">"<xliff:g id="STRING_0">%1$s</xliff:g> – <xliff:g id="STRING_1">%2$s</xliff:g>"</string>
-    <string name="storage_warning_title" msgid="7124740686325942375">"Telefoni mälu on täis"</string>
-    <string name="storage_warning_content" msgid="1100367816649962354">"Te ei saa uusi SMS-/MMS-sõnumeid"</string>
-    <string name="label_mms_send_outbox_msg" msgid="3395185162973061099">"MMS-i äratus"</string>
-    <string name="desc_mms_send_outbox_msg" msgid="1837156781311437148">"Saadab välja kõik MMS-id väljundkastist võrku"</string>
-</resources>
diff --git a/res/values-eu-rES/arrays.xml b/res/values-eu-rES/arrays.xml
index 4b461b97..c5669903 100644
--- a/res/values-eu-rES/arrays.xml
+++ b/res/values-eu-rES/arrays.xml
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"gairik ez"</item>
-    <item msgid="2214945158821871846">"gairik gabe"</item>
   </string-array>
 </resources>
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml
index b35f7257..4dc87a97 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu-rES/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Soinua"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Ezarri gorde beharreko mezu kopurua"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Isila"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Galdetu zein SIM txartel erabil nahi duzun mezu bat bidaltzen duzun bakoitzean"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Hainbat SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Eskuratu automatikoki"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Berreskuratu mezuak automatikoki"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Eskuratu automatikoki ibiltaritzan"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"\"Mezuak\" ez da SMS aplikazio lehenetsia"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> da SMS aplikazio lehenetsia"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Hori aldatzeko, joan Ezarpenak atalera"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Hautatu SIM txartela"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"<xliff:g id="SUBID">%1$d</xliff:g>. SIMa"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM txartelaren <xliff:g id="SUBID">%1$d</xliff:g>. ataka"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Utzi"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Unean hautatuta dagoen SIM txartela ez dago gailuan. Aukeratu SIM lehenetsia sistemaren ezarpenetan."</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index bdd5be1f..a5988f21 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"صدا"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"تنظیم تعداد پیام‌ها برای ذخیره"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"بیصدا"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"هر بار هنگام ارسال پیام، سؤال شود از کدام سیم‌کارت استفاده شود"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"چند سیم‌کارتی"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"بازیابی خودکار"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"بازیابی خودکار پیام‌ها"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"بازیابی خودکار در طول رومینگ"</string>
@@ -359,11 +357,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"‏Messaging برنامه پیامک شما نیست"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> برنامه پیامک شما است"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"می‌توانید این مورد را در تنظیمات تغییر دهید"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"انتخاب سیم‌کارت"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"سیم‌کارت <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"شیار سیم‌کارت <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"لغو"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"سیم‌کارتی که اکنون انتخاب شده است وجود ندارد. سیم‌کارت پیش‌فرضتان را در تنظیمات سیستم انتخاب کنید."</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ed6628ea..202d745b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Ääni"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Aseta tallennettavien viestien lukumäärä"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Äänetön"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Tarkista käytettävä SIM-kortti ennen jokaisen viestin lähettämistä"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Monta SIM-korttia"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automaattilataus"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Lataa viestit automaattisesti"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automaattilataus roaming-tilassa"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Messaging ei ole tekstiviestisovelluksesi"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> on tekstiviestisovelluksesi"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Voit muuttaa tätä valitsemalla Asetukset"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Valitse SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM-korttipaikka <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Peruuta"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Nyt valittua SIM-korttia ei ole. Valitse oletus-SIM järjestelmäasetuksista."</string>
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 44c25551..445e6a88 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Son"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Définir le nombre de messages à enregistrer"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Mode silencieux"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Demander quelle carte SIM utiliser à chaque envoi d\'un message"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Plusieurs cartes SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Extraction automatique"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Récupérer automatiquement les messages"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Extraction automatique en itinérance"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"« Messagerie » n\'est pas votre application par défaut pour les messages texte"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> est votre application de messagerie texte"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Vous pouvez modifier cet élément dans le menu Paramètres"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Sélectionner une carte SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"Carte SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Fente pour carte SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Annuler"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"La carte SIM sélectionnée ne se trouve pas dans l\'appareil. Choisissez votre carte SIM par défaut dans les paramètres système."</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9dbde079..4672f2b0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Sonnerie"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Définir le nombre de messages à enregistrer"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Mode silencieux"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Demander quelle carte SIM utiliser à chaque envoi d\'un message"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Récupération auto"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Récupérer automatiquement les messages"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Itinérance"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"SMS/MMS n\'est pas votre application pour les SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> est votre application pour les SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Vous pouvez modifier cette configuration dans \"Paramètres\"."</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Sélectionner une carte SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"Carte SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Emplacement pour carte SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Annuler"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"La carte SIM sélectionnée ne se trouve pas dans l\'appareil. Choisissez votre carte SIM par défaut dans les paramètres système."</string>
 </resources>
diff --git a/res/values-gl-rES/arrays.xml b/res/values-gl-rES/arrays.xml
index deee0e0c..8de7aa5f 100644
--- a/res/values-gl-rES/arrays.xml
+++ b/res/values-gl-rES/arrays.xml
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"sen asunto"</item>
-    <item msgid="2214945158821871846">"senasunto"</item>
   </string-array>
 </resources>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 48dcfda8..67cc5077 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Son"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Definir o número de mensaxes para gardar"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Silencio"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Preguntar que SIM utilizar cada vez que se envía unha mensaxe"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"SIM múltiple"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Recuperación automática"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Recupera mensaxes automaticamente"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Recuperación automática en itinerancia"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Mensaxería non é a túa aplicación de SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> é a túa aplicación de SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Podes cambiar esta opción en Configuración"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Seleccionar SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Rañura da SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Cancelar"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"A SIM seleccionada actualmente non está presente. Selecciona a SIM predeterminada na configuración do sistema."</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 2805e839..a27f0332 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ध्वनि"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"सहेजने के लिए संदेशों की संख्या सेट करें"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"मौन"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"प्रत्येक बार संदेश भेजे जाने पर पूछें कि कौन सी सिम का उपयोग करना है"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"एकाधिक-सिम"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"स्वतः पुनर्प्राप्ति"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"संदेशों को अपने आप पुनर्प्राप्त करें"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"रोमिंग स्वतः पुनर्प्राप्ति"</string>
@@ -287,7 +285,7 @@
     <string name="copy_to_sdcard" msgid="757028609638184856">"अटैचमेंट जोड़ें"</string>
     <string name="copy_to_sdcard_success" msgid="7948625615155992014">"अटैचमेंट सहेजा गया."</string>
     <string name="copy_to_sdcard_fail" msgid="4944606369631916737">"अटैचमेंट सहेजा नहीं जा सका."</string>
-    <string name="save_ringtone" msgid="2310157075045201051">"रिंगटोन के रूप में जोड़ें"</string>
+    <string name="save_ringtone" msgid="2310157075045201051">"रिंगटोन के रूप में सहेजें"</string>
     <string name="saved_ringtone" msgid="3847363932276708626">"रिंगटोन सहेजी गई."</string>
     <string name="saved_ringtone_fail" msgid="4778500070919251116">"रिंगटोन नहीं सहेज सका."</string>
     <string name="menu_group_participants" msgid="4288356090262299071">"समूह के प्रतिभागी"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"संदेश सेवा आपका SMS ऐप्लिकेशन नहीं है"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> आपका SMS ऐप्लिकेशन है"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"आप इसे सेटिंग में बदल सकते हैं"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"सिम चुनें"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"सिम <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"सिम स्लॉट <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"रहने दें"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"वर्तमान में चयनित सिम मौजूद नहीं है. सिस्टम सेटिंग में अपनी डिफ़ॉल्ट सिम चुनें."</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 868a416b..89ff1bb8 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Zvuk"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Postavi broj poruka za spremanje"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Bešumno"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Pitaj koji SIM treba upotrijebiti svaki put kada se šalje poruka"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Više SIM kartica"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatski dohvat"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Automatski dohvaćaj poruke"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automatski dohvat u roamingu"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Slanje poruka nije vaša aplikacija za SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> je vaša aplikacija za SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"To možete promijeniti u Postavkama"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Odabir SIM-a"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Utor za SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Odustani"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Trenutačno odabrani SIM nedostaje. Odaberite zadani SIM u postavkama sustava."</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 009c966b..d1532996 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Hang"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"A menteni kívánt üzenetek számának beállítása"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Néma"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Kérdezze meg minden üzenet elküldése előtt, hogy melyik SIM kártyát használja"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Több SIM kártya"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatikus letöltés"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Üzenetek automatikus letöltése"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automatikus letöltés barangolás során"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Az SMS-eket nem az Üzenetek alkalmazás kezeli"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"Az SMS-eket a következő alkalmazás kezeli: <xliff:g id="APPNAME">%s</xliff:g>"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Ezt módosíthatja a Beállítások között."</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"SIM kiválasztása"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"<xliff:g id="SUBID">%1$d</xliff:g>. számú SIM-nyílás"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Mégse"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"A jelenleg kiválasztott SIM kártya nem található. Válassza ki az alapértelmezett SIM kártyát a rendszerbeállításokban."</string>
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index d1724561..1b6c7590 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Ձայն"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Նշել հաղորդագրությունների քանակը՝ պահելու համար"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Լուռ"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Յուրաքանչյուր հաղորդագրություն ուղարկելիս հարցնել, թե որ SIM-ը օգտագործել"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Ինքնաառբերում"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Ավտոմատ առբերել հաղորդագրությունները"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Ռոումինգի ինքնաաբերում"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Հաղորդակցումը ձեր SMS հավելվածը չէ"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> հավելվածը ձեր SMS հավելվածն է"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Սա կարող եք փոխել կարգավորումներում"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Ընտրեք SIM-ը"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Փորակ SIM-ի համար <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Չեղարկել"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Ընտրված SIM քարտը բացակայում է: Ընտրեք կանխադրված SIM քարտ՝ համակարգի կարգավորումներից:"</string>
 </resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
deleted file mode 100644
index fb70b450..00000000
--- a/res/values-hy/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1503967887341230795">"Հաղորդակցում"</string>
-    <string name="new_message" msgid="1530369762346003973">"Նոր հաղորդագրություն"</string>
-    <string name="menu_call_back" msgid="7538482331117914146">"Զանգել <xliff:g id="NAME">%s</xliff:g>-ին"</string>
-    <string name="menu_send_email" msgid="671366308915241664">"Ուղարկել նամակ <xliff:g id="NAME">%s</xliff:g>-ին"</string>
-    <string name="menu_compose_new" msgid="3763437973691046238">"Կազմել"</string>
-    <string name="menu_preferences" msgid="4693148116114749414">"Կարգավորումներ"</string>
-    <string name="menu_add_address_to_contacts" msgid="4491980950419914944">"Ավելացնել <xliff:g id="CONTACTEMAILORNUMBER">%s</xliff:g>-ը մարդկանց"</string>
-    <string name="menu_call" msgid="5877123227307074690">"Զանգել"</string>
-    <string name="menu_search" msgid="2289469305728821360">"Որոնել"</string>
-    <string name="menu_delete_all" msgid="808729454898114735">"Ջնջել բոլոր շղթաները"</string>
-    <string name="menu_delete" msgid="1851666911396479006">"Ջնջել շղթան"</string>
-    <string name="menu_view" msgid="7448852683948080108">"Դիտել շղթան"</string>
-    <string name="menu_debug_dump" msgid="6855869130206549643">"DEBUG DUMP"</string>
-    <string name="refreshing" msgid="987335057871404222">"Թարմացվում է..."</string>
-    <string name="menu_cell_broadcasts" msgid="5646161375983084660">"Բջջային հեռարձակում"</string>
-    <string name="has_draft" msgid="2487465595514636160">"Սևագիր"</string>
-    <string name="no_subject_view" msgid="7795086723069563537">"(Անվերնագիր)"</string>
-    <string name="messagelist_sender_self" msgid="3579016854116401602">"Ինձ"</string>
-    <string name="view_slideshow" msgid="4990460971211388453">"Տեսնել ներկայացումը"</string>
-    <string name="view_message_details" msgid="7613457646645796831">"Տեսնել մանրամասները"</string>
-    <string name="view_delivery_report" msgid="8219095994071575215">"Դիտել ծանուցումը"</string>
-    <string name="delete_message" msgid="6442394955910357234">"Ջնջել"</string>
-    <string name="expire_on" msgid="4436268382742593921">"Սպառվում է՝ <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="kilobyte" msgid="534782148965716631">"Կբ"</string>
-    <string name="undelivered_msg_dialog_title" msgid="7479433403599785755">"Չառաքված հաղորդագրություն"</string>
-    <string name="undelivered_msg_dialog_body" msgid="4789268239627694551">"Հնարավոր չէ ուղարկել այս հաղորդագրությունը:\nՓորձը կատարվել է՝ <xliff:g id="MESSAGE">%s</xliff:g>:"</string>
-    <string name="undelivered_sms_dialog_body" msgid="4203703285563450868">"Հնարավոր չէ ուղարկել այս հաղորդագրությունը:"</string>
-    <string name="delete_thread" msgid="757258847736632791">"Ջնջել շղթան"</string>
-    <string name="menu_forward" msgid="9026858380050046756">"Փոխանցել"</string>
-    <string name="download" msgid="4488877642230207631">"Ներբեռնել"</string>
-    <string name="downloading" msgid="1779557575565350637">"Ներբեռնում"</string>
-    <string name="inline_subject" msgid="4057621785274119260">"&lt;Վերնագիր՝ <xliff:g id="SUBJECT">%s</xliff:g>&lt;"</string>
-    <string name="drm_protected_text" msgid="1396394157870730742">"* DRM պաշտպանված տեքստ *"</string>
-    <string name="insufficient_drm_rights" msgid="6989074725969164383">"Անբավարար DRM իրավունքներ են հայտնաբերվել:"</string>
-    <string name="copy_message_text" msgid="4296252229544252834">"Պատճենել տեքստը"</string>
-    <string name="message_options" msgid="6838806653341967550">"Հաղորդագրության ընտրանքներ"</string>
-    <string name="slideshow_options" msgid="3501759384739796431">"Ներկայացման ընտրանքներ"</string>
-    <string name="done" msgid="7479926268660505871">"Կատարված է"</string>
-    <string name="move_up" msgid="7307578107431739359">"Տեղափոխել վերև"</string>
-    <string name="move_down" msgid="6356509518429479053">"Տեղափոխել ներքև"</string>
-    <string name="remove_slide" msgid="2225604354024914900">"Հեռացնել էջը"</string>
-    <string name="add_slide" msgid="9140721399423564187">"Ավելացնել ներկայացում"</string>
-    <string name="add_slide_hint" msgid="7351356961076244584">"Հպեք՝ նոր ներկայացում ստեղծելու համար:"</string>
-    <string name="discard_slideshow" msgid="5054239124146413609">"Հրաժարվել ներկայացումից"</string>
-    <string name="slide_show_part" msgid="5077675385448696846">"Մաս <xliff:g id="PART">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="remove_text" msgid="2164068850029476539">"Հեռացնել տեքստը"</string>
-    <string name="add_picture" msgid="7819574884962571479">"Ավելացնել լուսանկար"</string>
-    <string name="remove_picture" msgid="6378701749074289096">"Հեռացնել նկարը"</string>
-    <string name="add_music" msgid="3827442822987116233">"Ավելացնել երաժշտություն"</string>
-    <string name="remove_music" msgid="858889733416015223">"Հեռացնել երաժշտությունը"</string>
-    <string name="add_video" msgid="7816866867806595144">"Ավելացնել տեսանյութ"</string>
-    <string name="remove_video" msgid="5258603891528497799">"Հեռացնել տեսանյութը"</string>
-    <string name="to_hint" msgid="224029549150332986">"Ստացող"</string>
-    <string name="subject_hint" msgid="4296714962311604126">"Վերնագիր"</string>
-    <string name="add_attachment" msgid="7103751293360532684">"Կցել"</string>
-    <string name="add_subject" msgid="7616134948428265870">"Ավելացնել վերնագիր"</string>
-    <string name="discard" msgid="1624800293064498479">"Հրաժարվել"</string>
-    <string name="view" msgid="7929667761715467136">"Դիտել"</string>
-    <string name="replace" msgid="7587904998114459388">"Տեղափոխել"</string>
-    <string name="remove" msgid="4625444913256213175">"Հեռացնել"</string>
-    <string name="send" msgid="4589898724889248486">"Ուղարկել"</string>
-    <string name="mms" msgid="1587631213714914559">"MMS"</string>
-    <string name="send_mms" msgid="2933162044872550662">"Ուղարկել MMS"</string>
-    <string name="all_threads" msgid="2663426830306307194">"Բոլոր թեմաները"</string>
-    <string name="type_to_compose_text_enter_to_send" msgid="3539985471008581265">"Մուտքագրեք հաղորդագրությունը"</string>
-    <string name="open_keyboard_to_compose_message" msgid="7860109685511253191">"Բացեք ստեղնաշարը՝ հաղորդագրություն մուտքագրելու համար"</string>
-    <string name="compressing" msgid="1961357529661045180">"Պատկերը չափազանց մեծ է: Սեղմում..."</string>
-    <string name="unsupported_media_format" msgid="1350489690977363764">"Չաջակցվող <xliff:g id="NAME">%1$s</xliff:g> ձևաչափ:"</string>
-    <string name="select_different_media" msgid="6241623357299382183">"Ընտրել մեկ այլ <xliff:g id="NAME">%1$s</xliff:g>:"</string>
-    <string name="exceed_message_size_limitation" msgid="6027753647094742437">"Հաղորդագրություն սահմանափակման չափը սպառված է:"</string>
-    <string name="message_too_big_for_video" msgid="2639367545165352543">"Հաղորդագրությունը չափազանց մեծ է տեսանյութ կցելու համար:"</string>
-    <string name="failed_to_add_media" msgid="7207464170168708485">"Դուք չեք կարող ավելացնել այս <xliff:g id="NAME">%1$s</xliff:g>-ը ձեր հաղորդագրության մեջ:"</string>
-    <string name="failed_to_resize_image" msgid="5608354151631833669">"Նկարը չափափոխված չէ:"</string>
-    <string name="resize_image_error_information" msgid="3783200130776554475">"Այս նկարը չափազանց մեծ է ուղարկելու համար, նույնիսկ չափափոխումից հետո:"</string>
-    <string name="forward_prefix" msgid="276280492803486464">"Վհղ՝ "</string>
-    <string name="discard_message_reason" msgid="2667664943003796133">"Ձեր հաղորդագրությունը կանտեսվի, քանի որ այն չունի վավեր հասցեատեր:"</string>
-    <string name="has_invalid_recipient" msgid="1485388396900997383">"Անվավեր հասցեատեր(եր)՝ &lt;<xliff:g id="NAME">%1$s</xliff:g>&lt;"</string>
-    <string name="invalid_destination" msgid="4573835601024786416">"Անվավեր ստացողի հասցե:"</string>
-    <string name="service_not_activated" msgid="9178218144019626176">"Ծառայությունը ակտիվացված չէ ցանցում:"</string>
-    <string name="service_message_not_found" msgid="1908877102600048515">"Հաղորդագրությունը սպառվել է կամ մատչելի չէ:"</string>
-    <string name="service_network_problem" msgid="4583269174855943025">"Հնարավոր չէ ուղարկել ցանցային խնդրի պատճառով:"</string>
-    <string name="invalid_recipient_message" msgid="6465343105010999068">"Ուղղեք ստացող(եր)ը, հակառակ դեպքում նրանք չեն ստանա հաղորդագրությունը:"</string>
-    <string name="cannot_send_message" msgid="3414307479833622644">"Հնարավոր չէ ուղարկել հաղորդագրությունը"</string>
-    <string name="cannot_send_message_reason" msgid="8745080126044054343">"Ձեր հաղորդագրությունը չունի վավեր հասցեատեր:"</string>
-    <string name="cannot_forward_drm_obj" msgid="5047623751430559077">"Հաղորդագրության մեջ ներառված DRM օբյեկտը հնարավոր չէ փոխանցել:"</string>
-    <string name="converting_to_picture_message" msgid="2980023239017588627">"Փոխարկվում է մուլտիմեդիա հաղորդագրության..."</string>
-    <string name="cannot_add_slide_anymore" msgid="4631404749618820994">"Հնարավոր չէ ավելացնել հավելյալ էջեր:"</string>
-    <string name="cannot_add_picture_and_video" msgid="4954353772391381447">"Հնարավոր չէ ավելացնել տեսանյութ և լուսանկար մեկ էջի մեջ:"</string>
-    <string name="cannot_save_message" msgid="3375907366965264446">"Հնարավոր չէ պահել հաղորդագրությունը:"</string>
-    <string name="message_saved_as_draft" msgid="2503018972659880692">"Հաղորդագրությունը պահվեց որպես սևագիր:"</string>
-    <string name="too_many_recipients" msgid="7003415094007176931">"Հաղորդագրությունն ունի չափազանց շատ հասցեատերեր (<xliff:g id="CURRENTCOUNT">%1$s</xliff:g>): Դրված է Ստացողների քանակի <xliff:g id="MAXLIMIT">%2$s</xliff:g> սահմանափակում:"</string>
-    <string name="too_many_attachments" msgid="3774037894899750070">"Կցորդների <xliff:g id="MAXLIMIT">%1$s</xliff:g> սահմանափակում է դրված: Միայն առաջին <xliff:g id="CURRENTCOUNT">%2$s</xliff:g>-ը կավելացվի:"</string>
-    <string name="adding_attachments_title" msgid="2034535554212405529">"Ավելացվում են կցորդները"</string>
-    <string name="adding_attachments" msgid="5871373105122355632">"սպասեք մինչև նյութերը կավելացվեն ներկայացման մեջ:"</string>
-    <string name="building_slideshow_title" msgid="1232338692400726385">"Կազմվում է ներկայացում"</string>
-    <string name="cannot_play_audio" msgid="253920977253666735">"Հնարավոր չէ նվագարկել ձայնանյութը:"</string>
-    <string name="preview" msgid="5438149136136446756">"Նախադիտել"</string>
-    <string name="preview_slideshow" msgid="6824095909448728427">"Նախադիտում"</string>
-    <string name="replace_image" msgid="3171240952601443619">"Տեղափոխել նկարը"</string>
-    <string name="duration_sec" msgid="6617032324007824096">"Տևողությունը (<xliff:g id="DURATION">%s</xliff:g> վրկ)"</string>
-    <string name="duration_selector_title" msgid="5981097971537625852">"Ներկայացման տևողությունը "</string>
-    <string name="layout_selector_title" msgid="7344600117972450771">"Ներկայացման դասավորությունը "</string>
-    <string name="layout_top" msgid="6811021650398972346">"Դասավորությունը (Վերևից)"</string>
-    <string name="layout_bottom" msgid="5822765871095491843">"Դասավորությունը (ներքևից)"</string>
-    <string name="type_to_compose_text_or_leave_blank" msgid="7769792471457574059">"Մուտքագրեք հաղորդագրությունը կամ թողեք դատարկ"</string>
-    <string name="duration_not_a_number" msgid="2856636898040421237">"Տևողությունը պետք է թիվ լինի:"</string>
-    <string name="duration_zero" msgid="3549377790195185977">"Տևողությունը պետք է զրո վայրկյանից ավելի մեծ լինի:"</string>
-    <string name="secs" msgid="6886003523109967972">"վրկ"</string>
-  <string-array name="select_dialog_items">
-    <item msgid="4840183714016984112">"1 այլ"</item>
-    <item msgid="3734955613666864447">"2 այլ"</item>
-    <item msgid="6032232473048379828">"3 վայրկյան"</item>
-    <item msgid="5978471781525927827">"4 վայրկյան"</item>
-    <item msgid="4888440297621208402">"5 վայրկյան"</item>
-    <item msgid="6047246213264166841">"6 վայրկյան"</item>
-    <item msgid="2327501250056533797">"7 վայրկյան"</item>
-    <item msgid="3400770414689795703">"8 վայրկյան"</item>
-    <item msgid="4358760614161107970">"9 վայրկյան"</item>
-    <item msgid="2618179407176906471">"10 վայրկյան"</item>
-    <item msgid="7786079681602275449">"Այլ"</item>
-  </string-array>
-    <string name="menu_view_contact" msgid="1414670584423909451">"Դիտել կոնտակտը"</string>
-    <string name="menu_add_to_contacts" msgid="1258127580972228970">"Ավելացնել մարդկանց"</string>
-    <string name="hidden_sender_address" msgid="2776075636669924968">"Թաքնված ուղարկողի հասցեն"</string>
-    <string name="yes" msgid="3246158147503160811">"Լավ"</string>
-    <string name="no" msgid="4289742508556913860">"Չեղարկել"</string>
-    <string name="set" msgid="4642365398263275979">"Նշել"</string>
-    <string name="play" msgid="1888432400937785115">"Նվագարկել"</string>
-    <string name="edit" msgid="5912118407791492696">"Խմբագրել"</string>
-    <string name="try_to_send" msgid="1996751738286080976">"Փորձել ուղարկել"</string>
-    <string name="preferences_title" msgid="6650089610332670157">"Կարգավորումներ"</string>
-    <string name="restore_default" msgid="7165341506551155053">"Վերականգնել լռելյայն կարգավորումները"</string>
-    <string name="pref_notification_settings_title" msgid="6420782563630369776">"Ծանուցումներ"</string>
-    <string name="pref_mms_settings_title" msgid="55618772118264355">"Մուլտիմեդիա (MMS) հաղորդագրություններ"</string>
-    <string name="pref_sms_settings_title" msgid="5173078369851066881">"Տեքստային (SMS) հաղորդագրություններ"</string>
-    <string name="pref_sms_storage_title" msgid="9001233319190616445">"Պահուստ"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"Կառավարեք ձեր SIM քարտում պահվող հաղորդագրությունները"</string>
-    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"Հայցել յուրաքանչյուր ուղարկվող հաղորդագրության առաքման ծանուցում"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"Հայցել յուրաքանչյուր ուղարկվող հաղորդագրության ընթերցման ծանուցում"</string>
-    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"Հայցել յուրաքանչյուր ուղարկվող հաղորդագրության առաքման ծանուցում"</string>
-    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"Ջնջել հին հաղորդագրությունները, երբ սահմանաչափերը սպառվում են"</string>
-    <string name="pref_summary_delete_limit" msgid="597128041393045216">"<xliff:g id="COUNT">%1$s</xliff:g> հաղորդագրություն ըստ զրույցի"</string>
-    <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"Օգտագործել MMS՝ մեկ հաղորդագրություն ուղարկելու համար, երբ կան բազմաթիվ հասցեատերեր"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"Կառավարել SIM քարտի հաղորդագրությունները"</string>
-    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"Առաքման ծանուցումներ"</string>
-    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"Խմբային հաղորդագրություններ"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Կարդալ ծանուցումները"</string>
-    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Առաքման ծանուցումներ"</string>
-    <string name="pref_title_auto_delete" msgid="7227835692631701134">"Ջնջել հին հաղորդագրությունները"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"Տեքստային հաղորդագրությունների սահմանափակում"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"Մուլտիմեդիա հաղորդագրությունների սահմանափակում"</string>
-    <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Ծանուցումներ"</string>
-    <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Թրթռալ"</string>
-    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Ձայն"</string>
-    <string name="pref_messages_to_save" msgid="3202539743892934926">"Նշել հաղորդագրությունների քանակը՝ պահելու համար"</string>
-    <string name="silent_ringtone" msgid="7981237991326592780">"Լուռ"</string>
-    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Ինքնաառբերում"</string>
-    <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Ավտոմատ առբերել հաղորդագրությունները"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Ռոումինգի ինքնաաբերում"</string>
-    <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"Ավտոմատ առբերել հաղորդագրությունները ռոումինգում"</string>
-    <string name="confirm_dialog_title" msgid="2187213750475782725">"Ջնջե՞լ"</string>
-    <string name="confirm_dialog_locked_title" msgid="8179085718150932242">"Ջնջե՞լ կողպված հաղորդագրությունը:"</string>
-  <plurals name="confirm_delete_conversation">
-    <item quantity="one" msgid="7509396981963472833">"Մեկ զրույց կջնջվի:"</item>
-    <item quantity="other" msgid="4076915774012081811">"<xliff:g id="NUMBER">%1$s</xliff:g> զրույցներ կջնջվեն:"</item>
-  </plurals>
-    <string name="confirm_delete_conversation" msgid="6115966687389279855">"Ամբողջ շղթան կջնջվի:"</string>
-    <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"Բոլոր շղթաները կջնջվեն:"</string>
-    <string name="confirm_delete_message" msgid="9121480656609809591">"Հաղորդագրությունը կջնջվի:"</string>
-    <string name="confirm_delete_locked_message" msgid="7203411948190100955">"Ջնջե՞լ այս կողպված հաղորդագրությունը:"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"SIM քարտի բոլոր հաղորդագրությունները կջնջվեն:"</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"SIM քարտի այս հաղորդագրությունը կջնջվի:"</string>
-    <string name="delete_unlocked" msgid="7545321606698162261">"Ջնջել կողպված հաղորդագրությունները"</string>
-    <string name="delete" msgid="1409973060081564612">"Ջնջել"</string>
-    <string name="select_conversations" msgid="7816517565640002844">"Ընտրել ցրույցներ"</string>
-    <string name="no_conversations" msgid="6773767655149258445">"Չկան զրույցներ:"</string>
-    <string name="loading_conversations" msgid="5510430408235967094">"Բեռնվում են զրույցները:"</string>
-    <string name="cannot_get_details" msgid="850292987983026806">"Հնարավոր չէ առբերել տվյալները:"</string>
-    <string name="message_details_title" msgid="9223295113731634528">"Հաղորդագրության մանրամասները"</string>
-    <string name="message_type_label" msgid="7975373966795945566">"Տեսակ՝ "</string>
-    <string name="text_message" msgid="8196464345251877972">"Տեքստային հաղորդագրություն"</string>
-    <string name="multimedia_message" msgid="1512644521083533071">"Մուլտիմեդիա հաղորդագրություն"</string>
-    <string name="multimedia_notification" msgid="4124031788554972308">"Մուլտիմեդիա հաղորդագրության ծանուցում"</string>
-    <string name="from_label" msgid="2055117571548171397">"Ուղարկող՝ "</string>
-    <string name="to_address_label" msgid="5837363600471845801">"Ստացող՝ "</string>
-    <string name="bcc_label" msgid="530867161453958774">"Ծածկպտճ՝ "</string>
-    <string name="sent_label" msgid="2722190650145251584">"Ուղարկվել է՝ "</string>
-    <string name="received_label" msgid="8618029024731693906">"Ստացվել է՝ "</string>
-    <string name="saved_label" msgid="4183160415593488207">"Պահված է` "</string>
-    <string name="subject_label" msgid="8721241914144101631">"Վերնագիր՝ "</string>
-    <string name="message_size_label" msgid="4698016210013319786">"Հաղորդագրության չափը՝ "</string>
-    <string name="priority_label" msgid="7397600367853359607">"Առաջնահերթություն՝ "</string>
-    <string name="priority_high" msgid="5627897207952009214">"Բարձր"</string>
-    <string name="priority_normal" msgid="5715227727384683550">"Սովորական"</string>
-    <string name="priority_low" msgid="8928782666023373987">"Ցածր"</string>
-    <string name="message_class_label" msgid="5115748690481550562">"Հաղորդագրության կարգը՝ "</string>
-    <string name="error_code_label" msgid="5810068247647058769">"Սխալ կոդ՝ "</string>
-    <string name="menu_edit" msgid="3056513240155967777">"Խմբագրել"</string>
-    <string name="menu_delete_messages" msgid="2610286783513247420">"Ջնջել հաղորդագրությունները"</string>
-    <string name="menu_lock" msgid="7603793126077557472">"Կողպել"</string>
-    <string name="menu_unlock" msgid="6662865558677424039">"Ապակողպել"</string>
-    <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"Պատճենել գրասալիկի հիշողության մեջ"</string>
-    <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"Պատճենել հեռախոսի հիշողության մեջ"</string>
-    <string name="sim_delete" msgid="610790510655316922">"Ջնջել"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"SIM քարտի տեքստային հաղորդագրություններ"</string>
-    <string name="sim_view" msgid="1997173541766393706">"Դիտել"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"SIM քարտում հաղորդագրություններ չկան:"</string>
-    <string name="delivery_header_title" msgid="5361719578869045764">"Զեկույց"</string>
-    <string name="status_none" msgid="8253075950774894961">"(Ոչ մեկը)"</string>
-    <string name="status_pending" msgid="2739860824607984892">"Առկախ"</string>
-    <string name="status_read" msgid="7576195253780627332">"Ընթերցված"</string>
-    <string name="status_received" msgid="7264334589461906965">"Ստացված"</string>
-    <string name="status_failed" msgid="1998776666856593544">"Խափանված է"</string>
-    <string name="status_unread" msgid="8555305495998700198">"Չընթերցված"</string>
-    <string name="status_rejected" msgid="2613641949065942678">"Մերժված"</string>
-    <string name="recipient_label" msgid="3922667485312634446">"Ստացող՝ "</string>
-    <string name="status_label" msgid="7283375460919181660">"Կարգավիճակը՝ "</string>
-    <string name="delivered_label" msgid="3514011729156932928">"Ուղարկվել է՝ "</string>
-    <string name="attach_image" msgid="6439985727687107742">"Լուսանկարներ"</string>
-    <string name="attach_take_photo" msgid="4280601313184373837">"Լուսանկարել"</string>
-    <string name="attach_video" msgid="4264272693501538294">"Տեսանյութեր"</string>
-    <string name="attach_record_video" msgid="3099814114743078615">"Տեսագրել"</string>
-    <string name="attach_sound" msgid="3149325985970669609">"Ձայնանյութ"</string>
-    <string name="attach_record_sound" msgid="6011431304469858929">"Ձայնագրել"</string>
-    <string name="attach_slideshow" msgid="3497422151091037063">"Ներկայացում"</string>
-    <string name="select_bottom_text" msgid="4201966447623311931">"Տեքստը՝ ներքևում"</string>
-    <string name="select_top_text" msgid="6734183477539197815">"Տեքստը՝ վերևում"</string>
-    <string name="delivery_toast_body" msgid="5960519861835727013">"Հաղորդագրությունը ստացվել է %s-ի կողմից:"</string>
-    <string name="notification_multiple" msgid="7684007285202109490">"<xliff:g id="COUNT">%s</xliff:g> չընթերցված հաղորդագրություն:"</string>
-    <string name="notification_multiple_title" msgid="332602028959557541">"Նոր հաղորդագրություններ"</string>
-    <string name="notification_failed_multiple" msgid="6192531993698497229">"<xliff:g id="COUNT">%s</xliff:g> հաղորդագրություն հնարավոր չէ ուղարկվել"</string>
-    <string name="notification_failed_multiple_title" msgid="1112032024904397126">"Հաղորդագրությունները չեն առաքվել"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"SIM քարտը լցված է"</string>
-    <string name="sim_full_body" msgid="6241664980790322925">"Ջնջել որոշ հաղորդագրություններ` ավելի շատ ծավալ ունենալու համար:"</string>
-    <string name="sms_full_title" msgid="6041287140125011854">"Տեքստային հաղորդագրությունների հիշողությունը լցված է"</string>
-    <string name="sms_full_body" msgid="4885861852397651868">"Մտից հաղորդագրությունը մերժվել է՝ լցված հիշողության պատճառով: Ջնջեք որոշ հին հաղորդագրություններ:"</string>
-    <string name="sms_rejected_title" msgid="8548394922491529811">"Տեքստային հաղորդագրությունը մերժված է"</string>
-    <string name="sms_rejected_body" msgid="7813671133968158562">"Մտից հաղորդագրությունը մերժվել է անհայտ պատճառով:"</string>
-    <string name="type_audio" msgid="3842064092332309756">"ձայնանյութը"</string>
-    <string name="type_picture" msgid="4091928975383609443">"նկարը"</string>
-    <string name="type_video" msgid="8521556159545168441">"տեսանյութը"</string>
-    <string name="confirm" msgid="3155110885840591914">"Հաստատել"</string>
-    <string name="message_send_read_report" msgid="6997117678914261250">"Ընթերցման ծանութումը կուղարկվի:"</string>
-    <string name="message_queued" msgid="7975945623873194737">"Ներկայումս հնարավոր չէ ուղարկել ձեր հաղորդագրությունը: Այն կուղարկվի, երբ ծառայությունը հասանելի դառնա:"</string>
-    <string name="fdn_check_failure" msgid="7880740763778173551">"Դուք կարող եք միայն հաղորդագրություններ ուղարկել ձեր ամրակայված հեռախոսահամարներին:"</string>
-    <string name="no_subject" msgid="4168963736134552285">"(Անվերնագիր)"</string>
-    <string name="unknown_sender" msgid="4929330613278853635">"Անհայտ ուղարկող"</string>
-    <string name="dl_failure_notification" msgid="8097699679464396537">"Հնարավոր չէ ներբեռնել <xliff:g id="SUBJECT">%1$s</xliff:g> հաղորդագրությունը <xliff:g id="FROM">%2$s</xliff:g>-ից:"</string>
-    <string name="rate_limit_surpassed" msgid="1347801608211628177">"Հաստատել"</string>
-    <string name="confirm_rate_limit" msgid="234228299751243067">"Մեծ թվով մուլտիմեդիա հաղորդագրություններ են ուղարկվում: Արդյոք լա՞վ է:"</string>
-    <string name="message_download_failed_title" msgid="5722226064394767921">"Հաղորդագրությունը չի ներբեռնվել"</string>
-    <string name="message_send_failed_title" msgid="3469894907399046372">"Հաղորդագրությունը չի ուղարկվել"</string>
-    <string name="message_failed_body" msgid="3421296112073915245">"Հպեք՝ վերանայելու հաղորդագրությունը և կրկին փորձեք:"</string>
-    <string name="download_later" msgid="5531365714424360903">"Հնարավոր չէ ներբեռնել հենց հիմա: Կրկին փորձեք ավելի ուշ:"</string>
-    <string name="no_apn" msgid="505932916503312015">"Սարքում ոչ մի APN նշված չէ:"</string>
-    <string name="select_audio" msgid="3528161449756771832">"Ընտրել ձայնանյութ"</string>
-    <string name="copy_to_sdcard" msgid="757028609638184856">"Պահել կցորդը"</string>
-    <string name="copy_to_sdcard_success" msgid="7948625615155992014">"Կցորդը պահվեց:"</string>
-    <string name="copy_to_sdcard_fail" msgid="4944606369631916737">"Հնարավոր չէ պահել կցորդը:"</string>
-    <string name="save_ringtone" msgid="2310157075045201051">"Պահել որպես ձայներանգ"</string>
-    <string name="saved_ringtone" msgid="3847363932276708626">"Ձայներանգը պահված է:"</string>
-    <string name="saved_ringtone_fail" msgid="4778500070919251116">"Ձայներանգը չհաջողվեց պահել:"</string>
-    <string name="menu_insert_smiley" msgid="4964504393061025071">"Մուտքագրել ժպիտ"</string>
-    <string name="menu_group_participants" msgid="4288356090262299071">"Խմբի մասնակիցները"</string>
-    <string name="select_link_title" msgid="3371818607625768447">"Ընտրեք գործողությունը"</string>
-    <string name="slide_number" msgid="1923958526266726635">"Էջ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-  <plurals name="slide_duration">
-    <item quantity="one" msgid="1654101988340583935">"<xliff:g id="NUMBER">%s</xliff:g> վրկ"</item>
-    <item quantity="few" msgid="7887190171856293871">"<xliff:g id="NUMBER">%s</xliff:g> վրկ"</item>
-    <item quantity="other" msgid="3736425355579939863">"<xliff:g id="NUMBER">%s</xliff:g> վրկ"</item>
-  </plurals>
-    <string name="delivery_report_activity" msgid="2957463094232916364">"Առաքման ծանուցում"</string>
-    <string name="storage_limits_activity" msgid="8810530813311077716">"Պահուստի սահմանաչափերը"</string>
-    <string name="change_duration_activity" msgid="7048606979485031693">"Փոխել տևողությունը"</string>
-    <string name="edit_slideshow_activity" msgid="8751493388760050529">"Խմբագրել ներկայացումը"</string>
-    <string name="recipient_list_activity" msgid="1254938236543727019">"Խմբի անդամները"</string>
-    <string name="edit_slide_activity" msgid="8752829671778696983">"Խմբագրել էջը"</string>
-    <string name="slideshow_activity" msgid="5658249461317434432">"Ներկայացում"</string>
-    <string name="class_0_message_activity" msgid="6631339964159861048">"Class 0 հաղորդագրություն"</string>
-    <string name="search_label" msgid="6042598929386174964">"Հաղորդակցում"</string>
-    <string name="search_hint" msgid="7273727663577472044">"Որոնել հաղորդակցում"</string>
-    <string name="search" msgid="7560238620274735199">"Հաղորդակցում"</string>
-    <string name="search_setting_description" msgid="4104004595086437572">"Տեքստեր ձեր հաղորդագրություններում"</string>
-    <string name="search_empty" msgid="2109551478056039278">"Համընկնում չկա:"</string>
-  <plurals name="search_results_title">
-    <item quantity="one" msgid="4657073733087431350">"<xliff:g id="NUMBER">%1$s</xliff:g> արդյունք «<xliff:g id="SEARCH">%2$s</xliff:g>»-ի համար"</item>
-    <item quantity="other" msgid="6196382287749539209">"<xliff:g id="NUMBER">%1$s</xliff:g> արդյունք «<xliff:g id="SEARCH">%2$s</xliff:g>»-ի համար"</item>
-  </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> արդյունք «<xliff:g id="SEARCH">%2$s</xliff:g>»-ի համար"</string>
-    <string name="confirm_clear_search_title" msgid="8510295993632032904">"Մաքրել"</string>
-    <string name="confirm_clear_search_text" msgid="8731877031837077478">"Որոնման պատմությունը կմաքրվի:"</string>
-    <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Մաքրել որոնման պատմությունը"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"Մաքրել որոնման պատուհանում ցուցադրվող նախորդ հաղորդակցման որոնումները"</string>
-    <string name="save" msgid="6847069284991531310">"Պահել"</string>
-    <string name="storage_limits_title" msgid="7074684882530693016">"Սահմանափակել հաղորդագրությունները"</string>
-    <string name="storage_limits_message" msgid="2010501485394745696">"Սահմանափակե՞լ զրույցի մեջ պահվող հաղորդագրությունների քանակը:"</string>
-    <string name="storage_limits_setting" msgid="4952781049308537373">"Սահմանել"</string>
-    <string name="storage_limits_setting_dismiss" msgid="1433841310158458034">"Սահմանափակումներ չկան"</string>
-    <string name="too_many_unsent_mms" msgid="4436493698891224126">"Հնարավոր չէ ուղարկել հենց հիմա: Չափից շատ չառաքված մուլտիմեդիա հաղորդագրություններ կան:"</string>
-    <string name="sending_message" msgid="2054406576361149715">"Ուղարկվում է..."</string>
-    <string name="pick_too_many_recipients" msgid="650087588867628044">"Չափից շատ ստացողներ"</string>
-    <string name="adding_recipients" msgid="2962810172527532357">"Ավելացվում են ստացողները..."</string>
-    <string name="draft_separator" msgid="5402575086540243019">", "</string>
-    <string name="message_count_format" msgid="4434763220590778012">" <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="message_count_notification" msgid="3629968600032690007">"<xliff:g id="NUMBER">%1$s</xliff:g> նոր հաղորդագրություն"</string>
-  <plurals name="message_count_notification_overflow">
-    <item quantity="one" msgid="3340591167508150806">"+<xliff:g id="NUMBER">%1$s</xliff:g> այլ հաղորդագրություն"</item>
-    <item quantity="other" msgid="1393002799298501480">"+<xliff:g id="NUMBER">%1$s</xliff:g> այլ հաղորդագրություններ"</item>
-  </plurals>
-    <string name="error_state" msgid="5177386717626893507">"Անհամատեղելի կարգավիճակ"</string>
-    <string name="error_state_text" msgid="7918866106335387710">"Շղթաների և հասցեատերերի կարգավիճակն անհամատեղելի է: Խնդրում ենք ստեղծել սխալի զեկույցը և հաղորդել այն http://go/droidanizer-ի միջոցով"</string>
-  <plurals name="recipient_count">
-    <item quantity="other" msgid="7338580381574463136">"<xliff:g id="NUMBER">%1$s</xliff:g> մարդ"</item>
-  </plurals>
-    <string name="disable_notifications_dialog_message" msgid="7644011234972074096">"Կանգնեցնե՞լ լռելյայն նամակագրության հավելվածից տեքստային հաղորդագրությունների ծանուցումների կրկնօրինակումը:"</string>
-    <string name="view_more_conversations" msgid="7275920132410734671">"Տեսնել այլ զրույցներ"</string>
-    <string name="attachment_audio" msgid="2867960243300539143">"Ձայնանյութեր"</string>
-    <string name="attachment_slideshow" msgid="5867689101881763318">"Ներկայացում"</string>
-    <string name="attachment_video" msgid="4252062022156694591">"Տեսանյութ"</string>
-    <string name="attachment_picture" msgid="3709286281567284296">"Լուսանկար"</string>
-    <string name="notification_separator" msgid="2334673105226536422">"  "</string>
-    <string name="enumeration_comma" msgid="213598026698964628">", "</string>
-    <string name="message_timestamp_format" msgid="4188999027493614617">"<xliff:g id="STRING_0">%1$s</xliff:g> - <xliff:g id="STRING_1">%2$s</xliff:g>"</string>
-    <string name="storage_warning_title" msgid="7124740686325942375">"Ձեր հեռախոսի հիշողությունը լցված է"</string>
-    <string name="storage_warning_content" msgid="1100367816649962354">"Դուք չեք ստանա նոր SMS/MMS հաղորդագրություններ"</string>
-    <string name="label_mms_send_outbox_msg" msgid="3395185162973061099">"MMS ծանուցում"</string>
-    <string name="desc_mms_send_outbox_msg" msgid="1837156781311437148">"Ուղարկում է ելիցի բոլոր MMS-ները"</string>
-</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 60dec898..4e9b0583 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Suara"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Setel jumlah pesan yang akan disimpan"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Senyap"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Tanyakan SIM yang akan digunakan setiap mengirim pesan"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Beberapa SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Pungut otomatis"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Pungut pesan secara otomatis"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Pungut otomatis roaming"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Perpesanan bukan aplikasi SMS Anda"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> adalah aplikasi SMS Anda"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Anda dapat mengubah ini di Setelan"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Pilih SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Slot SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Batal"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"SIM yang dipilih saat ini tidak ada. Pilih SIM default dalam setelan sistem."</string>
 </resources>
diff --git a/res/values-is-rIS/arrays.xml b/res/values-is-rIS/arrays.xml
index 8c1d4a43..6e39b487 100644
--- a/res/values-is-rIS/arrays.xml
+++ b/res/values-is-rIS/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"ekkert efni"</item>
-    <item msgid="2214945158821871846">"ekkertefni"</item>
   </string-array>
 </resources>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml
index b6c726d0..5e5edcba 100644
--- a/res/values-is-rIS/strings.xml
+++ b/res/values-is-rIS/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Hljóð"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Velja fjölda skilaboða sem á að vista"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Hljóðlaust"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Spyrja hvaða SIM-kort á að nota í hvert skipti sem skilaboð eru send"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Mörg SIM-kort"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Sækja sjálfkrafa"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Sækja skilaboð sjálfkrafa"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Sækja sjálfkrafa í reiki"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Skilaboð er ekki SMS-forritið þitt"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> er SMS-forritið þitt"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Þú getur breytt þessu í stillingunum"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Velja SIM-kort"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM-kort <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM-kortarauf <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Hætta við"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Valið SIM-kort er ekki til staðar. Veldu sjálfgefið SIM-kort í kerfisstillingum."</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d2639524..f145509e 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Suono"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Imposta numero di messaggi da salvare"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Silenzioso"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Chiedi quale SIM utilizzare ogni volta che viene inviato un messaggio"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"SIM multipla"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Recupero automatico"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Recupera messaggi automaticamente"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Recupero in roaming"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Messaggi non è la tua app per gli SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> è la tua app per gli SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Puoi apportare modifiche in Impostazioni"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Seleziona SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Slot della SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Annulla"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"La SIM attualmente selezionata non è presente. Scegli la tua SIM predefinita nelle impostazioni di sistema."</string>
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 5de4497b..e988b9b1 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"צליל"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"הגדר מספר הודעות לשמירה"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"שקט"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"‏שאל באיזה כרטיס SIM יש להשתמש בכל פעם שנשלחת הודעה"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"‏ריבוי כרטיסי SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"אחזור אוטומטי"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"אחזר הודעות באופן אוטומטי"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"אחזור אוטומטי בנדידה"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"‏\'העברת הודעות\' אינה אפליקציית ה-SMS שלך"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"‏<xliff:g id="APPNAME">%s</xliff:g> היא אפליקציית ה-SMS שלך"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"ניתן לשנות זאת בהגדרות"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"‏בחר SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"‏חריץ SIM‏ <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"בטל"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"‏כרטיס ה-SIM הנוכחי שנבחר אינו מחובר. בחר בכרטיס ה-SIM המוגדר כברירת מחדל בהגדרות המערכת."</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 25752b0d..672b3517 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"着信音"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"保存するメッセージ件数を設定"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"マナーモード"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"メッセージが送信されるたびに使用するSIMを確認する"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"マルチSIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"自動で取得"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"メッセージを自動的に取得する"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"ローミング時に自動取得"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"SMSをSMSアプリとして利用していません"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g>をSMSアプリとして利用しています"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"これは[設定]で変更できます。"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"SIMの選択"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIMスロット<xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"キャンセル"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"現在選択されているSIMは存在しません。システム設定でデフォルトのSIMを選択してください。"</string>
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index bc3780ed..8460a11c 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ხმა"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"შესანახად დააწესეთ შეტყობინებების რაოდენობა"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"ჩუმი"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"ყოველი შეტყობინების გაგზავნისას კითხვა, თუ რომელი აღარ მაქვს,"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"მულტი-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"ავტო ჩამოტვირთვა"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"შეტყობინებების ავტომატურად ჩამოტვირთვა"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"ავტო ჩამოტვირთვა როუმინგში"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Messaging თქვენი SMS აპი არ არის"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> თქვენი SMS აპია"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"ამის შეცვლა პარამეტრებში შეგიძლიათ"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"აირჩიეთ SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM სათავსო <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"გაუქმება"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"ამჟამად არჩეული SIM ვერ იძებნება. აირჩიეთ ნაგულისხმევი SIM სისტემის პარამეტრებში."</string>
 </resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
deleted file mode 100644
index c7b9c971..00000000
--- a/res/values-ka/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1503967887341230795">"შეტყობინებები"</string>
-    <string name="new_message" msgid="1530369762346003973">"ახალი შეტყობინება"</string>
-    <string name="menu_call_back" msgid="7538482331117914146">"<xliff:g id="NAME">%s</xliff:g>-თან დარეკვა"</string>
-    <string name="menu_send_email" msgid="671366308915241664">"ელფოსტის გაგზავნა <xliff:g id="NAME">%s</xliff:g>-თან"</string>
-    <string name="menu_compose_new" msgid="3763437973691046238">"შექმნა"</string>
-    <string name="menu_preferences" msgid="4693148116114749414">"პარამეტრები"</string>
-    <string name="menu_add_address_to_contacts" msgid="4491980950419914944">"<xliff:g id="CONTACTEMAILORNUMBER">%s</xliff:g>-ის ხალხში დამატება"</string>
-    <string name="menu_call" msgid="5877123227307074690">"დარეკვა"</string>
-    <string name="menu_search" msgid="2289469305728821360">"ძიება"</string>
-    <string name="menu_delete_all" msgid="808729454898114735">"ყველა მიმოწერის წაშლა"</string>
-    <string name="menu_delete" msgid="1851666911396479006">"მიმოწერის წაშლა"</string>
-    <string name="menu_view" msgid="7448852683948080108">"მიმოწერის ნახვა"</string>
-    <string name="menu_debug_dump" msgid="6855869130206549643">"DEBUG DUMP"</string>
-    <string name="refreshing" msgid="987335057871404222">"განახლება…"</string>
-    <string name="menu_cell_broadcasts" msgid="5646161375983084660">"Cell broadcasts"</string>
-    <string name="has_draft" msgid="2487465595514636160">"მონახაზი჻"</string>
-    <string name="no_subject_view" msgid="7795086723069563537">"(თემის გარეშე)"</string>
-    <string name="messagelist_sender_self" msgid="3579016854116401602">"მე"</string>
-    <string name="view_slideshow" msgid="4990460971211388453">"სლაიდშოუს ნახვა"</string>
-    <string name="view_message_details" msgid="7613457646645796831">"დეტალების ნახვა"</string>
-    <string name="view_delivery_report" msgid="8219095994071575215">"ანგარიშის ნახვა"</string>
-    <string name="delete_message" msgid="6442394955910357234">"წაშლა"</string>
-    <string name="expire_on" msgid="4436268382742593921">"ვადის გასვლა: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="kilobyte" msgid="534782148965716631">"კბაიტი"</string>
-    <string name="undelivered_msg_dialog_title" msgid="7479433403599785755">"მოუწოდებელი შეტყობინება"</string>
-    <string name="undelivered_msg_dialog_body" msgid="4789268239627694551">"ამ შეტყობინების გაგზავნა ვერ მოხერხდა.\nმცდელობა განხორციელდა: <xliff:g id="MESSAGE">%s</xliff:g>."</string>
-    <string name="undelivered_sms_dialog_body" msgid="4203703285563450868">"ამ შეტყობინების გაგზავნა ვერ მოხერხდა."</string>
-    <string name="delete_thread" msgid="757258847736632791">"მიმოწერის წაშლა"</string>
-    <string name="menu_forward" msgid="9026858380050046756">"გადაგზავნა"</string>
-    <string name="download" msgid="4488877642230207631">"ჩამოტვირთვა"</string>
-    <string name="downloading" msgid="1779557575565350637">"ჩამოტვირთვა"</string>
-    <string name="inline_subject" msgid="4057621785274119260">"&lt;თემა: <xliff:g id="SUBJECT">%s</xliff:g>&gt;"</string>
-    <string name="drm_protected_text" msgid="1396394157870730742">"* DRM-ით დაცული ტექსტი *"</string>
-    <string name="insufficient_drm_rights" msgid="6989074725969164383">"აღმოჩნდა არასაკმარისი DRM უფლებები."</string>
-    <string name="copy_message_text" msgid="4296252229544252834">"ტექსტის კოპირება"</string>
-    <string name="message_options" msgid="6838806653341967550">"შეტყობინების პარამეტრები"</string>
-    <string name="slideshow_options" msgid="3501759384739796431">"სლაიდშოუს პარამეტრები"</string>
-    <string name="done" msgid="7479926268660505871">"დასრულდა"</string>
-    <string name="move_up" msgid="7307578107431739359">"ზემოთ გადანაცვლება"</string>
-    <string name="move_down" msgid="6356509518429479053">"ქვემოთ გადანაცვლება"</string>
-    <string name="remove_slide" msgid="2225604354024914900">"სლაიდის ამოშლა"</string>
-    <string name="add_slide" msgid="9140721399423564187">"სლაიდის დამატება"</string>
-    <string name="add_slide_hint" msgid="7351356961076244584">"შეეხეთ ახალი სლაიდის შესაქმნელად."</string>
-    <string name="discard_slideshow" msgid="5054239124146413609">"სლაიდშოუს გაუქმება"</string>
-    <string name="slide_show_part" msgid="5077675385448696846">"ნაწილი <xliff:g id="PART">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="remove_text" msgid="2164068850029476539">"ტექსტის ამოშლა"</string>
-    <string name="add_picture" msgid="7819574884962571479">"სურათის დამატება"</string>
-    <string name="remove_picture" msgid="6378701749074289096">"სურათის ამოშლა"</string>
-    <string name="add_music" msgid="3827442822987116233">"მუსიკის დამატება"</string>
-    <string name="remove_music" msgid="858889733416015223">"მუსიკის ამოშლა"</string>
-    <string name="add_video" msgid="7816866867806595144">"ვიდეოს დამატება"</string>
-    <string name="remove_video" msgid="5258603891528497799">"ვიდეოს ამოშლა"</string>
-    <string name="to_hint" msgid="224029549150332986">"მიმღები"</string>
-    <string name="subject_hint" msgid="4296714962311604126">"თემა"</string>
-    <string name="add_attachment" msgid="7103751293360532684">"დანართი"</string>
-    <string name="add_subject" msgid="7616134948428265870">"თემის დამატება"</string>
-    <string name="discard" msgid="1624800293064498479">"გაუქმება"</string>
-    <string name="view" msgid="7929667761715467136">"ნახვა"</string>
-    <string name="replace" msgid="7587904998114459388">"ჩანაცვლება"</string>
-    <string name="remove" msgid="4625444913256213175">"ამოშლა"</string>
-    <string name="send" msgid="4589898724889248486">"გაგზავნა"</string>
-    <string name="mms" msgid="1587631213714914559">"MMS"</string>
-    <string name="send_mms" msgid="2933162044872550662">"MMS-ის გაგზავნა"</string>
-    <string name="all_threads" msgid="2663426830306307194">"ყველა მიმოწერა"</string>
-    <string name="type_to_compose_text_enter_to_send" msgid="3539985471008581265">"შეიყვანეთ შეტყობინება"</string>
-    <string name="open_keyboard_to_compose_message" msgid="7860109685511253191">"შეტყობინების ასაკრეფად გახსენით კლავიატურა"</string>
-    <string name="compressing" msgid="1961357529661045180">"სურათი ძალიან დიდია. მიმდინარეობს კომპრესირება…"</string>
-    <string name="unsupported_media_format" msgid="1350489690977363764">"<xliff:g id="NAME">%1$s</xliff:g>-ის ფორმატი მხარდაჭერილი არ არის."</string>
-    <string name="select_different_media" msgid="6241623357299382183">"აირჩიეთ სხვა <xliff:g id="NAME">%1$s</xliff:g>."</string>
-    <string name="exceed_message_size_limitation" msgid="6027753647094742437">"შეტყობინების მაქსიმალური ზომა მიღწეულია."</string>
-    <string name="message_too_big_for_video" msgid="2639367545165352543">"შეტყობინება ძალიან დიდია ვიდეოს მისამაგრებლად."</string>
-    <string name="failed_to_add_media" msgid="7207464170168708485">"ამ <xliff:g id="NAME">%1$s</xliff:g>-ს შეტყობინებაში ვერ ჩასვამთ."</string>
-    <string name="failed_to_resize_image" msgid="5608354151631833669">"სურათის ზომა არ შეცვლილია."</string>
-    <string name="resize_image_error_information" msgid="3783200130776554475">"სურათის ზომა გასაგზავნად ძალიან დიდია, ზომის შეცვლის მიუხედავად."</string>
-    <string name="forward_prefix" msgid="276280492803486464">"გადაგზ: "</string>
-    <string name="discard_message_reason" msgid="2667664943003796133">"თქვენი შეტყობინება გაუქმდება, ვინაიდან მას მართებული მიმღებები არ გააჩნია."</string>
-    <string name="has_invalid_recipient" msgid="1485388396900997383">"არასწორი მიმღებ(ებ)ი: &lt;<xliff:g id="NAME">%1$s</xliff:g>&gt;"</string>
-    <string name="invalid_destination" msgid="4573835601024786416">"დანიშნულების არასწორი მისამართი."</string>
-    <string name="service_not_activated" msgid="9178218144019626176">"სერვისი არ გააქტიურებულა ქსელში."</string>
-    <string name="service_message_not_found" msgid="1908877102600048515">"შეტყობინებას ვადა გაუვიდა, ან მიუწვდომელია."</string>
-    <string name="service_network_problem" msgid="4583269174855943025">"ქსელის პრობლემის გამო ვერ გაიგზავნა."</string>
-    <string name="invalid_recipient_message" msgid="6465343105010999068">"გთხოვთ, შეასწოროთ მიმღებ(ებ)ი, სხვა შემთხვევაში ისინი შეტყობინებებს ვერ მიიღებენ."</string>
-    <string name="cannot_send_message" msgid="3414307479833622644">"შეტყობინების გაგზავნა ვერ ხერხდება"</string>
-    <string name="cannot_send_message_reason" msgid="8745080126044054343">"თქვენს შეტყობინებას მართებული ადრესატი არ გააჩნია."</string>
-    <string name="cannot_forward_drm_obj" msgid="5047623751430559077">"შეტყობინებაში ჩართული DRM ობიექტის გადამისამართება ვერ ხერხდება."</string>
-    <string name="converting_to_picture_message" msgid="2980023239017588627">"მიმდინარეობს მულტიმედია შეტყობინებად კონვერტაცია…"</string>
-    <string name="cannot_add_slide_anymore" msgid="4631404749618820994">"მეტი სლაიდის დამატება ვერ ხერხდება."</string>
-    <string name="cannot_add_picture_and_video" msgid="4954353772391381447">"ერთ სლაიდზე ვიდეოსა და სურათის დამატება ვერ ხერხდება."</string>
-    <string name="cannot_save_message" msgid="3375907366965264446">"შეტყობინების შენახვა ვერ ხერხდება."</string>
-    <string name="message_saved_as_draft" msgid="2503018972659880692">"შეტყობინება შეინახა მონახაზად."</string>
-    <string name="too_many_recipients" msgid="7003415094007176931">"შეტყობინებას ძალიან ბევრი მიმღები ყავს (<xliff:g id="CURRENTCOUNT">%1$s</xliff:g>). დაწესებულია <xliff:g id="MAXLIMIT">%2$s</xliff:g> მიმღების ლიმიტი."</string>
-    <string name="too_many_attachments" msgid="3774037894899750070">"დაწესებულია <xliff:g id="MAXLIMIT">%1$s</xliff:g> დანართის ლიმიტი. დაემატება მხოლოდ პირველი <xliff:g id="CURRENTCOUNT">%2$s</xliff:g> ერთეული."</string>
-    <string name="adding_attachments_title" msgid="2034535554212405529">"დანართების მიმაგრება"</string>
-    <string name="adding_attachments" msgid="5871373105122355632">"მოითმინეთ, სანამ ერთეულები სლაიდშოუს დაემატებოდეს."</string>
-    <string name="building_slideshow_title" msgid="1232338692400726385">"სლაიდშოუს აწყობა"</string>
-    <string name="cannot_play_audio" msgid="253920977253666735">"ვიდეოს დაკვრა ვერ ხერხდება."</string>
-    <string name="preview" msgid="5438149136136446756">"გადახედვა"</string>
-    <string name="preview_slideshow" msgid="6824095909448728427">"გადახედვა"</string>
-    <string name="replace_image" msgid="3171240952601443619">"სურათის ჩანაცვლება"</string>
-    <string name="duration_sec" msgid="6617032324007824096">"ხანგრძლივობა (<xliff:g id="DURATION">%s</xliff:g> წმ)"</string>
-    <string name="duration_selector_title" msgid="5981097971537625852">"სლაიდის ხანგრძლივობა "</string>
-    <string name="layout_selector_title" msgid="7344600117972450771">"Slideshow-ს განლაგება "</string>
-    <string name="layout_top" msgid="6811021650398972346">"განლაგება (ზედა)"</string>
-    <string name="layout_bottom" msgid="5822765871095491843">"განლაგება (ქვედა)"</string>
-    <string name="type_to_compose_text_or_leave_blank" msgid="7769792471457574059">"შეიყვანეთ შეტყობინება, ან დატოვეთ ცარიელი"</string>
-    <string name="duration_not_a_number" msgid="2856636898040421237">"ხანგრძლივობა ციფრი უნდა იყოს."</string>
-    <string name="duration_zero" msgid="3549377790195185977">"ხანგრძლივობა ნულ წამზე მეტი უნდა იყოს."</string>
-    <string name="secs" msgid="6886003523109967972">"წამი"</string>
-  <string-array name="select_dialog_items">
-    <item msgid="4840183714016984112">"1 წამი"</item>
-    <item msgid="3734955613666864447">"2 წამი"</item>
-    <item msgid="6032232473048379828">"3 წამი"</item>
-    <item msgid="5978471781525927827">"4 წამი"</item>
-    <item msgid="4888440297621208402">"5 წამი"</item>
-    <item msgid="6047246213264166841">"6 წამი"</item>
-    <item msgid="2327501250056533797">"7 წამი"</item>
-    <item msgid="3400770414689795703">"8 წამი"</item>
-    <item msgid="4358760614161107970">"9 წამი"</item>
-    <item msgid="2618179407176906471">"10 წამი"</item>
-    <item msgid="7786079681602275449">"სხვა"</item>
-  </string-array>
-    <string name="menu_view_contact" msgid="1414670584423909451">"კონტაქტის ნახვა"</string>
-    <string name="menu_add_to_contacts" msgid="1258127580972228970">"ხალხში დამატება"</string>
-    <string name="hidden_sender_address" msgid="2776075636669924968">"გამგზავნის მისამართი დამალულია"</string>
-    <string name="yes" msgid="3246158147503160811">"კარგი"</string>
-    <string name="no" msgid="4289742508556913860">"გაუქმება"</string>
-    <string name="set" msgid="4642365398263275979">"დაყენება"</string>
-    <string name="play" msgid="1888432400937785115">"დაკვრა"</string>
-    <string name="edit" msgid="5912118407791492696">"რედაქტირება"</string>
-    <string name="try_to_send" msgid="1996751738286080976">"გაგზავნის მცდელობა"</string>
-    <string name="preferences_title" msgid="6650089610332670157">"პარამეტრები"</string>
-    <string name="restore_default" msgid="7165341506551155053">"ნაგულისხმევი პარამეტრების აღდგენა"</string>
-    <string name="pref_notification_settings_title" msgid="6420782563630369776">"შეტყობინებები"</string>
-    <string name="pref_mms_settings_title" msgid="55618772118264355">"მულტიმედია (MMS) შეტყობინებები"</string>
-    <string name="pref_sms_settings_title" msgid="5173078369851066881">"ტექსტური (SMS) შეტყობინებები"</string>
-    <string name="pref_sms_storage_title" msgid="9001233319190616445">"საცავი"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"თქვენს SIM ბარათზე შენახული შეტყობინებების მართვა"</string>
-    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"ყოველ გაგზავნილ შეტყობინებაზე მიწოდების დასტურის მოთხოვნა"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"ყოველ გაგზავნილ შეტყობინებაზე წაკითხვის დასტურის მოთხოვნა"</string>
-    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"ყოველ გაგზავნილ შეტყობინებაზე მიწოდების დასტურის მოთხოვნა"</string>
-    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"ლიმიტის მიღწევისას ძველი შეტყობინებების წაშლა"</string>
-    <string name="pref_summary_delete_limit" msgid="597128041393045216">"<xliff:g id="COUNT">%1$s</xliff:g> შეტყობინება თითოეულ მიმოწერაში"</string>
-    <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"მრავალი მიმღების შემთხვევაში ერთიანი შეტყობინების გასაგზავნად MMS-ის გამოყენება"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"SIM ბარათის შეტყობინებების მართვა"</string>
-    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"მიწოდების შეტყობინებები"</string>
-    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"ჯგუფური შეტყობინება"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"წაკითხვის ანგარიშები"</string>
-    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"მიწოდების შეტყობინებები"</string>
-    <string name="pref_title_auto_delete" msgid="7227835692631701134">"ძველი შეტყობინებების წაშლა"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"ტექსტური შეტყობინების ლიმიტი"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"მულტიმედია შეტყობინებათა ლიმიტი"</string>
-    <string name="pref_title_notification_enabled" msgid="9118792213953729414">"შეტყობინებები"</string>
-    <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"ვიბრაცია"</string>
-    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ხმა"</string>
-    <string name="pref_messages_to_save" msgid="3202539743892934926">"შესანახად დააწესეთ შეტყობინებების რაოდენობა"</string>
-    <string name="silent_ringtone" msgid="7981237991326592780">"ჩუმი"</string>
-    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"ავტომოძიება"</string>
-    <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"შეტყობინებების ავტომატურად მოძიება"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"როუმინგში ავტომოძიება"</string>
-    <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"როუმინგის დროს შეტყობინებების ავტომატურად მოძიება"</string>
-    <string name="confirm_dialog_title" msgid="2187213750475782725">"წაიშალოს?"</string>
-    <string name="confirm_dialog_locked_title" msgid="8179085718150932242">"წაიშალოს ჩაკეტილი შეტყობინება?"</string>
-  <plurals name="confirm_delete_conversation">
-    <item quantity="one" msgid="7509396981963472833">"ერთი მიმოწერა წაიშლება."</item>
-    <item quantity="other" msgid="4076915774012081811">"<xliff:g id="NUMBER">%1$s</xliff:g> მიმოწერა წაიშლება."</item>
-  </plurals>
-    <string name="confirm_delete_conversation" msgid="6115966687389279855">"წაიშლება მთლიანი მიმოწერა."</string>
-    <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"ყველა მიმოწერა წაიშლება."</string>
-    <string name="confirm_delete_message" msgid="9121480656609809591">"ეს შეტყობინება წაიშლება."</string>
-    <string name="confirm_delete_locked_message" msgid="7203411948190100955">"წაიშალოს ეს ჩაკეტილი შეტყობინება?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"SIM ბარათზე არსებული ყველა შეტყობინება წაიშლება."</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"SIM ბარათზე არსებული ეს შეტყობინება წაიშლება."</string>
-    <string name="delete_unlocked" msgid="7545321606698162261">"ჩაკეტილი შეტყობინების წაშლა"</string>
-    <string name="delete" msgid="1409973060081564612">"წაშლა"</string>
-    <string name="select_conversations" msgid="7816517565640002844">"აირჩიეთ მიმოწერები"</string>
-    <string name="no_conversations" msgid="6773767655149258445">"მიმოწერები არ არის."</string>
-    <string name="loading_conversations" msgid="5510430408235967094">"მიმოწერა იტვირთება."</string>
-    <string name="cannot_get_details" msgid="850292987983026806">"დეტალების მიღება ვერ ხერხდება."</string>
-    <string name="message_details_title" msgid="9223295113731634528">"შეტყობინების მონაცემები"</string>
-    <string name="message_type_label" msgid="7975373966795945566">"ტიპი: "</string>
-    <string name="text_message" msgid="8196464345251877972">"ტექსტური შეტყობინება"</string>
-    <string name="multimedia_message" msgid="1512644521083533071">"მულტიმედია შეტყობინება"</string>
-    <string name="multimedia_notification" msgid="4124031788554972308">"მულტიმედია გზავნილის შეტყობინება"</string>
-    <string name="from_label" msgid="2055117571548171397">"გამგზავნი: "</string>
-    <string name="to_address_label" msgid="5837363600471845801">"მიმღები: "</string>
-    <string name="bcc_label" msgid="530867161453958774">"უხილავი ასლი: "</string>
-    <string name="sent_label" msgid="2722190650145251584">"გაიგზავნა: "</string>
-    <string name="received_label" msgid="8618029024731693906">"მიღებულია: "</string>
-    <string name="saved_label" msgid="4183160415593488207">"შენახულია: "</string>
-    <string name="subject_label" msgid="8721241914144101631">"თემა: "</string>
-    <string name="message_size_label" msgid="4698016210013319786">"შეტყობინების ზომა: "</string>
-    <string name="priority_label" msgid="7397600367853359607">"პრიორიტეტი: "</string>
-    <string name="priority_high" msgid="5627897207952009214">"მაღალი"</string>
-    <string name="priority_normal" msgid="5715227727384683550">"ჩვეულებრივი"</string>
-    <string name="priority_low" msgid="8928782666023373987">"დაბალი"</string>
-    <string name="message_class_label" msgid="5115748690481550562">"შეტყობინების კლასი: "</string>
-    <string name="error_code_label" msgid="5810068247647058769">"შეცდომის კოდი: "</string>
-    <string name="menu_edit" msgid="3056513240155967777">"რედაქტირება"</string>
-    <string name="menu_delete_messages" msgid="2610286783513247420">"შეტყობინებების წაშლა"</string>
-    <string name="menu_lock" msgid="7603793126077557472">"ჩაკეტვა"</string>
-    <string name="menu_unlock" msgid="6662865558677424039">"განბლოკვა"</string>
-    <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"ტაბლეტის მეხსიერებაში კოპირება"</string>
-    <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"ტელეფონის მეხსიერებაში კოპირება"</string>
-    <string name="sim_delete" msgid="610790510655316922">"წაშლა"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"SIM ბარათზე არსებული ტექსტური შეტყობინებები"</string>
-    <string name="sim_view" msgid="1997173541766393706">"ნახვა"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"SIM ბარათზე შეტყობინებებია არ არის."</string>
-    <string name="delivery_header_title" msgid="5361719578869045764">"რაპორტი"</string>
-    <string name="status_none" msgid="8253075950774894961">"(არცერთი)"</string>
-    <string name="status_pending" msgid="2739860824607984892">"მომლოდინე"</string>
-    <string name="status_read" msgid="7576195253780627332">"წაკითხული"</string>
-    <string name="status_received" msgid="7264334589461906965">"მიღებულია"</string>
-    <string name="status_failed" msgid="1998776666856593544">"წარუმატებელი"</string>
-    <string name="status_unread" msgid="8555305495998700198">"წაუკითხავი"</string>
-    <string name="status_rejected" msgid="2613641949065942678">"უარყოფილია"</string>
-    <string name="recipient_label" msgid="3922667485312634446">"მიმღები: "</string>
-    <string name="status_label" msgid="7283375460919181660">"სტატუსი: "</string>
-    <string name="delivered_label" msgid="3514011729156932928">"მიწოდებულია: "</string>
-    <string name="attach_image" msgid="6439985727687107742">"სურათები"</string>
-    <string name="attach_take_photo" msgid="4280601313184373837">"ფოტოს გადაღება"</string>
-    <string name="attach_video" msgid="4264272693501538294">"ვიდეოები"</string>
-    <string name="attach_record_video" msgid="3099814114743078615">"ვიდეოს გადაღება"</string>
-    <string name="attach_sound" msgid="3149325985970669609">"აუდიო"</string>
-    <string name="attach_record_sound" msgid="6011431304469858929">"აუდიოს ჩაწერა"</string>
-    <string name="attach_slideshow" msgid="3497422151091037063">"სლაიდშოუ"</string>
-    <string name="select_bottom_text" msgid="4201966447623311931">"ტექსტი ქვემოთ"</string>
-    <string name="select_top_text" msgid="6734183477539197815">"ტექტი ზედაპირზე"</string>
-    <string name="delivery_toast_body" msgid="5960519861835727013">"შეტყობინება მიიღო %s-მა."</string>
-    <string name="notification_multiple" msgid="7684007285202109490">"<xliff:g id="COUNT">%s</xliff:g> წაუკითხავი შეტყიბინება."</string>
-    <string name="notification_multiple_title" msgid="332602028959557541">"ახალი შეტყობინებები"</string>
-    <string name="notification_failed_multiple" msgid="6192531993698497229">"<xliff:g id="COUNT">%s</xliff:g> შეტყობინება ვერ გაიგზავნა"</string>
-    <string name="notification_failed_multiple_title" msgid="1112032024904397126">"შეტყობინება ვერ გაიგზავნა"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"SIM ბარათი გაივსო"</string>
-    <string name="sim_full_body" msgid="6241664980790322925">"წაშალეთ რამდენიმე შეტყობინება, რათა გამოთავისუფლდეს სივრცე სხვა შეტყობინებებისათვის."</string>
-    <string name="sms_full_title" msgid="6041287140125011854">"ტექსტური შეტყობინებების მეხსიერება გაივსო"</string>
-    <string name="sms_full_body" msgid="4885861852397651868">"შემომავალი შეტყობინება უარყოფილ იქნა სავსე მეხსიერების გამო. წაშალეთ რამდენიმე ძველი შეტყობინება."</string>
-    <string name="sms_rejected_title" msgid="8548394922491529811">"ტექსტური შეტყობინება უარყოფილია"</string>
-    <string name="sms_rejected_body" msgid="7813671133968158562">"შემომავალი შეტყობინება უარყოფილია უცნობი შეცდომის გამო."</string>
-    <string name="type_audio" msgid="3842064092332309756">"აუდიო"</string>
-    <string name="type_picture" msgid="4091928975383609443">"სურათი"</string>
-    <string name="type_video" msgid="8521556159545168441">"ვიდეო"</string>
-    <string name="confirm" msgid="3155110885840591914">"დადასტურება"</string>
-    <string name="message_send_read_report" msgid="6997117678914261250">"წაკითხვის დასტური გაიგზავნა."</string>
-    <string name="message_queued" msgid="7975945623873194737">"ამჟამად თქვენი შეტყობინების გაგზავნა ვერ ხერხდება. ის გაიგზავნება, როდესაც სერვისი ხელმისაწვდომი გახდება."</string>
-    <string name="fdn_check_failure" msgid="7880740763778173551">"შეტყობინებების გაგზავნა მხოლოდ დაშვებულ ნომრებთან შეგიძლიათ."</string>
-    <string name="no_subject" msgid="4168963736134552285">"(თემის გარეშე)"</string>
-    <string name="unknown_sender" msgid="4929330613278853635">"უცნობი გამგზავნი"</string>
-    <string name="dl_failure_notification" msgid="8097699679464396537">"<xliff:g id="SUBJECT">%1$s</xliff:g> შეტყობინების ჩამოტვირთვა ვერ მოხერხდა <xliff:g id="FROM">%2$s</xliff:g>-დან."</string>
-    <string name="rate_limit_surpassed" msgid="1347801608211628177">"დადასტურება"</string>
-    <string name="confirm_rate_limit" msgid="234228299751243067">"იგზავნება დიდი რაოდენობის მულტიმედია შეტყობინებები. გაიგზავნოს?"</string>
-    <string name="message_download_failed_title" msgid="5722226064394767921">"შეტყობინება არ ჩამოტვირთულა"</string>
-    <string name="message_send_failed_title" msgid="3469894907399046372">"შეტყობინება არ გაგზავნილა"</string>
-    <string name="message_failed_body" msgid="3421296112073915245">"შეეხეთ შეტყობინების განსახილველად. სცადეთ ისევ."</string>
-    <string name="download_later" msgid="5531365714424360903">"ამჟამად ჩამოტვირთვა ვერ ხერხდება. სცადეთ მოგვიანებით."</string>
-    <string name="no_apn" msgid="505932916503312015">"მოწყობილობაზე APN მითითებული არ არის."</string>
-    <string name="select_audio" msgid="3528161449756771832">"აირჩიეთ აუდიო"</string>
-    <string name="copy_to_sdcard" msgid="757028609638184856">"დანართის შენახვა"</string>
-    <string name="copy_to_sdcard_success" msgid="7948625615155992014">"დანართი შენახულია."</string>
-    <string name="copy_to_sdcard_fail" msgid="4944606369631916737">"დანართის შენახვა ვერ მოხერხდა."</string>
-    <string name="save_ringtone" msgid="2310157075045201051">"ზარის მელოდიად შენახვა"</string>
-    <string name="saved_ringtone" msgid="3847363932276708626">"ზარის მელოდია შენახულია."</string>
-    <string name="saved_ringtone_fail" msgid="4778500070919251116">"ზარის მელოდიის შენახვა ვერ მოხერხდა."</string>
-    <string name="menu_insert_smiley" msgid="4964504393061025071">"სიცილაკის ჩასმა"</string>
-    <string name="menu_group_participants" msgid="4288356090262299071">"ჯგუფური მონაწილეები"</string>
-    <string name="select_link_title" msgid="3371818607625768447">"აირჩიეთ მოქმედება"</string>
-    <string name="slide_number" msgid="1923958526266726635">"სლაიდი <xliff:g id="NUMBER">%s</xliff:g>"</string>
-  <plurals name="slide_duration">
-    <item quantity="one" msgid="1654101988340583935">"<xliff:g id="NUMBER">%s</xliff:g> წამი"</item>
-    <item quantity="few" msgid="7887190171856293871">"<xliff:g id="NUMBER">%s</xliff:g> წამი"</item>
-    <item quantity="other" msgid="3736425355579939863">"<xliff:g id="NUMBER">%s</xliff:g> წამი"</item>
-  </plurals>
-    <string name="delivery_report_activity" msgid="2957463094232916364">"მიწოდების რაპორტი"</string>
-    <string name="storage_limits_activity" msgid="8810530813311077716">"მეხსიერების ლიმიტები"</string>
-    <string name="change_duration_activity" msgid="7048606979485031693">"ხანგრძლივობის შეცვლა"</string>
-    <string name="edit_slideshow_activity" msgid="8751493388760050529">"სლაიდშოუს რედაქტირება"</string>
-    <string name="recipient_list_activity" msgid="1254938236543727019">"ჯგუფური მონაწილეები"</string>
-    <string name="edit_slide_activity" msgid="8752829671778696983">"სლაიდის რედაქტირება"</string>
-    <string name="slideshow_activity" msgid="5658249461317434432">"სლაიდშოუ"</string>
-    <string name="class_0_message_activity" msgid="6631339964159861048">"Class 0 შეტყობინება"</string>
-    <string name="search_label" msgid="6042598929386174964">"შეტყობინებები"</string>
-    <string name="search_hint" msgid="7273727663577472044">"შეტყობინებების ძიება"</string>
-    <string name="search" msgid="7560238620274735199">"შეტყობინებები"</string>
-    <string name="search_setting_description" msgid="4104004595086437572">"ტექსტი თქვენს შეტყობინებებში"</string>
-    <string name="search_empty" msgid="2109551478056039278">"თანხვედრა არ არის."</string>
-  <plurals name="search_results_title">
-    <item quantity="one" msgid="4657073733087431350">"<xliff:g id="NUMBER">%1$s</xliff:g> შედეგი „<xliff:g id="SEARCH">%2$s</xliff:g>“-ზე"</item>
-    <item quantity="other" msgid="6196382287749539209">"<xliff:g id="NUMBER">%1$s</xliff:g> შედეგი „<xliff:g id="SEARCH">%2$s</xliff:g>“-ზე"</item>
-  </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> შედეგი „<xliff:g id="SEARCH">%2$s</xliff:g>“-ზე"</string>
-    <string name="confirm_clear_search_title" msgid="8510295993632032904">"გასუფთავება"</string>
-    <string name="confirm_clear_search_text" msgid="8731877031837077478">"ძიების ისტორია გასუფთავდება."</string>
-    <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"ძიების ისტორიის გასუფთავება"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"შეტყობინებების წინა ძიებების გასუფთავება, რათა ძიების ველში აღარ გამოჩნდეს"</string>
-    <string name="save" msgid="6847069284991531310">"შენახვა"</string>
-    <string name="storage_limits_title" msgid="7074684882530693016">"შეტყობინებების შეზღუდვა"</string>
-    <string name="storage_limits_message" msgid="2010501485394745696">"შეიზღუდოს შეტყობინებათა რაოდენობა თითოეულ მიმოწერაში შესანახად?"</string>
-    <string name="storage_limits_setting" msgid="4952781049308537373">"შეზღუდვების დაწესება"</string>
-    <string name="storage_limits_setting_dismiss" msgid="1433841310158458034">"შეზღუდვის გარეშე"</string>
-    <string name="too_many_unsent_mms" msgid="4436493698891224126">"შეტყობინების ვერ გაიგზავნა. დაგროვილია ძალიან ბევრი გაუგზავნელი მულტიმედია შეტყობინება."</string>
-    <string name="sending_message" msgid="2054406576361149715">"იგზავნება..."</string>
-    <string name="pick_too_many_recipients" msgid="650087588867628044">"ძალიან ბევრი მიმღებია"</string>
-    <string name="adding_recipients" msgid="2962810172527532357">"ადრესატების დამატება…"</string>
-    <string name="draft_separator" msgid="5402575086540243019">", "</string>
-    <string name="message_count_format" msgid="4434763220590778012">" <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="message_count_notification" msgid="3629968600032690007">"<xliff:g id="NUMBER">%1$s</xliff:g> ახალი შეტყობინება"</string>
-  <plurals name="message_count_notification_overflow">
-    <item quantity="one" msgid="3340591167508150806">"+<xliff:g id="NUMBER">%1$s</xliff:g> სხვა შეტყობინება"</item>
-    <item quantity="other" msgid="1393002799298501480">"+<xliff:g id="NUMBER">%1$s</xliff:g> სხვა შეტყობინება"</item>
-  </plurals>
-    <string name="error_state" msgid="5177386717626893507">"შეუთავსებელი მდგომარეობა"</string>
-    <string name="error_state_text" msgid="7918866106335387710">"მიმოწერის და მიმღებების მდგომარეობა შეუთავსებელია. გთხოვთ, აღბეჭდოთ ხარვეზის შეტყობინება და გააგზავნოთ შემდეგ მისამართზე: http://go/droidanizer"</string>
-  <plurals name="recipient_count">
-    <item quantity="other" msgid="7338580381574463136">"<xliff:g id="NUMBER">%1$s</xliff:g> ადამიანი"</item>
-  </plurals>
-    <string name="disable_notifications_dialog_message" msgid="7644011234972074096">"გსურთ, შეწყდეს გამეორებული შეტყობინებების მიწოდების ანგარიშების მიღება ნაგულისხმევი შეტყობინებების აპიდან?"</string>
-    <string name="view_more_conversations" msgid="7275920132410734671">"მეტი მიმოწერის ნახვა"</string>
-    <string name="attachment_audio" msgid="2867960243300539143">"აუდიო"</string>
-    <string name="attachment_slideshow" msgid="5867689101881763318">"სლაიდშოუ"</string>
-    <string name="attachment_video" msgid="4252062022156694591">"ვიდეო"</string>
-    <string name="attachment_picture" msgid="3709286281567284296">"სურათი"</string>
-    <string name="notification_separator" msgid="2334673105226536422">"  "</string>
-    <string name="enumeration_comma" msgid="213598026698964628">", "</string>
-    <string name="message_timestamp_format" msgid="4188999027493614617">"<xliff:g id="STRING_0">%1$s</xliff:g> - <xliff:g id="STRING_1">%2$s</xliff:g>"</string>
-    <string name="storage_warning_title" msgid="7124740686325942375">"თქვენი ტელეფონის მეხსიერება გაივსო"</string>
-    <string name="storage_warning_content" msgid="1100367816649962354">"SMS/MMS შეტყობინებებს არ მიიღებთ"</string>
-    <string name="label_mms_send_outbox_msg" msgid="3395185162973061099">"MMS გაღვიძება"</string>
-    <string name="desc_mms_send_outbox_msg" msgid="1837156781311437148">"აგზავნის ყველა MMS-ს გამავალი ყუთიდან ქსელში"</string>
-</resources>
diff --git a/res/values-kk-rKZ/arrays.xml b/res/values-kk-rKZ/arrays.xml
index bc006372..09bd8be7 100644
--- a/res/values-kk-rKZ/arrays.xml
+++ b/res/values-kk-rKZ/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"тақырыбы жоқ"</item>
-    <item msgid="2214945158821871846">"тақырыпсыз"</item>
   </string-array>
 </resources>
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml
index 65cc803b..27af5544 100644
--- a/res/values-kk-rKZ/strings.xml
+++ b/res/values-kk-rKZ/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Дыбыс"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Сақталатын хабарлар санын анықтау"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Үнсіз"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Хабар жіберілген сайын қай SIM картасын пайдалану керектігін сұрау"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Бірнеше SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Авто шығарып алу"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Хабарларды автоматты түрде шығарып алу"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Роуминг кезінде авто шығарып алу"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Хабар алмастыру сіздің SMS қолданбаңыз емес"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> - сіздің SMS қолданбаңыз"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Бұны параметрлер арқылы өзгертуге болады"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"SIM картасын таңдау"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM <xliff:g id="SUBID">%1$d</xliff:g> ұяшығы"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Бас тарту"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Қазіргі уақытта таңдалған SIM жоқ. Жүйе параметрлерінде әдепкі SIM картасын таңдаңыз."</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 887cdeec..19860ffb 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"សំឡេង"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"កំណត់ចំនួនសារដែលត្រូវរក្សាទុក"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"ស្ងាត់"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"សួរអ្នកប្រើស៊ីមណាមួយដែលប្រើរៀងរាល់ពេលផ្ញើសារ"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"ស៊ីមច្រើន"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"យកស្វ័យប្រវត្តិ"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"យកសារដោយស្វ័យប្រវត្តិ"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"រ៉ូមីង យកដោយស្វ័យប្រវត្តិ"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"ការផ្ញើសារមិនមែនជាកម្មវិធីសារ SMS របស់អ្នកទេ"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> ជាកម្មវិធីសារ SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"អ្នកអាចប្ដូរវាក្នុងការកំណត់"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"ជ្រើសស៊ីមកាត"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"ស៊ីម <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"រន្ធស៊ីម <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"បោះបង់"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"បច្ចុប្បន្នស៊ីមកាតដែលបានជ្រើសមិនបង្ហាញ។ ជ្រើសស៊ីមកាតលំនាំដើមរបស់អ្នកនៅក្នុងការកំណត់ប្រព័ន្ធ។"</string>
 </resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
deleted file mode 100644
index f857a03f..00000000
--- a/res/values-km/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1503967887341230795">"ផ្ញើសារ"</string>
-    <string name="new_message" msgid="1530369762346003973">"សារថ្មី"</string>
-    <string name="menu_call_back" msgid="7538482331117914146">"ហៅ <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_send_email" msgid="671366308915241664">"ផ្ញើអ៊ីម៉ែលទៅ <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_compose_new" msgid="3763437973691046238">"តែង"</string>
-    <string name="menu_preferences" msgid="4693148116114749414">"ការកំណត់"</string>
-    <string name="menu_add_address_to_contacts" msgid="4491980950419914944">"បន្ថែម <xliff:g id="CONTACTEMAILORNUMBER">%s</xliff:g> ទៅមនុស្ស"</string>
-    <string name="menu_call" msgid="5877123227307074690">"ហៅ"</string>
-    <string name="menu_search" msgid="2289469305728821360">"ស្វែងរក"</string>
-    <string name="menu_delete_all" msgid="808729454898114735">"លុបសែស្រឡាយទាំងអស់"</string>
-    <string name="menu_delete" msgid="1851666911396479006">"លុបសែស្រឡាយ"</string>
-    <string name="menu_view" msgid="7448852683948080108">"មើលសែស្រឡាយ"</string>
-    <string name="menu_debug_dump" msgid="6855869130206549643">"DEBUG DUMP"</string>
-    <string name="refreshing" msgid="987335057871404222">"ធ្វើឲ្យស្រស់ ..."</string>
-    <string name="menu_cell_broadcasts" msgid="5646161375983084660">"ការផ្សព្វផ្សាយចល័ត"</string>
-    <string name="has_draft" msgid="2487465595514636160">"សេចក្ដីព្រាង"</string>
-    <string name="no_subject_view" msgid="7795086723069563537">"(គ្មានប្រធានបទ)"</string>
-    <string name="messagelist_sender_self" msgid="3579016854116401602">"ខ្ញុំ"</string>
-    <string name="view_slideshow" msgid="4990460971211388453">"មើលការបញ្ចាំងស្លាយ"</string>
-    <string name="view_message_details" msgid="7613457646645796831">"មើលសេចក្ដីលម្អិត"</string>
-    <string name="view_delivery_report" msgid="8219095994071575215">"មើលរបាយការណ៍"</string>
-    <string name="delete_message" msgid="6442394955910357234">"លុប"</string>
-    <string name="expire_on" msgid="4436268382742593921">"ផុតកំណត់៖ <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="kilobyte" msgid="534782148965716631">"គីឡូបៃ"</string>
-    <string name="undelivered_msg_dialog_title" msgid="7479433403599785755">"សារដែលមិនបានបញ្ជូន"</string>
-    <string name="undelivered_msg_dialog_body" msgid="4789268239627694551">"មិនអាចផ្ញើសារនេះបានទេ។ \n ប៉ុនប៉ងបង្កើត៖ <xliff:g id="MESSAGE">%s</xliff:g> ។"</string>
-    <string name="undelivered_sms_dialog_body" msgid="4203703285563450868">"មិនអាចផ្ញើសារនេះបានទេ។"</string>
-    <string name="delete_thread" msgid="757258847736632791">"លុបសែស្រឡាយ"</string>
-    <string name="menu_forward" msgid="9026858380050046756">"បញ្ជូនបន្ត"</string>
-    <string name="download" msgid="4488877642230207631">"ទាញយក"</string>
-    <string name="downloading" msgid="1779557575565350637">"ទាញយក"</string>
-    <string name="inline_subject" msgid="4057621785274119260">"&lt;ប្រធានបទ៖ <xliff:g id="SUBJECT">%s</xliff:g>&gt;"</string>
-    <string name="drm_protected_text" msgid="1396394157870730742">"* អត្ថបទដែលបានការពារ DRM *"</string>
-    <string name="insufficient_drm_rights" msgid="6989074725969164383">"សិទ្ធិមិនគ្រប់គ្រាន់ DRM ។"</string>
-    <string name="copy_message_text" msgid="4296252229544252834">"ចម្លងអត្ថបទ"</string>
-    <string name="message_options" msgid="6838806653341967550">"ជម្រើសសារ"</string>
-    <string name="slideshow_options" msgid="3501759384739796431">"ជម្រើសការបញ្ចាំងស្លាយ"</string>
-    <string name="done" msgid="7479926268660505871">"រួចរាល់"</string>
-    <string name="move_up" msgid="7307578107431739359">"ផ្លាស់ទីឡើងលើ"</string>
-    <string name="move_down" msgid="6356509518429479053">"ផ្លាស់ទីចុះក្រោម"</string>
-    <string name="remove_slide" msgid="2225604354024914900">"លុបស្លាយចេញ"</string>
-    <string name="add_slide" msgid="9140721399423564187">"បន្ថែមស្លាយ"</string>
-    <string name="add_slide_hint" msgid="7351356961076244584">"ប៉ះដើម្បីបង្កើតស្លាយថ្មី។"</string>
-    <string name="discard_slideshow" msgid="5054239124146413609">"បោះបង់ការបញ្ចាំងស្លាយ"</string>
-    <string name="slide_show_part" msgid="5077675385448696846">"ផ្នែក <xliff:g id="PART">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="remove_text" msgid="2164068850029476539">"លុបអត្ថបទចេញ"</string>
-    <string name="add_picture" msgid="7819574884962571479">"បន្ថែមរូបភាព"</string>
-    <string name="remove_picture" msgid="6378701749074289096">"លុបរូបភាពចេញ"</string>
-    <string name="add_music" msgid="3827442822987116233">"បន្ថែមតន្ត្រី"</string>
-    <string name="remove_music" msgid="858889733416015223">"លុបតន្ត្រីចេញ"</string>
-    <string name="add_video" msgid="7816866867806595144">"បញ្ចូលវីដេអូ"</string>
-    <string name="remove_video" msgid="5258603891528497799">"លុបវីដេអូចេញ"</string>
-    <string name="to_hint" msgid="224029549150332986">"ជូនចំពោះ"</string>
-    <string name="subject_hint" msgid="4296714962311604126">"ប្រធានបទ"</string>
-    <string name="add_attachment" msgid="7103751293360532684">"ភ្ជាប់ជាមួយ"</string>
-    <string name="add_subject" msgid="7616134948428265870">"បន្ថែមប្រធានបទ"</string>
-    <string name="discard" msgid="1624800293064498479">"បោះបង់"</string>
-    <string name="view" msgid="7929667761715467136">"មើល"</string>
-    <string name="replace" msgid="7587904998114459388">"ជំនួស"</string>
-    <string name="remove" msgid="4625444913256213175">"លុបចេញ"</string>
-    <string name="send" msgid="4589898724889248486">"ផ្ញើ"</string>
-    <string name="mms" msgid="1587631213714914559">"MMS"</string>
-    <string name="send_mms" msgid="2933162044872550662">"ផ្ញើ MMS"</string>
-    <string name="all_threads" msgid="2663426830306307194">"សែស្រឡាយទាំងអស់"</string>
-    <string name="type_to_compose_text_enter_to_send" msgid="3539985471008581265">"វាយសារ"</string>
-    <string name="open_keyboard_to_compose_message" msgid="7860109685511253191">"បើកក្ដារចុចដើម្បីវាយសារ"</string>
-    <string name="compressing" msgid="1961357529661045180">"រូបភាពមានទំហំធំពេក។ បង្ហាប់ ..."</string>
-    <string name="unsupported_media_format" msgid="1350489690977363764">"ទ្រង់ទ្រាយ <xliff:g id="NAME">%1$s</xliff:g> ដែលមិនបានគាំទ្រ។"</string>
-    <string name="select_different_media" msgid="6241623357299382183">"ជ្រើស <xliff:g id="NAME">%1$s</xliff:g> ផ្សេងគ្នា។"</string>
-    <string name="exceed_message_size_limitation" msgid="6027753647094742437">"ដល់ដែនកំណត់ទំហំសារ។"</string>
-    <string name="message_too_big_for_video" msgid="2639367545165352543">"សារភ្ជាប់វីដេអូធំពេក។"</string>
-    <string name="failed_to_add_media" msgid="7207464170168708485">"អ្នកមិនអាចបន្ថែម <xliff:g id="NAME">%1$s</xliff:g> នេះទៅកាន់សាររបស់អ្នកបានទេ។"</string>
-    <string name="failed_to_resize_image" msgid="5608354151631833669">"មិនបានប្ដូរទំហំរូបភាពឡើយ។"</string>
-    <string name="resize_image_error_information" msgid="3783200130776554475">"រូបភាពនេះធំពេកដើម្បីផ្ញើ នៅពេលដែលបានប្ដូរទំហំ។"</string>
-    <string name="forward_prefix" msgid="276280492803486464">"បញ្ជូនទៅ៖ "</string>
-    <string name="discard_message_reason" msgid="2667664943003796133">"នឹងបោះបង់សាររបស់អ្នកពីព្រោះគ្មានអ្នកទទួលត្រឹមត្រូវ។"</string>
-    <string name="has_invalid_recipient" msgid="1485388396900997383">"អ្នកទទួលមិនត្រឹមត្រូវ៖ &lt;<xliff:g id="NAME">%1$s</xliff:g>&gt;"</string>
-    <string name="invalid_destination" msgid="4573835601024786416">"អាសយដ្ឋានគោលដៅមិនត្រឹមត្រូវឡើយ។"</string>
-    <string name="service_not_activated" msgid="9178218144019626176">"សេវាមិនត្រូវបានធ្វើឲ្យសកម្មនៅលើបបណ្ដាញឡើយ។"</string>
-    <string name="service_message_not_found" msgid="1908877102600048515">"សារបានផុតកំណត់ ឬមិនអាចប្រើបាន។"</string>
-    <string name="service_network_problem" msgid="4583269174855943025">"មិនអាចផ្ញើដោយសារតែបញ្ហាបណ្ដាញ។"</string>
-    <string name="invalid_recipient_message" msgid="6465343105010999068">"កែអ្នកទទួល ឬអ្នកទទួលមិនបានទទួលសារ។"</string>
-    <string name="cannot_send_message" msgid="3414307479833622644">"មិនអាចផ្ញើសារ"</string>
-    <string name="cannot_send_message_reason" msgid="8745080126044054343">"សាររបស់អ្នកមិនមានអ្នកទទួលត្រឹមត្រូវទេ។"</string>
-    <string name="cannot_forward_drm_obj" msgid="5047623751430559077">"មិនអាចបញ្ជូនបន្តសារដែលមានធាតុ DRM បានទេ។"</string>
-    <string name="converting_to_picture_message" msgid="2980023239017588627">"បម្លែងសារពហុមេឌៀ…"</string>
-    <string name="cannot_add_slide_anymore" msgid="4631404749618820994">"មិនអាចបន្ថែមស្លាយបានទេ។"</string>
-    <string name="cannot_add_picture_and_video" msgid="4954353772391381447">"មិនអាចបន្ថែមវីដេអូ និងរូបភាពទៅស្លាយមួយបានទេ។"</string>
-    <string name="cannot_save_message" msgid="3375907366965264446">"មិនអាចរក្សាទុកសារ។"</string>
-    <string name="message_saved_as_draft" msgid="2503018972659880692">"សារបានរក្សាទុកជាសេចក្ដីព្រាង។"</string>
-    <string name="too_many_recipients" msgid="7003415094007176931">"មានអ្នកទទួលសារច្រើនពេក ( <xliff:g id="CURRENTCOUNT">%1$s</xliff:g> ) ។ មានដែនកំណត់អ្នកទទួល <xliff:g id="MAXLIMIT">%2$s</xliff:g> ។"</string>
-    <string name="too_many_attachments" msgid="3774037894899750070">"មានដែនកំណត់ឯកសារភ្ជាប់ <xliff:g id="MAXLIMIT">%1$s</xliff:g> ។ នឹងលុបតែ <xliff:g id="CURRENTCOUNT">%2$s</xliff:g> ដំបូងប៉ុណ្ណោះ។"</string>
-    <string name="adding_attachments_title" msgid="2034535554212405529">"បន្ថែមឯកសារភ្ជាប់"</string>
-    <string name="adding_attachments" msgid="5871373105122355632">"រង់ចាំខណៈពេលដែលធាតុត្រូវបានបន្ថែមទៅកាន់ការបង្ហាញស្លាយ។"</string>
-    <string name="building_slideshow_title" msgid="1232338692400726385">"ការបង្ហាញស្លាយអាគារ"</string>
-    <string name="cannot_play_audio" msgid="253920977253666735">"មិនអាចចាក់សំឡេងបានទេ។"</string>
-    <string name="preview" msgid="5438149136136446756">"មើលជាមុន"</string>
-    <string name="preview_slideshow" msgid="6824095909448728427">"មើលជាមុន"</string>
-    <string name="replace_image" msgid="3171240952601443619">"ជំនួសរូបភាព"</string>
-    <string name="duration_sec" msgid="6617032324007824096">"រយៈពេល (<xliff:g id="DURATION">%s</xliff:g> វិនាទី)"</string>
-    <string name="duration_selector_title" msgid="5981097971537625852">"រយៈពេលសម្រាប់ការបញ្ចាំងស្លាយ "</string>
-    <string name="layout_selector_title" msgid="7344600117972450771">"ប្លង់ការបញ្ចាំងស្លាយ "</string>
-    <string name="layout_top" msgid="6811021650398972346">"ប្លង់ (ខាងលើ)"</string>
-    <string name="layout_bottom" msgid="5822765871095491843">"ប្លង់ (ខាងក្រោម)"</string>
-    <string name="type_to_compose_text_or_leave_blank" msgid="7769792471457574059">"វាយសារ ឬទុកឲ្យនៅទទេ"</string>
-    <string name="duration_not_a_number" msgid="2856636898040421237">"រយៈពេលត្រូវតែជាលេខ។"</string>
-    <string name="duration_zero" msgid="3549377790195185977">"រយៈពេលត្រូវតែធំជាងសូន្យវិនាទី។"</string>
-    <string name="secs" msgid="6886003523109967972">"វិនាទី"</string>
-  <string-array name="select_dialog_items">
-    <item msgid="4840183714016984112">"១ វិនាទី"</item>
-    <item msgid="3734955613666864447">"២ វិនាទី"</item>
-    <item msgid="6032232473048379828">"៣ វិនាទី"</item>
-    <item msgid="5978471781525927827">"៤ វិនាទី"</item>
-    <item msgid="4888440297621208402">"៥ វិនាទី"</item>
-    <item msgid="6047246213264166841">"៦ វិនាទី"</item>
-    <item msgid="2327501250056533797">"៧ វិនាទី"</item>
-    <item msgid="3400770414689795703">"៨ វិនាទី"</item>
-    <item msgid="4358760614161107970">"៩ វិនាទី"</item>
-    <item msgid="2618179407176906471">"១០ វិនាទី"</item>
-    <item msgid="7786079681602275449">"ផ្សេងៗ"</item>
-  </string-array>
-    <string name="menu_view_contact" msgid="1414670584423909451">"មើលទំនាក់ទំនង"</string>
-    <string name="menu_add_to_contacts" msgid="1258127580972228970">"បញ្ចូលទៅមនុស្ស"</string>
-    <string name="hidden_sender_address" msgid="2776075636669924968">"បានលាក់អាសយដ្ឋានអ្នកផ្ញើ"</string>
-    <string name="yes" msgid="3246158147503160811">"យល់ព្រម"</string>
-    <string name="no" msgid="4289742508556913860">"បោះបង់"</string>
-    <string name="set" msgid="4642365398263275979">"កំណត់"</string>
-    <string name="play" msgid="1888432400937785115">"បើក"</string>
-    <string name="edit" msgid="5912118407791492696">"កែ"</string>
-    <string name="try_to_send" msgid="1996751738286080976">"ព្យាយាមផ្ញើម្ដងទៀត"</string>
-    <string name="preferences_title" msgid="6650089610332670157">"ការកំណត់"</string>
-    <string name="restore_default" msgid="7165341506551155053">"ស្តារការកំណត់លំនាំដើម"</string>
-    <string name="pref_notification_settings_title" msgid="6420782563630369776">"ការជូនដំណឹង"</string>
-    <string name="pref_mms_settings_title" msgid="55618772118264355">"សារពហុមេឌៀ (MMS)"</string>
-    <string name="pref_sms_settings_title" msgid="5173078369851066881">"សារអត្ថបទ (SMS)"</string>
-    <string name="pref_sms_storage_title" msgid="9001233319190616445">"ឧបករណ៍ផ្ទុក"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"គ្រប់គ្រងសារដែលត្រូវបានរក្សាទុកនៅលើស៊ីមកាតរបស់អ្នក"</string>
-    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"ស្នើរបាយការណ៍បញ្ជូនសម្រាប់សារនីមួយៗដែលអ្នកផ្ញើ"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"ស្នើរបាយការណ៍អានសម្រាប់សារនីមួយៗដែលអ្នកផ្ញើ"</string>
-    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"ស្នើរបាយការណ៍បញ្ជូនសម្រាប់សារនីមួយៗដែលអ្នកផ្ញើ"</string>
-    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"លុបសារចាស់ៗព្រោះដល់ដែនកំណត់"</string>
-    <string name="pref_summary_delete_limit" msgid="597128041393045216">"សារ <xliff:g id="COUNT">%1$s</xliff:g> ក្នុងមួយសន្ទនា"</string>
-    <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"ប្រើ MMS ដើម្បីផ្ញើសារ នៅពេលមានអ្នកទទួលច្រើន"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"គ្រប់គ្រងសារស៊ីមកាត"</string>
-    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"របាយការបញ្ជូន"</string>
-    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"ការផ្ញើសារជាក្រុម"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"របាយការណ៍អាន"</string>
-    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"របាយការណ៍បញ្ជូន"</string>
-    <string name="pref_title_auto_delete" msgid="7227835692631701134">"លុបសារចាស់ៗ"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"ដែនកំណត់សារអត្ថបទ"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"ដែនកំណត់សារពហុមេឌៀ"</string>
-    <string name="pref_title_notification_enabled" msgid="9118792213953729414">"ការជូនដំណឹង"</string>
-    <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"ញ័រ"</string>
-    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"សំឡេង"</string>
-    <string name="pref_messages_to_save" msgid="3202539743892934926">"កំណត់ចំនួនសារដែលត្រូវរក្សាទុក"</string>
-    <string name="silent_ringtone" msgid="7981237991326592780">"ស្ងាត់"</string>
-    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"យកស្វ័យប្រវត្តិ"</string>
-    <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"យកសារដោយស្វ័យប្រវត្តិ"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"រ៉ូមីង យកដោយស្វ័យប្រវត្តិ"</string>
-    <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"យកសារដោយស្វ័យប្រវត្តិ ខណៈពេលរ៉ូមីង"</string>
-    <string name="confirm_dialog_title" msgid="2187213750475782725">"លុប?"</string>
-    <string name="confirm_dialog_locked_title" msgid="8179085718150932242">"លុបសារដែលបានចាក់សោ?"</string>
-  <plurals name="confirm_delete_conversation">
-    <item quantity="one" msgid="7509396981963472833">"នឹងលុបការសន្ទនាមួយ។"</item>
-    <item quantity="other" msgid="4076915774012081811">"នឹងលុបការសន្ទនា <xliff:g id="NUMBER">%1$s</xliff:g> ។"</item>
-  </plurals>
-    <string name="confirm_delete_conversation" msgid="6115966687389279855">"នឹងលុបសែស្រឡាយទាំងអស់។"</string>
-    <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"នឹងលុបសែស្រឡាយទាំងអស់។"</string>
-    <string name="confirm_delete_message" msgid="9121480656609809591">"នឹងលុបសារ។"</string>
-    <string name="confirm_delete_locked_message" msgid="7203411948190100955">"លុបសារដែលបានចាក់សោនេះឬ?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"នឹងលុបសារទាំងអស់នៅលើស៊ីមកាត។"</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"នឹងលុបសារនៅលើស៊ីមកាតនេះ ។"</string>
-    <string name="delete_unlocked" msgid="7545321606698162261">"លុបសារដែលបានចាក់សោ"</string>
-    <string name="delete" msgid="1409973060081564612">"លុប"</string>
-    <string name="select_conversations" msgid="7816517565640002844">"ជ្រើសការសន្ទនា"</string>
-    <string name="no_conversations" msgid="6773767655149258445">"គ្មានការសន្ទនា។"</string>
-    <string name="loading_conversations" msgid="5510430408235967094">"ផ្ទុកការសន្ទនា។"</string>
-    <string name="cannot_get_details" msgid="850292987983026806">"មិនអាចទទួលបានសេចក្ដីលម្អិត។"</string>
-    <string name="message_details_title" msgid="9223295113731634528">"សេចក្ដីលម្អិតអំពីសារ"</string>
-    <string name="message_type_label" msgid="7975373966795945566">"ប្រភេទ "</string>
-    <string name="text_message" msgid="8196464345251877972">"សារអត្ថបទ"</string>
-    <string name="multimedia_message" msgid="1512644521083533071">"សារពហុមេឌៀ"</string>
-    <string name="multimedia_notification" msgid="4124031788554972308">"ការជូនដំណឹងសារពហុមេឌៀ"</string>
-    <string name="from_label" msgid="2055117571548171397">"ពី៖ "</string>
-    <string name="to_address_label" msgid="5837363600471845801">"ជូនចំពោះ៖ "</string>
-    <string name="bcc_label" msgid="530867161453958774">"ចម្លងជាសម្ងាត់ជូន៖ "</string>
-    <string name="sent_label" msgid="2722190650145251584">"បានផ្ញើ៖ "</string>
-    <string name="received_label" msgid="8618029024731693906">"បានទទួល៖ "</string>
-    <string name="saved_label" msgid="4183160415593488207">"បានរក្សាទុក៖ "</string>
-    <string name="subject_label" msgid="8721241914144101631">"ប្រធានបទ៖ "</string>
-    <string name="message_size_label" msgid="4698016210013319786">"ទំហំសារ៖ "</string>
-    <string name="priority_label" msgid="7397600367853359607">"អាទិភាព "</string>
-    <string name="priority_high" msgid="5627897207952009214">"ខ្ពស់"</string>
-    <string name="priority_normal" msgid="5715227727384683550">"ធម្មតា"</string>
-    <string name="priority_low" msgid="8928782666023373987">"ទាប"</string>
-    <string name="message_class_label" msgid="5115748690481550562">"ថ្នាក់សារ៖ "</string>
-    <string name="error_code_label" msgid="5810068247647058769">"លេខកូដកំហុស "</string>
-    <string name="menu_edit" msgid="3056513240155967777">"កែ"</string>
-    <string name="menu_delete_messages" msgid="2610286783513247420">"លុបសារ"</string>
-    <string name="menu_lock" msgid="7603793126077557472">"ចាក់សោ"</string>
-    <string name="menu_unlock" msgid="6662865558677424039">"ដោះសោ"</string>
-    <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"ចម្លងទៅកុំព្យូទ័របន្ទះ"</string>
-    <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"ចម្លងទៅអង្គចងចាំទូរស័ព្ទ"</string>
-    <string name="sim_delete" msgid="610790510655316922">"លុប"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"សារអត្ថបទនៅលើស៊ីមកាត"</string>
-    <string name="sim_view" msgid="1997173541766393706">"មើល"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"គ្មានសារនៅលើស៊ីមកាត។"</string>
-    <string name="delivery_header_title" msgid="5361719578869045764">"របាយការណ៍"</string>
-    <string name="status_none" msgid="8253075950774894961">"(គ្មាន)"</string>
-    <string name="status_pending" msgid="2739860824607984892">"មិនទាន់សម្រេច"</string>
-    <string name="status_read" msgid="7576195253780627332">"អាន"</string>
-    <string name="status_received" msgid="7264334589461906965">"បានទទួល"</string>
-    <string name="status_failed" msgid="1998776666856593544">"មិនជោគជ័យ"</string>
-    <string name="status_unread" msgid="8555305495998700198">"មិនទាន់អាន"</string>
-    <string name="status_rejected" msgid="2613641949065942678">"បានច្រានចោល"</string>
-    <string name="recipient_label" msgid="3922667485312634446">"អ្នកទទួល៖ "</string>
-    <string name="status_label" msgid="7283375460919181660">"ស្ថានភាព៖ "</string>
-    <string name="delivered_label" msgid="3514011729156932928">"បានបញ្ជូន៖ "</string>
-    <string name="attach_image" msgid="6439985727687107742">"រូបភាព"</string>
-    <string name="attach_take_photo" msgid="4280601313184373837">"ថតរូប"</string>
-    <string name="attach_video" msgid="4264272693501538294">"វីដេអូ"</string>
-    <string name="attach_record_video" msgid="3099814114743078615">"ថតវីដេអូ"</string>
-    <string name="attach_sound" msgid="3149325985970669609">"សំឡេង"</string>
-    <string name="attach_record_sound" msgid="6011431304469858929">"ថតសំឡេង"</string>
-    <string name="attach_slideshow" msgid="3497422151091037063">"បញ្ចាំងស្លាយ"</string>
-    <string name="select_bottom_text" msgid="4201966447623311931">"អត្ថបទនៅខាងក្រោម"</string>
-    <string name="select_top_text" msgid="6734183477539197815">"អត្ថបទនៅខាងលើ"</string>
-    <string name="delivery_toast_body" msgid="5960519861835727013">"សារដែលបានទទួលដោយ %s ។"</string>
-    <string name="notification_multiple" msgid="7684007285202109490">"<xliff:g id="COUNT">%s</xliff:g> សារដែលមិនទាន់អាន។"</string>
-    <string name="notification_multiple_title" msgid="332602028959557541">"សារថ្មី"</string>
-    <string name="notification_failed_multiple" msgid="6192531993698497229">"មិនអាចផ្ញើសារ <xliff:g id="COUNT">%s</xliff:g>"</string>
-    <string name="notification_failed_multiple_title" msgid="1112032024904397126">"មិនអាចផ្ញើសារ"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"ស៊ីមកាតពេញ"</string>
-    <string name="sim_full_body" msgid="6241664980790322925">"លុបសារមួយចំនួនដើម្បីធ្វើឲ្យមានបន្ទប់ច្រើន។"</string>
-    <string name="sms_full_title" msgid="6041287140125011854">"អង្គចងចាំសារអត្ថបទពេញ"</string>
-    <string name="sms_full_body" msgid="4885861852397651868">"បានច្រានចោលសារចូល ដោយសារតែអង្គចងចាំពេញ។ លុបសារចាស់ៗមួយចំនួន។"</string>
-    <string name="sms_rejected_title" msgid="8548394922491529811">"បានច្រានចោលសារអត្ថបទ"</string>
-    <string name="sms_rejected_body" msgid="7813671133968158562">"បានច្រានចោលសារចូល ដោយសារតែមិនស្គាល់ហេតុផល។"</string>
-    <string name="type_audio" msgid="3842064092332309756">"សំឡេង"</string>
-    <string name="type_picture" msgid="4091928975383609443">"រូបភាព"</string>
-    <string name="type_video" msgid="8521556159545168441">"វីដេអូ"</string>
-    <string name="confirm" msgid="3155110885840591914">"បញ្ជាក់"</string>
-    <string name="message_send_read_report" msgid="6997117678914261250">"នឹងផ្ញើរបាយការណ៍អាន។"</string>
-    <string name="message_queued" msgid="7975945623873194737">"បច្ចុប្បន្នមិនអាចផ្ញើរសាររបស់អ្នកបានទេ។ នឹងផ្ញើវានៅពេលសេវាកម្មនេះអាចប្រើបាន។"</string>
-    <string name="fdn_check_failure" msgid="7880740763778173551">"អ្នកអាចផ្ញើបានតែសារទៅលេខទូរស័ព្ទថេររបស់អ្នក។"</string>
-    <string name="no_subject" msgid="4168963736134552285">"(គ្មានប្រធានបទ)"</string>
-    <string name="unknown_sender" msgid="4929330613278853635">"មិនស្គាល់អ្នកផ្ញើ"</string>
-    <string name="dl_failure_notification" msgid="8097699679464396537">"មិនអាចទាញយកសារ <xliff:g id="SUBJECT">%1$s</xliff:g> ពី <xliff:g id="FROM">%2$s</xliff:g> បានទេ។"</string>
-    <string name="rate_limit_surpassed" msgid="1347801608211628177">"បញ្ជាក់"</string>
-    <string name="confirm_rate_limit" msgid="234228299751243067">"នឹងផ្ញើចំនួនសារពហុមេឌៀជាច្រើន។ យល់ព្រម?"</string>
-    <string name="message_download_failed_title" msgid="5722226064394767921">"មិនបានទាញយកសារ"</string>
-    <string name="message_send_failed_title" msgid="3469894907399046372">"មិនបានផ្ញើសារ"</string>
-    <string name="message_failed_body" msgid="3421296112073915245">"ប៉ះដើម្បីពិនិត្យមើលសារឡើងវិញ ហើយព្យាយាមម្ដងទៀត។"</string>
-    <string name="download_later" msgid="5531365714424360903">"មិនអាចទាញយកក្នុងពេលឥឡូវនេះ។ សូមព្យាយាមម្ដងទៀតនៅពេលក្រោយ។"</string>
-    <string name="no_apn" msgid="505932916503312015">"គ្មាន APN បានបញ្ជាក់លើឧបករណ៍។"</string>
-    <string name="select_audio" msgid="3528161449756771832">"ជ្រើសសំឡេង"</string>
-    <string name="copy_to_sdcard" msgid="757028609638184856">"រក្សាទុកឯកសារភ្ជាប់"</string>
-    <string name="copy_to_sdcard_success" msgid="7948625615155992014">"ឯកសារភ្ជាប់ដែលបានរក្សាទុក។"</string>
-    <string name="copy_to_sdcard_fail" msgid="4944606369631916737">"មិនអាចរក្សាទុកឯកសារភ្ជាប់។"</string>
-    <string name="save_ringtone" msgid="2310157075045201051">"រក្សាទុកជាសំឡេងរោទ៍"</string>
-    <string name="saved_ringtone" msgid="3847363932276708626">"បានរក្សាទុកសំឡេងរោទ៍។"</string>
-    <string name="saved_ringtone_fail" msgid="4778500070919251116">"មិនអាចរក្សាទុកសំឡេងរោទ៍។"</string>
-    <string name="menu_insert_smiley" msgid="4964504393061025071">"បញ្ចូលសញ្ញាអារម្មណ៍"</string>
-    <string name="menu_group_participants" msgid="4288356090262299071">"អ្នកចូលរួមក្នុងក្រុម"</string>
-    <string name="select_link_title" msgid="3371818607625768447">"ជ្រើសសកម្មភាព"</string>
-    <string name="slide_number" msgid="1923958526266726635">"ស្លាយ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-  <plurals name="slide_duration">
-    <item quantity="one" msgid="1654101988340583935">"<xliff:g id="NUMBER">%s</xliff:g> វិនាទី"</item>
-    <item quantity="few" msgid="7887190171856293871">"<xliff:g id="NUMBER">%s</xliff:g> វិនាទី"</item>
-    <item quantity="other" msgid="3736425355579939863">"<xliff:g id="NUMBER">%s</xliff:g> វិនាទី"</item>
-  </plurals>
-    <string name="delivery_report_activity" msgid="2957463094232916364">"របាយការណ៍បញ្ជូន"</string>
-    <string name="storage_limits_activity" msgid="8810530813311077716">"ដែនកំណត់ឧបករណ៍ផ្ទុក"</string>
-    <string name="change_duration_activity" msgid="7048606979485031693">"ប្ដូររយៈពេល"</string>
-    <string name="edit_slideshow_activity" msgid="8751493388760050529">"កែការបង្ហាញស្លាយ"</string>
-    <string name="recipient_list_activity" msgid="1254938236543727019">"អ្នកចូលរួមក្នុងក្រុម"</string>
-    <string name="edit_slide_activity" msgid="8752829671778696983">"កែស្លាយ"</string>
-    <string name="slideshow_activity" msgid="5658249461317434432">"ការបញ្ចាំងស្លាយ"</string>
-    <string name="class_0_message_activity" msgid="6631339964159861048">"សារថ្នាក់ ០"</string>
-    <string name="search_label" msgid="6042598929386174964">"ការផ្ញើសារ"</string>
-    <string name="search_hint" msgid="7273727663577472044">"ស្វែងរកការផ្ញើសារ"</string>
-    <string name="search" msgid="7560238620274735199">"ការផ្ញើសារ"</string>
-    <string name="search_setting_description" msgid="4104004595086437572">"អត្ថបទនៅក្នុងសាររបស់អ្នក"</string>
-    <string name="search_empty" msgid="2109551478056039278">"គ្មានការផ្គូផ្គង។"</string>
-  <plurals name="search_results_title">
-    <item quantity="one" msgid="4657073733087431350">"<xliff:g id="NUMBER">%1$s</xliff:g> លទ្ធផលសម្រាប់ \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</item>
-    <item quantity="other" msgid="6196382287749539209">"<xliff:g id="NUMBER">%1$s</xliff:g> លទ្ធផលសម្រាប់ \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</item>
-  </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> លទ្ធផលសម្រាប់ \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</string>
-    <string name="confirm_clear_search_title" msgid="8510295993632032904">"សម្អាត"</string>
-    <string name="confirm_clear_search_text" msgid="8731877031837077478">"នឹងសម្អាតប្រវត្តិស្វែងរក។"</string>
-    <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"សម្អាតប្រវត្តិស្វែងរក"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"ស្វែងរកការផ្ញើសារមុនដែលបានសម្អាតពីការបង្ហាញនៅក្នុងប្រអប់ស្វែងរក"</string>
-    <string name="save" msgid="6847069284991531310">"រក្សាទុក"</string>
-    <string name="storage_limits_title" msgid="7074684882530693016">"កំណត់សារ"</string>
-    <string name="storage_limits_message" msgid="2010501485394745696">"កំណត់ចំនួនសារដែលអ្នករក្សាទុកក្នុងមួយសន្ទនា?"</string>
-    <string name="storage_limits_setting" msgid="4952781049308537373">"កំណត់ដែនកំណត់"</string>
-    <string name="storage_limits_setting_dismiss" msgid="1433841310158458034">"គ្មានដែនកំណត់"</string>
-    <string name="too_many_unsent_mms" msgid="4436493698891224126">"ឥឡូវនេះមិនអាចផ្ញើសារបានទេ។ មានសារពហុមេឌៀដែលមិនបានកំណត់ច្រើនពេក។"</string>
-    <string name="sending_message" msgid="2054406576361149715">"កំពុងផ្ញើ…"</string>
-    <string name="pick_too_many_recipients" msgid="650087588867628044">"អ្នកទទួលជាច្រើនពេក"</string>
-    <string name="adding_recipients" msgid="2962810172527532357">"បន្ថែមអ្នកទទួល ..."</string>
-    <string name="draft_separator" msgid="5402575086540243019">", "</string>
-    <string name="message_count_format" msgid="4434763220590778012">" <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="message_count_notification" msgid="3629968600032690007">"<xliff:g id="NUMBER">%1$s</xliff:g> សារថ្មី"</string>
-  <plurals name="message_count_notification_overflow">
-    <item quantity="one" msgid="3340591167508150806">"សារផ្សេងទៀត +<xliff:g id="NUMBER">%1$s</xliff:g>"</item>
-    <item quantity="other" msgid="1393002799298501480">"សារផ្សេងទៀត +<xliff:g id="NUMBER">%1$s</xliff:g>"</item>
-  </plurals>
-    <string name="error_state" msgid="5177386717626893507">"ស្ថានភាពប្រែប្រួល"</string>
-    <string name="error_state_text" msgid="7918866106335387710">"ស្ថានភាពសែស្រឡាយ និងអ្នកទទួលគឺប្រែប្រួល។ សូមចាប់យករបាយការណ៍កំហុសនិងរាយការណ៍វាតាមរយៈ http://go/droidanizer"</string>
-  <plurals name="recipient_count">
-    <item quantity="other" msgid="7338580381574463136">"មនុស្ស <xliff:g id="NUMBER">%1$s</xliff:g> នាក់"</item>
-  </plurals>
-    <string name="disable_notifications_dialog_message" msgid="7644011234972074096">"បញ្ឈប់ការជូនដំណឹងសារអត្ថបទដែលស្ទួនពីកម្មវិធីផ្ញើសារលំនាំដើម?"</string>
-    <string name="view_more_conversations" msgid="7275920132410734671">"មើលការសន្ទនាជាច្រើន"</string>
-    <string name="attachment_audio" msgid="2867960243300539143">"សំឡេង"</string>
-    <string name="attachment_slideshow" msgid="5867689101881763318">"បញ្ចាំងស្លាយ"</string>
-    <string name="attachment_video" msgid="4252062022156694591">"វីដេអូ"</string>
-    <string name="attachment_picture" msgid="3709286281567284296">"រូបភាព"</string>
-    <string name="notification_separator" msgid="2334673105226536422">"  "</string>
-    <string name="enumeration_comma" msgid="213598026698964628">", "</string>
-    <string name="message_timestamp_format" msgid="4188999027493614617">"<xliff:g id="STRING_0">%1$s</xliff:g> - <xliff:g id="STRING_1">%2$s</xliff:g>"</string>
-    <string name="storage_warning_title" msgid="7124740686325942375">"ទំហំផ្ទុកទូរស័ព្ទរបស់អ្នកពេញហើយ"</string>
-    <string name="storage_warning_content" msgid="1100367816649962354">"អ្នកនឹងមិនទទួលសារ SMS/MMS ថ្មីទេ"</string>
-    <string name="label_mms_send_outbox_msg" msgid="3395185162973061099">"MMS Wakeup"</string>
-    <string name="desc_mms_send_outbox_msg" msgid="1837156781311437148">"ផ្ញើ MMSs ចេញទាំងអស់ពីប្រអប់ចេញទៅបណ្ដាញ"</string>
-</resources>
diff --git a/res/values-kn-rIN/arrays.xml b/res/values-kn-rIN/arrays.xml
index c7049ffb..6ecd0b61 100644
--- a/res/values-kn-rIN/arrays.xml
+++ b/res/values-kn-rIN/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"ವಿಷಯ ಇಲ್ಲ"</item>
-    <item msgid="2214945158821871846">"ಯಾವುದೇ ವಿಷಯವಿಲ್ಲ"</item>
   </string-array>
 </resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
index 4e9055a4..7e16dd90 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn-rIN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -162,14 +162,14 @@
     <string name="pref_summary_sms_disabled" msgid="8975773722051230744">"ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆಯನ್ನು ನಿಮ್ಮ ಡೀಫಾಲ್ಟ್‌ SMS ಅಪ್ಲಿಕೇಶನ್‌ ಆಗಿ ಮಾಡಲು ಸ್ಪರ್ಶಿಸಿ"</string>
     <string name="pref_title_sms_enabled" msgid="1857849790200375277">"SMS ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="pref_summary_sms_enabled" msgid="2106125420361911250">"ನಿಮ್ಮ ಡೀಫಾಲ್ಟ್‌‌ SMS ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಬದಲಾಯಿಸಲು ಸ್ಪರ್ಶಿಸಿ"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"ನಿಮ್ಮ ಸಿಮ್‌ ಕಾರ್ಡ್‌ನಲ್ಲಿ ಸಂಗ್ರಹಿಸಿದ ಸಂದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
+    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"ನಿಮ್ಮ SIM ಕಾರ್ಡ್‌ನಲ್ಲಿ ಸಂಗ್ರಹಿಸಿದ ಸಂದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"ನೀವು ಕಳುಹಿಸುವ ಪ್ರತಿ ಸಂದೇಶಕ್ಕೂ ತಲುಪಿದ ವರದಿಯನ್ನು ವಿನಂತಿಸಿ"</string>
     <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"ನೀವು ಕಳುಹಿಸುವ ಪ್ರತಿ ಸಂದೇಶಕ್ಕೂ ಓದಿದ ವರದಿಯನ್ನು ವಿನಂತಿಸಿ"</string>
     <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"ನೀವು ಕಳುಹಿಸುವ ಪ್ರತಿ ಸಂದೇಶಕ್ಕೂ ತಲುಪಿದ ವರದಿಯನ್ನು ವಿನಂತಿಸಿ"</string>
     <string name="pref_summary_auto_delete" msgid="7719538116486177613">"ಹಳೆಯ ಸಂದೇಶಗಳು ಮಿತಿಗಳನ್ನು ತಲುಪಿದಂತೆ ಅಳಿಸಿ"</string>
     <string name="pref_summary_delete_limit" msgid="597128041393045216">"ಪ್ರತಿ ಸಂವಾದದ <xliff:g id="COUNT">%1$s</xliff:g> ಸಂದೇಶಗಳು"</string>
     <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"ಬಹು ಸ್ವೀಕೃತದಾರರು ಇರುವಾಗ ಒಂದೇ ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಲು MMS ಬಳಸಿ"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಸಂದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
+    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"SIM ಕಾರ್ಡ್‌ ಸಂದೇಶಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
     <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"ತಲುಪಿದ ವರದಿಗಳು"</string>
     <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"ಗುಂಪು ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ"</string>
     <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"ಓದಿದ ವರದಿಗಳು"</string>
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ಶಬ್ದ"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"ಉಳಿಸಲು ಸಂದೇಶಗಳ ಸಂಖ್ಯೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"ಶಾಂತ"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸುವಾಗ ಪ್ರತಿ ಬಾರಿಯೂ ಯಾವ ಸಿಮ್‌ ಬಳಸಬೇಕು ಎಂಬುದನ್ನು ಕೇಳು"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"ಬಹು-ಸಿಮ್‌"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"ಸ್ವಯಂ-ಹಿಂಪಡೆಯುವಿಕೆ"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"ಸಂದೇಶಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹಿಂಪಡೆಯಿರಿ"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"ರೋಮಿಂಗ್‌‌ನಲ್ಲಿರುವಾಗ ಸ್ವಯಂ-ಹಿಂಪಡೆಯುವಿಕೆ"</string>
@@ -198,8 +196,8 @@
     <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"ಎಲ್ಲ ಥ್ರೆಡ್‌ಗಳನ್ನು ಅಳಿಸಲಾಗುವುದು."</string>
     <string name="confirm_delete_message" msgid="9121480656609809591">"ಸಂದೇಶವನ್ನು ಅಳಿಸಲಾಗುವುದು."</string>
     <string name="confirm_delete_locked_message" msgid="7203411948190100955">"ಲಾಕ್‌ಮಾಡಲಾದ ಈ ಸಂದೇಶವನ್ನು ಅಳಿಸುವುದೇ?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ನಲ್ಲಿನ ಎಲ್ಲ ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಲಾಗುವುದು."</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ನಲ್ಲಿನ ಈ ಸಂದೇಶವನ್ನು ಅಳಿಸಲಾಗುವುದು."</string>
+    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"SIM ಕಾರ್ಡ್‌ನಲ್ಲಿನ ಎಲ್ಲ ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಲಾಗುವುದು."</string>
+    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"SIM ಕಾರ್ಡ್‌ನಲ್ಲಿನ ಈ ಸಂದೇಶವನ್ನು ಅಳಿಸಲಾಗುವುದು."</string>
     <string name="delete_unlocked" msgid="7545321606698162261">"ಲಾಕ್‌ಮಾಡಿದ ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಿ"</string>
     <string name="delete" msgid="1409973060081564612">"ಅಳಿಸು"</string>
     <string name="select_conversations" msgid="7816517565640002844">"ಸಂವಾದಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
@@ -232,9 +230,9 @@
     <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"ಟ್ಯಾಬ್ಲೆಟ್‌ ಸ್ಮರಣೆಗೆ ನಕಲಿಸಿ"</string>
     <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"ಫೋನ್‌ ಸ್ಮರಣೆಗೆ ನಕಲಿಸಿ"</string>
     <string name="sim_delete" msgid="610790510655316922">"ಅಳಿಸು"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ನಲ್ಲಿ ಪಠ್ಯ ಸಂದೇಶಗಳು"</string>
+    <string name="sim_manage_messages_title" msgid="3989147182100584333">"SIM ಕಾರ್ಡ್‌ನಲ್ಲಿ ಪಠ್ಯ ಸಂದೇಶಗಳು"</string>
     <string name="sim_view" msgid="1997173541766393706">"ವೀಕ್ಷಿಸು"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ನಲ್ಲಿ ಯಾವುದೇ ಸಂದೇಶಗಳಿಲ್ಲ."</string>
+    <string name="sim_empty" msgid="2356766833071636297">"SIM ಕಾರ್ಡ್‌ನಲ್ಲಿ ಯಾವುದೇ ಸಂದೇಶಗಳಿಲ್ಲ."</string>
     <string name="delivery_header_title" msgid="5361719578869045764">"ವರದಿ ಮಾಡು"</string>
     <string name="status_none" msgid="8253075950774894961">"(ಯಾವುದೂ ಇಲ್ಲ)"</string>
     <string name="status_pending" msgid="2739860824607984892">"ಬಾಕಿ ಉಳಿದಿರುವುದು"</string>
@@ -260,7 +258,7 @@
     <string name="notification_multiple_title" msgid="332602028959557541">"ಹೊಸ ಸಂದೇಶಗಳು"</string>
     <string name="notification_failed_multiple" msgid="6192531993698497229">"<xliff:g id="COUNT">%s</xliff:g> ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲಾಗಲಿಲ್ಲ"</string>
     <string name="notification_failed_multiple_title" msgid="1112032024904397126">"ಸಂದೇಶಗಳನ್ನು ಕಳುಹಿಸಲಾಗಿಲ್ಲ"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಪೂರ್ಣಗೊಂಡಿದೆ"</string>
+    <string name="sim_full_title" msgid="1809829051697702810">"SIM ಕಾರ್ಡ್‌ ಪೂರ್ಣಗೊಂಡಿದೆ"</string>
     <string name="sim_full_body" msgid="6241664980790322925">"ಹೆಚ್ಚಿನ ಸ್ಥಳಾವಕಾಶಕ್ಕಾಗಿ ಕೆಲವೊಂದು ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಿ."</string>
     <string name="sms_full_title" msgid="6041287140125011854">"ಪಠ್ಯ ಸಂದೇಶ ಮೆಮೊರಿಯು ಭರ್ತಿಯಾಗಿದೆ"</string>
     <string name="sms_full_body" msgid="4885861852397651868">"ಮೆಮೊರಿ ಭರ್ತಿಯಾದ ಕಾರಣ ಒಳಬರುವ ಸಂದೇಶಗಳನ್ನು ತಿರಸ್ಕರಿಸಲಾಗಿದೆ. ಕೆಲವೊಂದು ಹಳೆಯ ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಿ."</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ ನಿಮ್ಮ SMS ಅಪ್ಲಿಕೇಶನ್‌ ಅಲ್ಲ"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> ನಿಮ್ಮ SMS ಅಪ್ಲಿಕೇಶನ್‌ ಆಗಿದೆ"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"ನೀವು ಇದನ್ನು ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"ಸಿಮ್‌ ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"ಸಿಮ್‌ <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"ಸಿಮ್‌ ಸ್ಲಾಟ್ <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"ರದ್ದುಮಾಡು"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"ಪ್ರಸ್ತುತ ಆಯ್ಕೆಮಾಡಲಾದ ಸಿಮ್‌ ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ. ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ನಿಮ್ಮ ಡೀಫಾಲ್ಟ್‌‌ ಸಿಮ್‌ ಆರಿಸಿ."</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b04f5b72..074de1e6 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"소리"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"저장할 메시지 개수 설정"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"무음"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"메시지를 보낼 때마다 사용할 SIM 확인"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"멀티 SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"자동 수신"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"메시지를 자동으로 수신"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"로밍 중 자동 수신"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"기본 SMS 앱으로 \'메시지\'를 사용하고 있지 않습니다."</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"기본 SMS 앱으로 <xliff:g id="APPNAME">%s</xliff:g>을(를) 사용하고 있습니다."</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"설정에서 변경할 수 있습니다."</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"SIM 선택"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM 슬롯 <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"취소"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"현재 선택된 SIM이 없습니다. 시스템 설정에서 기본 SIM을 선택하세요."</string>
 </resources>
diff --git a/res/values-ky-rKG/arrays.xml b/res/values-ky-rKG/arrays.xml
index d646d801..d711bf29 100644
--- a/res/values-ky-rKG/arrays.xml
+++ b/res/values-ky-rKG/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"темасы жок"</item>
-    <item msgid="2214945158821871846">"темасыжок"</item>
   </string-array>
 </resources>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml
index daf185e6..756fc70d 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky-rKG/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Үн"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Сактоо үчүн билдирүүлөрдүн санын жазыңыз"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Үнсүз"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Билдирүү жөнөтүлгөн сайын кайсы SIM колдонулат деп суралсын"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Бир нече SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Авто-түшүрүү"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Билдирүүлөрдү автоматтык түрдө түшүрүп алуу"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Роумингде авто-түшүрүү"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Баарлашма сиздин SMS колдонмоңуз эмес"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> бул сиздин SMS колдонмоңуз"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Муну Тууралоолордон өзгөртсөңүз болот"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"SIM тандоо"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM оюгу <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Жокко чыгаруу"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Учурда тандалган SIM жок. Демейки SIM\'иңизди тутум жөндөөлөрүңүздөн тандаңыз."</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 2d474283..9b750e63 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ສຽງ"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"ລະບຸຈຳນວນຂໍ້ຄວາມທີ່ຈະບັນທຶກ"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"ປິດສຽງ"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"ຖາມວ່າຈະໃຊ້ SIM ທຸກເທື່ອທີ່ສົ່ງຂໍ້ຄວາມ"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"ຫຼາຍ SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"ດຶງຂໍ້ມູນອັດຕະໂນມັດ"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"ດຶງຂໍ້ຄວາມອັດຕະໂນມັດ"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"ດຶງຂໍ້ຄວາມອັດຕະໂນມັດເມື່ອໂຣມມິງ"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"ແອັບຯຂໍ້ຄວາມ ບໍ່ແມ່ນແອັບຯ SMS ຂອງທ່ານ"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> ແມ່ນແອັບຯ SMS ຂອງທ່ານ"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"ທ່ານສາມາດປ່ຽນສິ່ງນີ້ໄດ້ໃນ ການຕັ້ງຄ່າ"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"ເລືອກ SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"ຊ່ອງໃສ່ SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"ຍົກເລີກ"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"ບໍ່ມີ SIM ທີ່ເລືອກໃນປັດຈຸບັນ. ໃຫ້ເລືອກ SIM ເລີ່ມຕົ້ນຂອງທ່ານໃນການຕັ້ງຄ່າລະບົບ."</string>
 </resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
deleted file mode 100644
index e75107cb..00000000
--- a/res/values-lo/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1503967887341230795">"ຂໍ້ຄວາມ"</string>
-    <string name="new_message" msgid="1530369762346003973">"ຂໍ້ຄວາມໃໝ່"</string>
-    <string name="menu_call_back" msgid="7538482331117914146">"ໂທຫາ <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_send_email" msgid="671366308915241664">"ສົ່ງອີເມວຫາ <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_compose_new" msgid="3763437973691046238">"ຂຽນຂໍ້ຄວາມ"</string>
-    <string name="menu_preferences" msgid="4693148116114749414">"ການຕັ້ງຄ່າ"</string>
-    <string name="menu_add_address_to_contacts" msgid="4491980950419914944">"ເພີ່ມ <xliff:g id="CONTACTEMAILORNUMBER">%s</xliff:g> ໃສ່ຄົນ"</string>
-    <string name="menu_call" msgid="5877123227307074690">"ໂທ"</string>
-    <string name="menu_search" msgid="2289469305728821360">"ຊອກຫາ"</string>
-    <string name="menu_delete_all" msgid="808729454898114735">"ລຶບຫົວຂໍ້ທັງໝົດ"</string>
-    <string name="menu_delete" msgid="1851666911396479006">"ລຶບຫົວຂໍ້"</string>
-    <string name="menu_view" msgid="7448852683948080108">"ເບິ່ງຫົວຂໍ້"</string>
-    <string name="menu_debug_dump" msgid="6855869130206549643">"DEBUG DUMP"</string>
-    <string name="refreshing" msgid="987335057871404222">"ກຳລັງດຶງຂໍ້ມູນ..."</string>
-    <string name="menu_cell_broadcasts" msgid="5646161375983084660">"ການແຈ້ງຜ່ານເຄືອຂ່າຍ"</string>
-    <string name="has_draft" msgid="2487465595514636160">"ສະບັບຮ່າງ"</string>
-    <string name="no_subject_view" msgid="7795086723069563537">"(ບໍ່ມີຫົວຂໍ້)"</string>
-    <string name="messagelist_sender_self" msgid="3579016854116401602">"ຂ້ອຍ"</string>
-    <string name="view_slideshow" msgid="4990460971211388453">"ເບິ່ງສະໄລ້ໂຊ"</string>
-    <string name="view_message_details" msgid="7613457646645796831">"ເບິ່ງລາຍລະອຽດ"</string>
-    <string name="view_delivery_report" msgid="8219095994071575215">"ເບິ່ງລາຍງານ"</string>
-    <string name="delete_message" msgid="6442394955910357234">"ລຶບ"</string>
-    <string name="expire_on" msgid="4436268382742593921">"ໝົດອາຍຸ: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="kilobyte" msgid="534782148965716631">"KB"</string>
-    <string name="undelivered_msg_dialog_title" msgid="7479433403599785755">"ຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ສົ່ງ"</string>
-    <string name="undelivered_msg_dialog_body" msgid="4789268239627694551">"ບໍ່ສາມາດສົ່ງຂໍ້ຄວາມນີ້.\nພະຍາຍາມສົ່ງ: <xliff:g id="MESSAGE">%s</xliff:g>."</string>
-    <string name="undelivered_sms_dialog_body" msgid="4203703285563450868">"ບໍ່ສາມາດສົ່ງຂໍ້ຄວາມນີ້."</string>
-    <string name="delete_thread" msgid="757258847736632791">"ລຶບຫົວຂໍ້"</string>
-    <string name="menu_forward" msgid="9026858380050046756">"ສົ່ງຕໍ່"</string>
-    <string name="download" msgid="4488877642230207631">"ດາວໂຫລດ"</string>
-    <string name="downloading" msgid="1779557575565350637">"ກຳລັງດາວໂຫລດ"</string>
-    <string name="inline_subject" msgid="4057621785274119260">"&lt;ຫົວຂໍ້: <xliff:g id="SUBJECT">%s</xliff:g>&gt;"</string>
-    <string name="drm_protected_text" msgid="1396394157870730742">"* ຂໍ້ຄວາມທີ່ຖືກປ້ອງກັນດ້ວຍ DRM  *"</string>
-    <string name="insufficient_drm_rights" msgid="6989074725969164383">"ກວດພົບສິດທິ DRM ບໍ່ພຽງພໍ."</string>
-    <string name="copy_message_text" msgid="4296252229544252834">"ສຳເນົາຂໍ້ຄວາມ"</string>
-    <string name="message_options" msgid="6838806653341967550">"ຕົວເລືອກຂໍ້ຄວາມ"</string>
-    <string name="slideshow_options" msgid="3501759384739796431">"ໂຕເລືອກສະໄລ້ໂຊ"</string>
-    <string name="done" msgid="7479926268660505871">"ແລ້ວໆ"</string>
-    <string name="move_up" msgid="7307578107431739359">"ເລື່ອນຂຶ້ນ"</string>
-    <string name="move_down" msgid="6356509518429479053">"ເລື່ອນລົງ"</string>
-    <string name="remove_slide" msgid="2225604354024914900">"ລຶບສະໄລ້ອອກ"</string>
-    <string name="add_slide" msgid="9140721399423564187">"ເພີ່ມສະໄລ້"</string>
-    <string name="add_slide_hint" msgid="7351356961076244584">"ແຕະເພື່ອສ້າງສະໄລ້ໃໝ່."</string>
-    <string name="discard_slideshow" msgid="5054239124146413609">"ຍົກເລີກສະໄລ້ໂຊ"</string>
-    <string name="slide_show_part" msgid="5077675385448696846">"ສ່ວນທີ <xliff:g id="PART">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="remove_text" msgid="2164068850029476539">"ລຶບຂໍ້ຄວາມອອກ"</string>
-    <string name="add_picture" msgid="7819574884962571479">"ເພີ່ມຮູບ"</string>
-    <string name="remove_picture" msgid="6378701749074289096">"ລຶບຮູບອອກ"</string>
-    <string name="add_music" msgid="3827442822987116233">"ເພີ່ມເພງ"</string>
-    <string name="remove_music" msgid="858889733416015223">"ລຶບເພງອອກ"</string>
-    <string name="add_video" msgid="7816866867806595144">"ເພີ່ມວິດີໂອ"</string>
-    <string name="remove_video" msgid="5258603891528497799">"ລຶບວິດີໂອອອກ"</string>
-    <string name="to_hint" msgid="224029549150332986">"ເຖິງ"</string>
-    <string name="subject_hint" msgid="4296714962311604126">"ຫົວຂໍ້"</string>
-    <string name="add_attachment" msgid="7103751293360532684">"ແນບໄຟລ໌"</string>
-    <string name="add_subject" msgid="7616134948428265870">"ເພີ່ມຫົວຂໍ້"</string>
-    <string name="discard" msgid="1624800293064498479">"ຍົກເລີກ"</string>
-    <string name="view" msgid="7929667761715467136">"ເບິ່ງ"</string>
-    <string name="replace" msgid="7587904998114459388">"ແທນທີ່"</string>
-    <string name="remove" msgid="4625444913256213175">"ລຶບອອກ"</string>
-    <string name="send" msgid="4589898724889248486">"ສົ່ງ"</string>
-    <string name="mms" msgid="1587631213714914559">"MMS"</string>
-    <string name="send_mms" msgid="2933162044872550662">"ສົ່ງ MMS"</string>
-    <string name="all_threads" msgid="2663426830306307194">"ຫົວຂໍ້ທັງໝົດ"</string>
-    <string name="type_to_compose_text_enter_to_send" msgid="3539985471008581265">"ພິມຂໍ້ຄວາມ"</string>
-    <string name="open_keyboard_to_compose_message" msgid="7860109685511253191">"ເປີດແປ້ນພິມເພື່ອພິມຂໍ້ຄວາມ"</string>
-    <string name="compressing" msgid="1961357529661045180">"ຮູບພາບໃຫຍ່ເກີນໄປ. ກຳລັງບີບອັດ..."</string>
-    <string name="unsupported_media_format" msgid="1350489690977363764">"ບໍ່ຮອງຮັບຮູບແບບ <xliff:g id="NAME">%1$s</xliff:g>."</string>
-    <string name="select_different_media" msgid="6241623357299382183">"ເລືອກຄົນລະ <xliff:g id="NAME">%1$s</xliff:g>."</string>
-    <string name="exceed_message_size_limitation" msgid="6027753647094742437">"ຮອດກຳນົດຂະໜາດຂໍ້ຄວາມແລ້ວ."</string>
-    <string name="message_too_big_for_video" msgid="2639367545165352543">"ຂໍ້ຄວາມໃຫຍ່ເກີນກວ່າທີ່ຈະແນບວິດີໂອໄດ້."</string>
-    <string name="failed_to_add_media" msgid="7207464170168708485">"ທ່ານບໍ່ສາມາດເພີ່ມ <xliff:g id="NAME">%1$s</xliff:g> ນີ້ໃສ່ຂໍ້ຄວາມຂອງທ່ານໄດ້."</string>
-    <string name="failed_to_resize_image" msgid="5608354151631833669">"ຮູບພາບບໍ່ໄດ້ຖືກຫຍໍ້."</string>
-    <string name="resize_image_error_information" msgid="3783200130776554475">"ຮູບຍັງໃຫຍ່ເກີນໄປ, ເຖິງວ່າຈະຫຍໍ້ແລ້ວກໍຕາມ."</string>
-    <string name="forward_prefix" msgid="276280492803486464">"ສົ່ງຕໍ່: "</string>
-    <string name="discard_message_reason" msgid="2667664943003796133">"ຂໍ້ຄວາມຂອງທ່ານຈະຖືກຍົກເລີກ ເນື່ອງຈາກບໍ່ມີຜູ່ຮັບທີ່ຖືກຕ້ອງ."</string>
-    <string name="has_invalid_recipient" msgid="1485388396900997383">"ຜູ່ຮັບບໍ່ຖືກຕ້ອງ: &lt;<xliff:g id="NAME">%1$s</xliff:g>&gt;"</string>
-    <string name="invalid_destination" msgid="4573835601024786416">"ທີ່ຢູ່ປາຍທາງບໍ່ຖືກຕ້ອງ."</string>
-    <string name="service_not_activated" msgid="9178218144019626176">"ບໍ່ໄດ້ເປີດໃຊ້ບໍລິການໃນເຄືອຂ່າຍ."</string>
-    <string name="service_message_not_found" msgid="1908877102600048515">"ຂໍ້ຄວາມໝົດອາຍຸ ຫຼືບໍ່ສາມາດໃຊ້ໄດ້."</string>
-    <string name="service_network_problem" msgid="4583269174855943025">"ບໍ່ສາມາດສົ່ງໄດ້ເນື່ອງຈາກມີບັນຫາກັບເຄືອຂ່າຍ."</string>
-    <string name="invalid_recipient_message" msgid="6465343105010999068">"ແກ້ໄຂຜູ່ຮັບ ຫຼືບໍ່ດັ່ງນັ້ນພວກເຂົາຈະບໍ່ໄດ້ຮັບຂໍ້ຄວາມນີ້."</string>
-    <string name="cannot_send_message" msgid="3414307479833622644">"ບໍ່ສາມາດສົ່ງຂໍ້ຄວາມ"</string>
-    <string name="cannot_send_message_reason" msgid="8745080126044054343">"ຂໍ້ຄວາມຂອງທ່ານບໍ່ມີຜູ່ຮັບທີ່ຖືກຕ້ອງ."</string>
-    <string name="cannot_forward_drm_obj" msgid="5047623751430559077">"ລາຍງານ DRM ທີ່ຮວມຢູ່ໃນຂໍ້ຄວາມນີ້ບໍ່ສາມາດຖືກສົ່ງຕໍ່ໄດ້."</string>
-    <string name="converting_to_picture_message" msgid="2980023239017588627">"ກຳລັງແປງເປັນຂໍ້ຄວາມ multimedia..."</string>
-    <string name="cannot_add_slide_anymore" msgid="4631404749618820994">"ບໍ່ສາມາດເພີ່ມສະໄລ້ໄດ້ອີກ."</string>
-    <string name="cannot_add_picture_and_video" msgid="4954353772391381447">"ບໍ່ສາມາດເພີ່ມວິດີໂອ ແລະຮູບພາບໃສ່ໃນສະໄລ້ດຽວໄດ້."</string>
-    <string name="cannot_save_message" msgid="3375907366965264446">"ບໍ່ສາມາດບັນທຶກຂໍ້ຄວາມໄດ້."</string>
-    <string name="message_saved_as_draft" msgid="2503018972659880692">"ບັນທຶກຂໍ້ຄວາມເປັນສະບັບຮ່າງແລ້ວ."</string>
-    <string name="too_many_recipients" msgid="7003415094007176931">"ຂໍ້ຄວາມມີຈຳນວນຜູ່ຮັບຫຼາຍເກີນໄປ (<xliff:g id="CURRENTCOUNT">%1$s</xliff:g>). ທ່ານສາມາດສົ່ງຫາໄດ້ສູງສຸດ <xliff:g id="MAXLIMIT">%2$s</xliff:g> ຄົນເທົ່ານັ້ນ."</string>
-    <string name="too_many_attachments" msgid="3774037894899750070">"ໄຟລ໌ແນບຈຳກັດຢູ່ທີ່ <xliff:g id="MAXLIMIT">%1$s</xliff:g> ເທົ່ານັ້ນ. ມີສະເພາະ <xliff:g id="CURRENTCOUNT">%2$s</xliff:g> ໄຟລ໌ທຳອິດທີ່ຈະຖືກເພີ່ມໃສ່."</string>
-    <string name="adding_attachments_title" msgid="2034535554212405529">"ກຳລັງເພີ່ມໄຟລ໌ແນບ"</string>
-    <string name="adding_attachments" msgid="5871373105122355632">"ລໍຖ້າໃນຂະນະທີ່ກຳລັງເພີ່ມລາຍການໃສ່ສະໄລ້ໂຊ."</string>
-    <string name="building_slideshow_title" msgid="1232338692400726385">"ກຳລັງສ້າງສະໄລ້ໂຊ"</string>
-    <string name="cannot_play_audio" msgid="253920977253666735">"ບໍ່ສາມາດຫລິ້ນສຽງ."</string>
-    <string name="preview" msgid="5438149136136446756">"ຕົວຢ່າງ"</string>
-    <string name="preview_slideshow" msgid="6824095909448728427">"ຕົວຢ່າງ"</string>
-    <string name="replace_image" msgid="3171240952601443619">"ແທນທີ່ຮູບພາບ"</string>
-    <string name="duration_sec" msgid="6617032324007824096">"ໄລຍະເວລາ (<xliff:g id="DURATION">%s</xliff:g> ວິ)"</string>
-    <string name="duration_selector_title" msgid="5981097971537625852">"ໄລຍະເວລາຂອງສະໄລ້ "</string>
-    <string name="layout_selector_title" msgid="7344600117972450771">"ການຈັດວາງສະໄລ້ໂຊ "</string>
-    <string name="layout_top" msgid="6811021650398972346">"ການຈັດວາງ (ເທິງ)"</string>
-    <string name="layout_bottom" msgid="5822765871095491843">"ການຈັດວາງ (ລຸ່ມ)"</string>
-    <string name="type_to_compose_text_or_leave_blank" msgid="7769792471457574059">"ພິມຂໍ້ຄວາມ, ຫຼືປ່ອຍຫວ່າງໄວ້"</string>
-    <string name="duration_not_a_number" msgid="2856636898040421237">"ໄລຍະເວລາຕ້ອງເປັນໂຕເລກ."</string>
-    <string name="duration_zero" msgid="3549377790195185977">"ໄລຍະເວລາຕ້ອງຫຼາຍກວ່າ 0 ວິນາທີ."</string>
-    <string name="secs" msgid="6886003523109967972">"ວິ"</string>
-  <string-array name="select_dialog_items">
-    <item msgid="4840183714016984112">"1 ວິນາທີ"</item>
-    <item msgid="3734955613666864447">"2 ວິນາທີ"</item>
-    <item msgid="6032232473048379828">"3 ວິນາທີ"</item>
-    <item msgid="5978471781525927827">"4 ວິນາທີ"</item>
-    <item msgid="4888440297621208402">"5 ວິນາທີ"</item>
-    <item msgid="6047246213264166841">"6 ວິນາທີ"</item>
-    <item msgid="2327501250056533797">"7 ວິນາທີ"</item>
-    <item msgid="3400770414689795703">"8 ວິນາທີ"</item>
-    <item msgid="4358760614161107970">"9 ວິນາທີ"</item>
-    <item msgid="2618179407176906471">"10 ວິນາທີ"</item>
-    <item msgid="7786079681602275449">"ອື່ນໆ"</item>
-  </string-array>
-    <string name="menu_view_contact" msgid="1414670584423909451">"ເບິ່ງລາຍຊື່ຜູ່ຕິດຕໍ່"</string>
-    <string name="menu_add_to_contacts" msgid="1258127580972228970">"ເພີ່ມໃສ່ຄົນ"</string>
-    <string name="hidden_sender_address" msgid="2776075636669924968">"ທີ່ຢູ່ຜູ່ສົ່ງຖືກເຊື່ອງໄວ້"</string>
-    <string name="yes" msgid="3246158147503160811">"ຕົກລົງ"</string>
-    <string name="no" msgid="4289742508556913860">"ຍົກເລີກ"</string>
-    <string name="set" msgid="4642365398263275979">"ຕັ້ງຄ່າ"</string>
-    <string name="play" msgid="1888432400937785115">"ຫຼິ້ນ"</string>
-    <string name="edit" msgid="5912118407791492696">"ແກ້ໄຂ"</string>
-    <string name="try_to_send" msgid="1996751738286080976">"ພະຍາຍາມສົ່ງ"</string>
-    <string name="preferences_title" msgid="6650089610332670157">"ການຕັ້ງຄ່າ"</string>
-    <string name="restore_default" msgid="7165341506551155053">"ຄືນການຕັ້ງຄ່າເລີ່ມຕົ້ນ"</string>
-    <string name="pref_notification_settings_title" msgid="6420782563630369776">"ການແຈ້ງເຕືອນ"</string>
-    <string name="pref_mms_settings_title" msgid="55618772118264355">"ຂໍ້ຄວາມ Multimedia (MMS)"</string>
-    <string name="pref_sms_settings_title" msgid="5173078369851066881">"ຂໍ້ຄວາມສັ້ນ (SMS)"</string>
-    <string name="pref_sms_storage_title" msgid="9001233319190616445">"ບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"ຈັດການຂໍ້ຄວາມທີ່ບັນທຶກໄວ້ໃນ SIM card ຂອງທ່ານ"</string>
-    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"ຂໍລາຍງານການຈັດສົ່ງສຳລັບແຕ່ລະຂໍ້ຄວາມທີ່ທ່ານສົ່ງ"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"ຂໍລາຍງານການອ່ານສຳລັບແຕ່ລະຂໍ້ຄວາມທີ່ທ່ານສົ່ງ"</string>
-    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"ຂໍລາຍງານການຈັດສົ່ງສຳລັບແຕ່ລະຂໍ້ຄວາມທີ່ທ່ານສົ່ງ"</string>
-    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"ລຶບຂໍ້ຄວາມເກົ່າເມື່ອຮອດກຳນົດທີ່ລະບຸ"</string>
-    <string name="pref_summary_delete_limit" msgid="597128041393045216">"<xliff:g id="COUNT">%1$s</xliff:g> ຂໍ້ຄວາມຕໍ່ບົດສົນທະນາ"</string>
-    <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"ໃຊ້ MMS ເພື່ອສົ່ງຂໍ້ຄວາມໃດນຶ່ງເມື່ອມີຜູ່ຮັບຫຼາຍຄົນ"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"ຈັດການຂໍ້ຄວາມໃນ SIM card"</string>
-    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"ລາຍງານການສົ່ງ"</string>
-    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"ການສົ່ງຂໍ້ຄວາມກຸ່ມ"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"ອ່ານລາຍງານ"</string>
-    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"ລາຍງານການສົ່ງ"</string>
-    <string name="pref_title_auto_delete" msgid="7227835692631701134">"ລຶບຂໍ້ຄວາມເກົ່າ"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"ຈຳກັດຂໍ້ຄວາມ"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"ຈຳກັດຂໍ້ຄວາມ Multimedia"</string>
-    <string name="pref_title_notification_enabled" msgid="9118792213953729414">"ການແຈ້ງເຕືອນ"</string>
-    <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"ສັ່ນເຕືອນ"</string>
-    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ສຽງ"</string>
-    <string name="pref_messages_to_save" msgid="3202539743892934926">"ລະບຸຈຳນວນຂໍ້ຄວາມທີ່ຈະບັນທຶກ"</string>
-    <string name="silent_ringtone" msgid="7981237991326592780">"ປິດສຽງ"</string>
-    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"ດຶງຂໍ້ມູນອັດຕະໂນມັດ"</string>
-    <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"ດຶງຂໍ້ຄວາມອັດຕະໂນມັດ"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"ດຶງຂໍ້ຄວາມອັດຕະໂນມັດເມື່ອໂຣມມິງ"</string>
-    <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"ດຶງຂໍ້ຄວາມອັດຕະໂນມັດເມື່ອເປີດໂຣມມິງ"</string>
-    <string name="confirm_dialog_title" msgid="2187213750475782725">"ລຶບບໍ່?"</string>
-    <string name="confirm_dialog_locked_title" msgid="8179085718150932242">"ລຶບຂໍ້ຄວາມທີ່ຖືກລັອກ?"</string>
-  <plurals name="confirm_delete_conversation">
-    <item quantity="one" msgid="7509396981963472833">"ນຶ່ງບົດສົນທະນາຈະຖືກລຶບອອກ."</item>
-    <item quantity="other" msgid="4076915774012081811">"<xliff:g id="NUMBER">%1$s</xliff:g> ບົດສົນທະນາຈະຖືກລຶບອອກ."</item>
-  </plurals>
-    <string name="confirm_delete_conversation" msgid="6115966687389279855">"ທັງຫົວຂໍ້ຈະຖືກລຶບອອກ."</string>
-    <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"ຫົວຂໍ້ທັງໝົດຈະຖືກລຶບອອກ."</string>
-    <string name="confirm_delete_message" msgid="9121480656609809591">"ຂໍ້ຄວາມຈະຖືກລຶບອອກ."</string>
-    <string name="confirm_delete_locked_message" msgid="7203411948190100955">"ລຶບຂໍ້ຄວາມທີ່ຖືກລັອກນີ້?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"ທຸກຂໍ້ຄວາມໃນ SIM card ຈະຖືກລຶບອອກ."</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"ຂໍ້ຄວາມນີ້ໃນ SIM card ຈະຖືກລຶບອອກ."</string>
-    <string name="delete_unlocked" msgid="7545321606698162261">"ລຶບຂໍ້ຄວາມທີ່ຖືກລັອກ"</string>
-    <string name="delete" msgid="1409973060081564612">"ລຶບ"</string>
-    <string name="select_conversations" msgid="7816517565640002844">"ເລືອກບົດສົນທະນາ"</string>
-    <string name="no_conversations" msgid="6773767655149258445">"ບໍ່ມີບົດສົນທະນາ."</string>
-    <string name="loading_conversations" msgid="5510430408235967094">"ກຳລັງໂຫລດບົດສົນທະນາ."</string>
-    <string name="cannot_get_details" msgid="850292987983026806">"ບໍ່ສາມາດຂໍລາຍລະອຽດ."</string>
-    <string name="message_details_title" msgid="9223295113731634528">"ລາຍລະອຽດຂໍ້ຄວາມ"</string>
-    <string name="message_type_label" msgid="7975373966795945566">"ປະເພດ: "</string>
-    <string name="text_message" msgid="8196464345251877972">"ຂໍ້ຄວາມ"</string>
-    <string name="multimedia_message" msgid="1512644521083533071">"ຂໍ້ຄວາມ Multimedia"</string>
-    <string name="multimedia_notification" msgid="4124031788554972308">"ການແຈ້ງເຕືອນຂໍ້ຄວາມ Multimedia"</string>
-    <string name="from_label" msgid="2055117571548171397">"ຈາກ: "</string>
-    <string name="to_address_label" msgid="5837363600471845801">"ເຖິງ: "</string>
-    <string name="bcc_label" msgid="530867161453958774">"Bcc: "</string>
-    <string name="sent_label" msgid="2722190650145251584">"ສົ່ງ:ແລ້ວ: "</string>
-    <string name="received_label" msgid="8618029024731693906">"ໄດ້ຮັບ: "</string>
-    <string name="saved_label" msgid="4183160415593488207">"ບັນທຶກແລ້ວ: "</string>
-    <string name="subject_label" msgid="8721241914144101631">"ຫົວຂໍ້: "</string>
-    <string name="message_size_label" msgid="4698016210013319786">"ຂະໜາດຂໍ້ຄວາມ: "</string>
-    <string name="priority_label" msgid="7397600367853359607">"ລຳດັບຄວາມສຳຄັນ "</string>
-    <string name="priority_high" msgid="5627897207952009214">"ສູງ"</string>
-    <string name="priority_normal" msgid="5715227727384683550">"ທຳມະດາ"</string>
-    <string name="priority_low" msgid="8928782666023373987">"ຕ່ຳ"</string>
-    <string name="message_class_label" msgid="5115748690481550562">"ຄລາສຂໍ້ຄວາມ: "</string>
-    <string name="error_code_label" msgid="5810068247647058769">"ລະຫັດຂໍ້ຜິດພາດ: "</string>
-    <string name="menu_edit" msgid="3056513240155967777">"ແກ້ໄຂ"</string>
-    <string name="menu_delete_messages" msgid="2610286783513247420">"ລຶບຂໍ້ຄວາມ"</string>
-    <string name="menu_lock" msgid="7603793126077557472">"ລັອກ"</string>
-    <string name="menu_unlock" msgid="6662865558677424039">"ປົດລັອກ"</string>
-    <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"ສຳເນົາໄປໃສ່ໜ່ວຍຄວາມຈຳແທັບເລັດ"</string>
-    <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"ສຳເນົາໄປໃສ່ໜ່ວຍຄວາມຈຳໂທລະສັບ"</string>
-    <string name="sim_delete" msgid="610790510655316922">"ລຶບ"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"ຂໍ້ຄວາມໃນ SIM card"</string>
-    <string name="sim_view" msgid="1997173541766393706">"ເບິ່ງ"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"ບໍ່ມີຂໍ້ຄວາມໃນ SIM card."</string>
-    <string name="delivery_header_title" msgid="5361719578869045764">"ລາຍງານ"</string>
-    <string name="status_none" msgid="8253075950774894961">"(ບໍ່ມີ)"</string>
-    <string name="status_pending" msgid="2739860824607984892">"ກຳລັງລໍຖ້າ"</string>
-    <string name="status_read" msgid="7576195253780627332">"ອ່ານ"</string>
-    <string name="status_received" msgid="7264334589461906965">"ໄດ້ຮັບ"</string>
-    <string name="status_failed" msgid="1998776666856593544">"ບໍ່ສຳເລັດ"</string>
-    <string name="status_unread" msgid="8555305495998700198">"ຍັງບໍ່ໄດ້ອ່ານ"</string>
-    <string name="status_rejected" msgid="2613641949065942678">"ຖືກປະຕິເສດ"</string>
-    <string name="recipient_label" msgid="3922667485312634446">"ຜູ່ຮັບ: "</string>
-    <string name="status_label" msgid="7283375460919181660">"ສະຖານະ: "</string>
-    <string name="delivered_label" msgid="3514011729156932928">"ສົ່ງແລ້ວ: "</string>
-    <string name="attach_image" msgid="6439985727687107742">"ຮູບພາບ"</string>
-    <string name="attach_take_photo" msgid="4280601313184373837">"ຈັບພາບ"</string>
-    <string name="attach_video" msgid="4264272693501538294">"ວິດີໂອ"</string>
-    <string name="attach_record_video" msgid="3099814114743078615">"ບັນທຶກວິດີໂອ"</string>
-    <string name="attach_sound" msgid="3149325985970669609">"ສຽງ"</string>
-    <string name="attach_record_sound" msgid="6011431304469858929">"ບັນທຶກສຽງ"</string>
-    <string name="attach_slideshow" msgid="3497422151091037063">"ສະໄລ້ໂຊ"</string>
-    <string name="select_bottom_text" msgid="4201966447623311931">"ຂໍ້ຄວາມຢູ່ລຸ່ມ"</string>
-    <string name="select_top_text" msgid="6734183477539197815">"ຂໍ້ຄວາມຢູ່ເທິງ"</string>
-    <string name="delivery_toast_body" msgid="5960519861835727013">"%s ໄດ້ຮັບຂໍ້ຄວາມແລ້ວ."</string>
-    <string name="notification_multiple" msgid="7684007285202109490">"<xliff:g id="COUNT">%s</xliff:g> ຂໍ້ຄວາມທີ່ຍັງບໍ່ໄດ້ອ່ານ"</string>
-    <string name="notification_multiple_title" msgid="332602028959557541">"ຂໍ້ຄວາມໃໝ່"</string>
-    <string name="notification_failed_multiple" msgid="6192531993698497229">"<xliff:g id="COUNT">%s</xliff:g> ຂໍ້ຄວາມບໍ່ສາມາດສົ່ງໄດ້"</string>
-    <string name="notification_failed_multiple_title" msgid="1112032024904397126">"ຂໍ້ຄວາມບໍ່ໄດ້ສົ່ງ"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"SIM card ເຕັມ"</string>
-    <string name="sim_full_body" msgid="6241664980790322925">"ລຶບບາງຂໍ້ຄວາມເພື່ອເພີ່ມພື້ນທີ່ຫວ່າງ."</string>
-    <string name="sms_full_title" msgid="6041287140125011854">"ໜ່ວຍຄວາມຈຳຂໍ້ຄວາມເຕັມ"</string>
-    <string name="sms_full_body" msgid="4885861852397651868">"ຂໍ້ຄວາມຂາເຂົ້າຖືກປະຕິເສດ ເນື່ອງຈາກໜ່ວຍຄວາມຈຳເຕັມແລ້ວ. ກະລຸນາລຶບຂໍ້ຄວາມເກົ່າຈຳນວນນຶ່ງອອກ."</string>
-    <string name="sms_rejected_title" msgid="8548394922491529811">"ຂໍ້ຄວາມຖືກປະຕິເສດ"</string>
-    <string name="sms_rejected_body" msgid="7813671133968158562">"ຂໍ້ຄວາມຂາເຂົ້າຖືກປະຕິເສດໂດຍບໍ່ຮູ້ສາຍເຫດ."</string>
-    <string name="type_audio" msgid="3842064092332309756">"ສຽງ"</string>
-    <string name="type_picture" msgid="4091928975383609443">"ຮູບພາບ"</string>
-    <string name="type_video" msgid="8521556159545168441">"ວິດີໂອ"</string>
-    <string name="confirm" msgid="3155110885840591914">"ຢືນຢັນ"</string>
-    <string name="message_send_read_report" msgid="6997117678914261250">"ລາຍງານການອ່ານຈະຖືກສົ່ງໄປ."</string>
-    <string name="message_queued" msgid="7975945623873194737">"ບໍ່ສາມາດສົ່ງຂໍ້ຄວາມຂອງທ່ານໄດ້ໃນເວລານີ້. ມັນຈະຖືກສົ່ງເມື່ອບໍລິການກັບມາໃຊ້ໄດ້ຄືນ."</string>
-    <string name="fdn_check_failure" msgid="7880740763778173551">"ທ່ານສາມາດສົ່ງຂໍ້ຄວາມຫາ ໝາຍເລກຈຳກັດການໂທອອກຂອງທ່ານເທົ່ານັ້ນ."</string>
-    <string name="no_subject" msgid="4168963736134552285">"(ບໍ່ມີຫົວຂໍ້)"</string>
-    <string name="unknown_sender" msgid="4929330613278853635">"(ບໍ່ຮູ້ຜູ່ສົ່ງ)"</string>
-    <string name="dl_failure_notification" msgid="8097699679464396537">"ບໍ່ສາມາດດາວໂຫລດຂໍ້ຄວາມ <xliff:g id="SUBJECT">%1$s</xliff:g> ຈາກ <xliff:g id="FROM">%2$s</xliff:g> ໄດ້."</string>
-    <string name="rate_limit_surpassed" msgid="1347801608211628177">"ຢືນຢັນ"</string>
-    <string name="confirm_rate_limit" msgid="234228299751243067">"ຂໍ້ຄວາມ multimedia ຈຳນວນຫຼາຍກຳລັງຈະຖືກສົ່ງ. ຕົກລົງ?"</string>
-    <string name="message_download_failed_title" msgid="5722226064394767921">"ບໍ່ສາມາດດາວໂຫລດຂໍ້ຄວາມໄດ້"</string>
-    <string name="message_send_failed_title" msgid="3469894907399046372">"ຂໍ້ຄວາມຍັງບໍ່ໄດ້ຖືກສົ່ງ"</string>
-    <string name="message_failed_body" msgid="3421296112073915245">"ແຕະເພື່ອກວດສອບຂໍ້ຄວາມ ແລ້ວລອງໃໝ່ອີກຄັ້ງ."</string>
-    <string name="download_later" msgid="5531365714424360903">"ບໍ່ສາມາດດາວໂຫລດໄດ້ຕອນນີ້. ກະລຸນາລອງໃໝ່ໃນພາຍຫຼັງ."</string>
-    <string name="no_apn" msgid="505932916503312015">"ບໍ່ມີ APN ລະບຸໃນອຸປະກອນ."</string>
-    <string name="select_audio" msgid="3528161449756771832">"ເລືອກສຽງ"</string>
-    <string name="copy_to_sdcard" msgid="757028609638184856">"ບັນທຶກໄຟລ໌ແນບ"</string>
-    <string name="copy_to_sdcard_success" msgid="7948625615155992014">"ບັນທຶກໄວ້ແນບແລ້ວ."</string>
-    <string name="copy_to_sdcard_fail" msgid="4944606369631916737">"ບໍ່ສາມາດບັນທຶກໄຟລ໌ແນບໄດ້."</string>
-    <string name="save_ringtone" msgid="2310157075045201051">"ບັນທຶກເປັນຣິງໂທນ"</string>
-    <string name="saved_ringtone" msgid="3847363932276708626">"ບັນທຶກຣິງໂທນແລ້ວ."</string>
-    <string name="saved_ringtone_fail" msgid="4778500070919251116">"ບໍ່ສາມາດບັນທຶກຣິງໂທນໄດ້."</string>
-    <string name="menu_insert_smiley" msgid="4964504393061025071">"ໃສ່ຮູບຍິ້ມ"</string>
-    <string name="menu_group_participants" msgid="4288356090262299071">"ຜູ່ເຂົ້າຮ່ວມກຸ່ມ"</string>
-    <string name="select_link_title" msgid="3371818607625768447">"ເລືອກການເຮັດວຽກ"</string>
-    <string name="slide_number" msgid="1923958526266726635">"ສະໄລ້ <xliff:g id="NUMBER">%s</xliff:g>"</string>
-  <plurals name="slide_duration">
-    <item quantity="one" msgid="1654101988340583935">"<xliff:g id="NUMBER">%s</xliff:g> ວິ"</item>
-    <item quantity="few" msgid="7887190171856293871">"<xliff:g id="NUMBER">%s</xliff:g> ວິ"</item>
-    <item quantity="other" msgid="3736425355579939863">"<xliff:g id="NUMBER">%s</xliff:g> ວິ"</item>
-  </plurals>
-    <string name="delivery_report_activity" msgid="2957463094232916364">"ລາຍງານການສົ່ງ"</string>
-    <string name="storage_limits_activity" msgid="8810530813311077716">"ຈຳນວນສູງສຸດໃນການຈັດເກັບ"</string>
-    <string name="change_duration_activity" msgid="7048606979485031693">"ປ່ຽນໄລຍະເວລາ"</string>
-    <string name="edit_slideshow_activity" msgid="8751493388760050529">"ແກ້ໄຂສະໄລ້ໂຊ"</string>
-    <string name="recipient_list_activity" msgid="1254938236543727019">"ຜູ່ເຂົ້າຮ່ວມກຸ່ມ"</string>
-    <string name="edit_slide_activity" msgid="8752829671778696983">"ແກ້ໄຂສະໄລ້"</string>
-    <string name="slideshow_activity" msgid="5658249461317434432">"ສະໄລ້ໂຊ"</string>
-    <string name="class_0_message_activity" msgid="6631339964159861048">"ຂໍ້ຄວາມຄລາສ 0"</string>
-    <string name="search_label" msgid="6042598929386174964">"ຂໍ້ຄວາມ"</string>
-    <string name="search_hint" msgid="7273727663577472044">"ຊອກຫາຂໍ້ຄວາມ"</string>
-    <string name="search" msgid="7560238620274735199">"ຂໍ້ຄວາມ"</string>
-    <string name="search_setting_description" msgid="4104004595086437572">"ໂຕໜັງສືໃນຂໍ້ຄວາມຂອງທ່ານ"</string>
-    <string name="search_empty" msgid="2109551478056039278">"ບໍ່ພົບຜົນການຊອກຫາ."</string>
-  <plurals name="search_results_title">
-    <item quantity="one" msgid="4657073733087431350">"<xliff:g id="NUMBER">%1$s</xliff:g> ຜົນການຊອກຫາ \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</item>
-    <item quantity="other" msgid="6196382287749539209">"<xliff:g id="NUMBER">%1$s</xliff:g> ຜົນການຊອກຫາ \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</item>
-  </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> ຜົນການຊອກຫາສຳລັບ \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</string>
-    <string name="confirm_clear_search_title" msgid="8510295993632032904">"ລຶບລ້າງ"</string>
-    <string name="confirm_clear_search_text" msgid="8731877031837077478">"ປະຫວັດການຊອກຫາຈະຖືກລຶບລ້າງ."</string>
-    <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"ລຶບລ້າງປະຫວັດການຊອກຫາ"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"ລຶບລ້າງການຊອກຫາຂໍ້ຄວາມກ່ອນໜ້ານີ້ ບໍ່ໃຫ້ສະແດງໃນປ່ອງຊອກຫາ"</string>
-    <string name="save" msgid="6847069284991531310">"ບັນທຶກ"</string>
-    <string name="storage_limits_title" msgid="7074684882530693016">"ຈຳກັດຂໍ້ຄວາມ"</string>
-    <string name="storage_limits_message" msgid="2010501485394745696">"ຈຳກັດຈຳນວນຂໍ້ຄວາມທີ່ທ່ານບັນທຶກຕໍ່ບົດສົນທະນາ?"</string>
-    <string name="storage_limits_setting" msgid="4952781049308537373">"ຕັ້ງຂີດຈຳກັດ"</string>
-    <string name="storage_limits_setting_dismiss" msgid="1433841310158458034">"ບໍ່ມີຈຳກັດ"</string>
-    <string name="too_many_unsent_mms" msgid="4436493698891224126">"ບໍ່ສາມາດສົ່ງຂໍ້ຄວາມໄດ້ໃນຕອນນີ້. ມີຂໍ້ຄວາມ multimedia ທີ່ຍັງບໍ່ໄດ້ສົ່ງຫຼາຍເກີນໄປ."</string>
-    <string name="sending_message" msgid="2054406576361149715">"ກຳລັງສົ່ງ..."</string>
-    <string name="pick_too_many_recipients" msgid="650087588867628044">"ຈຳນວນຜູ່ຮັບຫຼາຍເກີນໄປ"</string>
-    <string name="adding_recipients" msgid="2962810172527532357">"ກຳລັງເພີ່ມຜູ່ຮັບ..."</string>
-    <string name="draft_separator" msgid="5402575086540243019">", "</string>
-    <string name="message_count_format" msgid="4434763220590778012">" <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="message_count_notification" msgid="3629968600032690007">"<xliff:g id="NUMBER">%1$s</xliff:g> ຂໍ້ຄວາມໃໝ່"</string>
-  <plurals name="message_count_notification_overflow">
-    <item quantity="one" msgid="3340591167508150806">"+<xliff:g id="NUMBER">%1$s</xliff:g> ຂໍ້ຄວາມອື່ນໆ"</item>
-    <item quantity="other" msgid="1393002799298501480">"+<xliff:g id="NUMBER">%1$s</xliff:g> ຂໍ້ຄວາມອື່ນໆ"</item>
-  </plurals>
-    <string name="error_state" msgid="5177386717626893507">"ສະຖານະບໍ່ຄົງທີ່"</string>
-    <string name="error_state_text" msgid="7918866106335387710">"ສະຖານະຂອງຫົວຂໍ້ ແລະຜູ່ຮັບຂັດແຍ່ງກັນ. ກະລຸນາສ້າງລາຍງານຂໍ້ຜິດພາດ ແລະແຈ້ງໄປທີ່ http://go/droidanizer"</string>
-  <plurals name="recipient_count">
-    <item quantity="other" msgid="7338580381574463136">"<xliff:g id="NUMBER">%1$s</xliff:g> ຄົນ"</item>
-  </plurals>
-    <string name="disable_notifications_dialog_message" msgid="7644011234972074096">"ຕ້ອງການຢຸດການແຈ້ງເຕືອນຂໍ້ຄວາມຊ້ຳກັນ ຈາກແອັບຯຂໍ້ຄວາມເລີ່ມຕົ້ນ?"</string>
-    <string name="view_more_conversations" msgid="7275920132410734671">"ເບິ່ງບົດສົນທະນາເພີ່ມເຕີມ"</string>
-    <string name="attachment_audio" msgid="2867960243300539143">"ສຽງ"</string>
-    <string name="attachment_slideshow" msgid="5867689101881763318">"ສະໄລ້ໂຊ"</string>
-    <string name="attachment_video" msgid="4252062022156694591">"ວິດີໂອ"</string>
-    <string name="attachment_picture" msgid="3709286281567284296">"ຮູບພາບ"</string>
-    <string name="notification_separator" msgid="2334673105226536422">"  "</string>
-    <string name="enumeration_comma" msgid="213598026698964628">", "</string>
-    <string name="message_timestamp_format" msgid="4188999027493614617">"<xliff:g id="STRING_0">%1$s</xliff:g> - <xliff:g id="STRING_1">%2$s</xliff:g>"</string>
-    <string name="storage_warning_title" msgid="7124740686325942375">"ບ່ອນເກັບຂໍ້ມູນຂອງໂທລະສັບທ່ານເຕັມແລ້ວ"</string>
-    <string name="storage_warning_content" msgid="1100367816649962354">"ທ່ານຈະບໍ່ໄດ້ຮັບຂໍ້ຄວາມ SMS/MMS ໃຫມ່"</string>
-    <string name="label_mms_send_outbox_msg" msgid="3395185162973061099">"MMS ຕື່ນ"</string>
-    <string name="desc_mms_send_outbox_msg" msgid="1837156781311437148">"ສົ່ງ MMS ທັງໝົດອອກຈາກເອົ້າບອກໄປຫາເຄືອຄ່າຍ"</string>
-</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index bc3159ce..2992c485 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Garsas"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Nustatyti išsaugomų pranešimų skaičių"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Begarsis"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Klausti, kurią SIM kortelę naudoti, kaskart išsiuntus pranešimą"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Kelios SIM kortelės"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatiškai nuskaityti"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Automatiškai nuskaityti pranešimus"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automatinis tarptinklinio ryšio nuskaitymas"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"„Messaging“ nėra jūsų SMS programa"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"„<xliff:g id="APPNAME">%s</xliff:g>“ yra jūsų SMS programa"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Tai galite keisti skiltyje „Nustatymai“."</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Pasirinkite SIM kortelę"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM lizdas <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Atšaukti"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Dabartinės pasirinktos SIM nėra. Pasirinkite numatytąją SIM sistemos nustatymuose."</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f3e9a58f..7f599a90 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Signāls"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Iestatīt saglabājamo ziņojumu skaitu"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Klusums"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Sūtot īsziņu, jautāt, kuru SIM karti izmantot"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Vairākas SIM kartes"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automātiski izgūt"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Automātiski izgūt ziņojumus"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Viesabonēšanas automātiska izgūšana"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Ziņojumapmaiņa nav jūsu izvēlētā lietotne īsziņām."</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> ir jūsu izvēlētā lietotne īsziņām"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Varat to mainīt iestatījumos."</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"SIM atlasīšana"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM slots <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Atcelt"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Pašreiz atlasītā SIM karte nav ievietota ierīcē. Izvēlieties noklusējuma SIM karti sistēmas iestatījumos."</string>
 </resources>
diff --git a/res/values-mk-rMK/arrays.xml b/res/values-mk-rMK/arrays.xml
index 1896d627..6eebcebd 100644
--- a/res/values-mk-rMK/arrays.xml
+++ b/res/values-mk-rMK/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"без наслов"</item>
-    <item msgid="2214945158821871846">"без наслов"</item>
   </string-array>
 </resources>
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml
index 0bdd6393..9b2092d1 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk-rMK/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Звук"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Постави број на пораки за зачувување"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"На тивко"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Прашај ме која СИМ-картичка да се користи секојпат кога ќе се испраќа порака"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Повеќе СИМ-картички"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Автоматско преземање"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Автоматско преземање на пораки"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Автоматско преземање во роаминг"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"„Пораки“ не е вашата апликацијата за СМС"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> е вашата апликација за СМС"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Ова можете да го промените во Подесувања"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Изберете СИМ-картичка"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"СИМ-картичка <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Отвор за СИМ-картичка <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Откажи"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Во моментов нема избрано СИМ-картичка. Изберете стнадардна СИМ-картичка во системските поставки."</string>
 </resources>
diff --git a/res/values-ml-rIN/arrays.xml b/res/values-ml-rIN/arrays.xml
index 5a993a0d..44b0307a 100644
--- a/res/values-ml-rIN/arrays.xml
+++ b/res/values-ml-rIN/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"വിഷയമില്ല"</item>
-    <item msgid="2214945158821871846">"വിഷയമൊന്നുമില്ല"</item>
   </string-array>
 </resources>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml
index 2595c36e..b03c47ad 100644
--- a/res/values-ml-rIN/strings.xml
+++ b/res/values-ml-rIN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -20,7 +20,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1503967887341230795">"സന്ദേശം"</string>
+    <string name="app_label" msgid="1503967887341230795">"സന്ദേശമയയ്‌ക്കൽ"</string>
     <string name="new_message" msgid="1530369762346003973">"പുതിയ സന്ദേശം"</string>
     <string name="menu_call_back" msgid="7538482331117914146">"<xliff:g id="NAME">%s</xliff:g> എന്നതിൽ വിളിക്കുക"</string>
     <string name="menu_send_email" msgid="671366308915241664">"<xliff:g id="NAME">%s</xliff:g> എന്നതിലേക്ക് ഇമെയിൽ അയയ്‌ക്കുക"</string>
@@ -87,7 +87,7 @@
     <string name="type_to_compose_text_enter_to_send" msgid="3539985471008581265">"സന്ദേശം ടൈപ്പുചെയ്യുക"</string>
     <string name="open_keyboard_to_compose_message" msgid="7860109685511253191">"സന്ദേശം ടൈപ്പുചെയ്യാൻ കീബോർഡ് തുറക്കുക"</string>
     <string name="sending_disabled_not_default_app" msgid="6685337318181265136">"അയയ്‌ക്കൽ പ്രവർത്തനരഹിതമാക്കി"</string>
-    <string name="compose_disabled_toast" msgid="1838175321052707875">"SMS എഴുതാൻ അപ്ലിക്കേഷനില്ലാത്തതിനാൽ എഴുതിത്തുടങ്ങാനാവില്ല."</string>
+    <string name="compose_disabled_toast" msgid="1838175321052707875">"രചിക്കാനാകില്ല. സ്ഥിര SMS അപ്ലിക്കേഷനല്ല."</string>
     <string name="compressing" msgid="1961357529661045180">"ചിത്രം വളരെ വലുതാണ്. കംപ്രസ്സുചെയ്യുന്നു…"</string>
     <string name="unsupported_media_format" msgid="1350489690977363764">"പിന്തുണയ്‌ക്കാത്ത <xliff:g id="NAME">%1$s</xliff:g> ഫോർമാറ്റ്."</string>
     <string name="select_different_media" msgid="6241623357299382183">"മറ്റൊരു <xliff:g id="NAME">%1$s</xliff:g> തിരഞ്ഞെടുക്കുക."</string>
@@ -162,19 +162,19 @@
     <string name="pref_summary_sms_disabled" msgid="8975773722051230744">"സന്ദേശമയയ്‌ക്കൽ, നിങ്ങളുടെ സ്ഥിര SMS അപ്ലിക്കേഷനാക്കാൻ സ്‌പർശിക്കുക"</string>
     <string name="pref_title_sms_enabled" msgid="1857849790200375277">"SMS പ്രവർത്തനക്ഷമമാക്കി"</string>
     <string name="pref_summary_sms_enabled" msgid="2106125420361911250">"നിങ്ങളുടെ സ്ഥിര SMS അപ്ലിക്കേഷൻ മാറ്റാൻ സ്‌പർശിക്കുക"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"നിങ്ങളുടെ സിം കാർഡിൽ സംഭരിച്ചിരിക്കുന്ന സന്ദേശങ്ങൾ നിയന്ത്രിക്കുക"</string>
+    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"നിങ്ങളുടെ SIM കാർഡിൽ സംഭരിച്ചിരിക്കുന്ന സന്ദേശങ്ങൾ നിയന്ത്രിക്കുക"</string>
     <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"നിങ്ങൾ അയയ്‌ക്കുന്ന ഓരോ സന്ദേശത്തിനായും ഒരു ഡെലിവറി റിപ്പോർട്ട് അഭ്യർത്ഥിക്കുക"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"അയയ്ക്കുന്ന ഓരോ സന്ദേശത്തിനും റീഡ് റിപ്പോർട്ട് ആവശ്യപ്പെടുക"</string>
+    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"നിങ്ങൾ അയയ്‌ക്കുന്ന ഓരോ സന്ദേശത്തിനായും ഒരു റീഡ് റിപ്പോർട്ട് അഭ്യർത്ഥിക്കുക"</string>
     <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"നിങ്ങൾ അയയ്‌ക്കുന്ന ഓരോ സന്ദേശത്തിനായും ഒരു ഡെലിവറി റിപ്പോർട്ട് അഭ്യർത്ഥിക്കുക"</string>
     <string name="pref_summary_auto_delete" msgid="7719538116486177613">"പരിധിയിലെത്തിച്ചേർന്നതിനാൽ പഴയ സന്ദേശങ്ങൾ ഇല്ലാതാക്കുക"</string>
     <string name="pref_summary_delete_limit" msgid="597128041393045216">"ഓരോ സംഭാഷണത്തിനും <xliff:g id="COUNT">%1$s</xliff:g> സന്ദേശങ്ങൾ"</string>
     <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"ഒന്നിലധികം സ്വീകർത്താക്കൾ ഉള്ളപ്പോൾ ഒരൊറ്റ സന്ദേശം അയയ്‌ക്കാൻ MMS ഉപയോഗിക്കുക."</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"സിം കാർഡ് സന്ദേശങ്ങൾ നിയന്ത്രിക്കുക"</string>
+    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"SIM കാർഡ് സന്ദേശങ്ങൾ നിയന്ത്രിക്കുക"</string>
     <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"ഡെലിവറി റിപ്പോർട്ടുകൾ"</string>
-    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"ഗ്രൂപ്പ് സന്ദേശം"</string>
+    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"ഗ്രൂപ്പ് സന്ദേശമയയ്‌ക്കൽ"</string>
     <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"റീഡ് റിപ്പോർട്ടുകൾ"</string>
     <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"ഡെലിവറി റിപ്പോർട്ടുകൾ"</string>
-    <string name="pref_title_auto_delete" msgid="7227835692631701134">"പഴയ സന്ദേശങ്ങൾ കളയുക"</string>
+    <string name="pref_title_auto_delete" msgid="7227835692631701134">"പഴയ സന്ദേശങ്ങൾ ഇല്ലാതാക്കുക"</string>
     <string name="pref_title_sms_delete" msgid="6890538316799296878">"വാചക സന്ദേശ പരിധി"</string>
     <string name="pref_title_mms_delete" msgid="7265878070847351664">"മൾട്ടിമീഡിയ സന്ദേശ പരിധി"</string>
     <string name="pref_title_notification_enabled" msgid="9118792213953729414">"അറിയിപ്പുകൾ"</string>
@@ -182,12 +182,10 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ശബ്ദം"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"സംരക്ഷിക്കേണ്ട സന്ദേശങ്ങളുടെ എണ്ണം സജ്ജമാക്കുക"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"നിശബ്‌ദം"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"സന്ദേശം അയയ്ക്കുമ്പോഴെല്ലാം ഏത് സിം ആണ് ഉപയോഗിക്കേണ്ടതെന്ന് ചോദിക്കുക"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"മൾട്ടി സിം"</string>
-    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"യാന്ത്രികമായി ലഭ്യമാക്കുക"</string>
-    <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"സന്ദേശങ്ങൾ യാന്ത്രികമായി ലഭ്യമാക്കുക"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"റോമിംഗിൽ യാന്ത്രികമായി ലഭ്യമാക്കുക"</string>
-    <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"റോമിംഗിൽ സന്ദേശങ്ങൾ യാന്ത്രികമായി ലഭ്യമാക്കുക"</string>
+    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"യാന്ത്രികമായി വീണ്ടെടുക്കുക"</string>
+    <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"സന്ദേശങ്ങൾ യാന്ത്രികമായി വീണ്ടെടുക്കുക"</string>
+    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"റോമിംഗിൽ യാന്ത്രികമായി വീണ്ടെടുക്കുക"</string>
+    <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"റോമിംഗിലായിരിക്കുമ്പോൾ സന്ദേശങ്ങൾ യാന്ത്രികമായി വീണ്ടെടുക്കുക"</string>
     <string name="confirm_dialog_title" msgid="2187213750475782725">"ഇല്ലാതാക്കണോ?"</string>
     <string name="confirm_dialog_locked_title" msgid="8179085718150932242">"ലോക്കുചെയ്‌ത സന്ദേശം ഇല്ലാതാക്കണോ?"</string>
   <plurals name="confirm_delete_conversation">
@@ -198,8 +196,8 @@
     <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"എല്ലാ ത്രെഡുകളും ഇല്ലാതാക്കും."</string>
     <string name="confirm_delete_message" msgid="9121480656609809591">"സന്ദേശം ഇല്ലാതാക്കും."</string>
     <string name="confirm_delete_locked_message" msgid="7203411948190100955">"ലോക്കുചെയ്‌ത ഈ സന്ദേശം ഇല്ലാതാക്കണോ?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"സിം കാർഡിലെ എല്ലാ സന്ദേശങ്ങളും ഇല്ലാതാക്കും."</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"സിം കാർഡിലെ ഈ സന്ദേശം ഇല്ലാതാക്കും."</string>
+    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"SIM കാർഡിലെ എല്ലാ സന്ദേശങ്ങളും ഇല്ലാതാക്കും."</string>
+    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"SIM കാർഡിലെ ഈ സന്ദേശം ഇല്ലാതാക്കും."</string>
     <string name="delete_unlocked" msgid="7545321606698162261">"ലോക്കുചെയ്‌ത സന്ദേശങ്ങൾ ഇല്ലാതാക്കുക"</string>
     <string name="delete" msgid="1409973060081564612">"ഇല്ലാതാക്കുക"</string>
     <string name="select_conversations" msgid="7816517565640002844">"സംഭാഷണങ്ങൾ തിരഞ്ഞെടുക്കുക"</string>
@@ -219,7 +217,7 @@
     <string name="saved_label" msgid="4183160415593488207">"സംരക്ഷിച്ചവ: "</string>
     <string name="subject_label" msgid="8721241914144101631">"വിഷയം: "</string>
     <string name="message_size_label" msgid="4698016210013319786">"സന്ദേശ വലുപ്പം: "</string>
-    <string name="priority_label" msgid="7397600367853359607">"പ്രധാനപ്പെട്ടവ: "</string>
+    <string name="priority_label" msgid="7397600367853359607">"മുൻഗണന: "</string>
     <string name="priority_high" msgid="5627897207952009214">"ഉയർന്നത്"</string>
     <string name="priority_normal" msgid="5715227727384683550">"സാധാരണം"</string>
     <string name="priority_low" msgid="8928782666023373987">"കുറഞ്ഞത്"</string>
@@ -232,9 +230,9 @@
     <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"ടാബ്‌ലെറ്റ് മെമ്മറിയിലേക്ക് പകർത്തുക"</string>
     <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"ഫോൺ മെമ്മറിയിലേക്ക് പകർത്തുക"</string>
     <string name="sim_delete" msgid="610790510655316922">"ഇല്ലാതാക്കുക"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"സിം കാർഡിലെ വാചക സന്ദേശങ്ങൾ"</string>
+    <string name="sim_manage_messages_title" msgid="3989147182100584333">"SIM കാർഡിലെ വാചക സന്ദേശങ്ങൾ"</string>
     <string name="sim_view" msgid="1997173541766393706">"കാണുക"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"സിം കാർഡിൽ സന്ദേശങ്ങളൊന്നുമില്ല."</string>
+    <string name="sim_empty" msgid="2356766833071636297">"SIM കാർഡിൽ സന്ദേശങ്ങളൊന്നുമില്ല."</string>
     <string name="delivery_header_title" msgid="5361719578869045764">"റിപ്പോര്‍ട്ടുചെയ്യുക"</string>
     <string name="status_none" msgid="8253075950774894961">"(ഒന്നുമില്ല)"</string>
     <string name="status_pending" msgid="2739860824607984892">"തീര്‍ച്ചപ്പെടുത്താത്തവ"</string>
@@ -260,10 +258,10 @@
     <string name="notification_multiple_title" msgid="332602028959557541">"പുതിയ സന്ദേശങ്ങൾ"</string>
     <string name="notification_failed_multiple" msgid="6192531993698497229">"<xliff:g id="COUNT">%s</xliff:g> സന്ദേശങ്ങൾ അയയ്‌ക്കാനായില്ല"</string>
     <string name="notification_failed_multiple_title" msgid="1112032024904397126">"സന്ദേശങ്ങൾ അയയ്‌ക്കാനായില്ല"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"സിം കാർഡ് നിറഞ്ഞു"</string>
+    <string name="sim_full_title" msgid="1809829051697702810">"SIM കാർഡ് നിറഞ്ഞു"</string>
     <string name="sim_full_body" msgid="6241664980790322925">"റൂമിൽ കൂടുതൽ ഇടം കണ്ടെത്തുന്നതിന് ചില സന്ദേശങ്ങൾ ഇല്ലാതാക്കുക."</string>
     <string name="sms_full_title" msgid="6041287140125011854">"വാചക സന്ദേശ മെമ്മറി നിറഞ്ഞു"</string>
-    <string name="sms_full_body" msgid="4885861852397651868">"മെമ്മറി നിറഞ്ഞതിനാൽ ഒരു ഇൻകമിംഗ് സന്ദേശം നിരസിക്കപ്പെട്ടു. കുറച്ച് പഴയ സന്ദേശങ്ങൾ ഇല്ലാതാക്കുക."</string>
+    <string name="sms_full_body" msgid="4885861852397651868">"മെമ്മറി നിറഞ്ഞതിനാൽ ഒരു ഇൻകമിംഗ് സന്ദേശം നിരസിക്കപ്പെട്ടു. ചില പഴയ സന്ദേശങ്ങൾ ഇല്ലാതാക്കുക."</string>
     <string name="sms_rejected_title" msgid="8548394922491529811">"വാചക സന്ദേശം നിരസിക്കപ്പെട്ടു"</string>
     <string name="sms_rejected_body" msgid="7813671133968158562">"ഒരു അജ്ഞാത കാരണത്താൽ ഒരു ഇൻകമിംഗ് സന്ദേശം നിരസിക്കപ്പെട്ടു."</string>
     <string name="type_audio" msgid="3842064092332309756">"ഓഡിയോ"</string>
@@ -306,9 +304,9 @@
     <string name="edit_slide_activity" msgid="8752829671778696983">"സ്ലൈഡ് എഡിറ്റുചെയ്യുക"</string>
     <string name="slideshow_activity" msgid="5658249461317434432">"സ്ലൈഡ്ഷോ"</string>
     <string name="class_0_message_activity" msgid="6631339964159861048">"ക്ലാസ് 0 സന്ദേശം"</string>
-    <string name="search_label" msgid="6042598929386174964">"സന്ദേശം"</string>
-    <string name="search_hint" msgid="7273727663577472044">"സന്ദേശങ്ങൾ തിരയുക"</string>
-    <string name="search" msgid="7560238620274735199">"സന്ദേശം"</string>
+    <string name="search_label" msgid="6042598929386174964">"സന്ദേശമയയ്‌ക്കൽ"</string>
+    <string name="search_hint" msgid="7273727663577472044">"സന്ദേശമയയ്‌ക്കൽ തിരയുക"</string>
+    <string name="search" msgid="7560238620274735199">"സന്ദേശമയയ്‌ക്കൽ"</string>
     <string name="search_setting_description" msgid="4104004595086437572">"നിങ്ങളുടെ സന്ദേശങ്ങളിലെ വാചകം"</string>
     <string name="search_empty" msgid="2109551478056039278">"പൊരുത്തങ്ങളൊന്നുമില്ല."</string>
   <plurals name="search_results_title">
@@ -356,12 +354,5 @@
     <string name="desc_mms_send_outbox_msg" msgid="1837156781311437148">"ഔട്ട്‌ബോക്‌സിൽ നിന്നും എല്ലാ MMS-കളും നെറ്റ്‌വർക്കിലേക്ക് അയയ്‌ക്കുക"</string>
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"സന്ദേശമയയ്‌ക്കൽ നിങ്ങളുടെ SMS അപ്ലിക്കേഷനല്ല"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> ആണ് നിങ്ങളുടെ SMS അപ്ലിക്കേഷൻ"</string>
-    <string name="banner_sms_promo_message" msgid="3536714414252763826">"ഇത് ക്രമീകരണങ്ങളിൽ മാറ്റാനാകും"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"സിം തിരഞ്ഞെടുക്കുക"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"സിം <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"സിം സ്ലോട്ട് <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"റദ്ദാക്കുക"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"..."</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"തിരഞ്ഞെടുത്ത സിം നിലവിലില്ല. സിസ്‌റ്റം ക്രമീകരണങ്ങളിൽ നിങ്ങളുടെ സ്ഥിര സിം തിരഞ്ഞെടുക്കുക."</string>
+    <string name="banner_sms_promo_message" msgid="3536714414252763826">"നിങ്ങൾക്ക് ഇത് ക്രമീകരണങ്ങളിൽ മാറ്റാനാകും"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 26b94217..cef32fac 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Дуу"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Хадгалах зурвасын тоог оруулна уу"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Чимээгүй"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Зурвас илгээх бүрт аль СИМ ашиглахыг асуух"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Олон-СИМ"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Автомат-татагч"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Зурвасуудыг автоматаар татах"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Роумингын автомат-татагч"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Messaging нь таны SMS апп биш байна"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> нь таны SMS апп байна"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Та үүнийг Тохиргоо дотроос өөрчилж болно"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"SIM  сонгоно уу"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM Слот <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Цуцлах"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Одоогийн сонгогдсон SIM байхгүй байна. Системийн тохиргоо дотроос өөрийн үндсэн SIM-г сонгоно уу."</string>
 </resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
deleted file mode 100644
index 94f19101..00000000
--- a/res/values-mn/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1503967887341230795">"Зурвас"</string>
-    <string name="new_message" msgid="1530369762346003973">"Шинэ зурвас"</string>
-    <string name="menu_call_back" msgid="7538482331117914146">"<xliff:g id="NAME">%s</xliff:g> руу залгах"</string>
-    <string name="menu_send_email" msgid="671366308915241664">"<xliff:g id="NAME">%s</xliff:g> руу имэйл илгээх"</string>
-    <string name="menu_compose_new" msgid="3763437973691046238">"Бичих"</string>
-    <string name="menu_preferences" msgid="4693148116114749414">"Тохиргоо"</string>
-    <string name="menu_add_address_to_contacts" msgid="4491980950419914944">"<xliff:g id="CONTACTEMAILORNUMBER">%s</xliff:g>-г People-д нэмэх"</string>
-    <string name="menu_call" msgid="5877123227307074690">"Залгах"</string>
-    <string name="menu_search" msgid="2289469305728821360">"Хайх"</string>
-    <string name="menu_delete_all" msgid="808729454898114735">"Бүх хэлхээсийг устгах"</string>
-    <string name="menu_delete" msgid="1851666911396479006">"Хэлхээсийг устгах"</string>
-    <string name="menu_view" msgid="7448852683948080108">"Хэлхээсийг харах"</string>
-    <string name="menu_debug_dump" msgid="6855869130206549643">"DEBUG DUMP"</string>
-    <string name="refreshing" msgid="987335057871404222">"Шинэчилж байна…"</string>
-    <string name="menu_cell_broadcasts" msgid="5646161375983084660">"Үүрэн нэвтрүүлэг"</string>
-    <string name="has_draft" msgid="2487465595514636160">"Ноорог"</string>
-    <string name="no_subject_view" msgid="7795086723069563537">"(Гарчиггүй)"</string>
-    <string name="messagelist_sender_self" msgid="3579016854116401602">"Би"</string>
-    <string name="view_slideshow" msgid="4990460971211388453">"Слайдшоу үзэх"</string>
-    <string name="view_message_details" msgid="7613457646645796831">"Дэлгэрэнгүй үзэх"</string>
-    <string name="view_delivery_report" msgid="8219095994071575215">"Репорт үзэх"</string>
-    <string name="delete_message" msgid="6442394955910357234">"Устгах"</string>
-    <string name="expire_on" msgid="4436268382742593921">"Дуусах: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="kilobyte" msgid="534782148965716631">"KB"</string>
-    <string name="undelivered_msg_dialog_title" msgid="7479433403599785755">"Хүргэгдээгүй зурвас"</string>
-    <string name="undelivered_msg_dialog_body" msgid="4789268239627694551">"Энэ зурвасыг илгээж чадсангүй.\nХийсэн оролдлого: <xliff:g id="MESSAGE">%s</xliff:g>."</string>
-    <string name="undelivered_sms_dialog_body" msgid="4203703285563450868">"Энэ зурвасыг илгээж чадсангүй."</string>
-    <string name="delete_thread" msgid="757258847736632791">"Хэлхээсийг устгах"</string>
-    <string name="menu_forward" msgid="9026858380050046756">"Дамжуулах"</string>
-    <string name="download" msgid="4488877642230207631">"Татаж авах"</string>
-    <string name="downloading" msgid="1779557575565350637">"Татаж авч байна"</string>
-    <string name="inline_subject" msgid="4057621785274119260">"&lt;Гарчиг: <xliff:g id="SUBJECT">%s</xliff:g>&gt;"</string>
-    <string name="drm_protected_text" msgid="1396394157870730742">"* DRM хамгаалагдсан текст *"</string>
-    <string name="insufficient_drm_rights" msgid="6989074725969164383">"DRM эрх хангалттай бус байна."</string>
-    <string name="copy_message_text" msgid="4296252229544252834">"Текстийг хуулах"</string>
-    <string name="message_options" msgid="6838806653341967550">"Зурвасын тохиргоо"</string>
-    <string name="slideshow_options" msgid="3501759384739796431">"Слайдшоуны тохиргоо"</string>
-    <string name="done" msgid="7479926268660505871">"Дууссан"</string>
-    <string name="move_up" msgid="7307578107431739359">"Дээш зөөх"</string>
-    <string name="move_down" msgid="6356509518429479053">"Доош зөөх"</string>
-    <string name="remove_slide" msgid="2225604354024914900">"Слайдыг устгах"</string>
-    <string name="add_slide" msgid="9140721399423564187">"Слайд нэмэх"</string>
-    <string name="add_slide_hint" msgid="7351356961076244584">"Шинэ слайд үүсгэхийн тулд хүрнэ үү."</string>
-    <string name="discard_slideshow" msgid="5054239124146413609">"Слайдшоуг цуцлах"</string>
-    <string name="slide_show_part" msgid="5077675385448696846">"Хэсэг <xliff:g id="PART">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="remove_text" msgid="2164068850029476539">"Текстийг устгах"</string>
-    <string name="add_picture" msgid="7819574884962571479">"Зураг нэмэх"</string>
-    <string name="remove_picture" msgid="6378701749074289096">"Зургийг устгах"</string>
-    <string name="add_music" msgid="3827442822987116233">"Хөгжим нэмэх"</string>
-    <string name="remove_music" msgid="858889733416015223">"Хөгжмийг устгах"</string>
-    <string name="add_video" msgid="7816866867806595144">"Видео нэмэх"</string>
-    <string name="remove_video" msgid="5258603891528497799">"Видеог устгах"</string>
-    <string name="to_hint" msgid="224029549150332986">"Хэнд"</string>
-    <string name="subject_hint" msgid="4296714962311604126">"Гарчиг"</string>
-    <string name="add_attachment" msgid="7103751293360532684">"Хавсаргах"</string>
-    <string name="add_subject" msgid="7616134948428265870">"Гарчиг нэмэх"</string>
-    <string name="discard" msgid="1624800293064498479">"Цуцлах"</string>
-    <string name="view" msgid="7929667761715467136">"Үзэх"</string>
-    <string name="replace" msgid="7587904998114459388">"Солих"</string>
-    <string name="remove" msgid="4625444913256213175">"Устгах"</string>
-    <string name="send" msgid="4589898724889248486">"Илгээх"</string>
-    <string name="mms" msgid="1587631213714914559">"MMS"</string>
-    <string name="send_mms" msgid="2933162044872550662">"MMS илгээх"</string>
-    <string name="all_threads" msgid="2663426830306307194">"Бүх хэлхээсүүд"</string>
-    <string name="type_to_compose_text_enter_to_send" msgid="3539985471008581265">"Зурвас бичнэ үү"</string>
-    <string name="open_keyboard_to_compose_message" msgid="7860109685511253191">"Зурвас бичихийн тулд гар нээнэ үү"</string>
-    <string name="compressing" msgid="1961357529661045180">"Зураг хэтэрхий том тул шахаж байна…"</string>
-    <string name="unsupported_media_format" msgid="1350489690977363764">"Дэмжигддэггүй <xliff:g id="NAME">%1$s</xliff:g> формат."</string>
-    <string name="select_different_media" msgid="6241623357299382183">"Өөр <xliff:g id="NAME">%1$s</xliff:g> сонгоно уу."</string>
-    <string name="exceed_message_size_limitation" msgid="6027753647094742437">"Зурвасын хэмжээний хязгаарт хүрэв."</string>
-    <string name="message_too_big_for_video" msgid="2639367545165352543">"Зурвас видео хавсаргахад хэтэрхий том байна."</string>
-    <string name="failed_to_add_media" msgid="7207464170168708485">"Та энэ <xliff:g id="NAME">%1$s</xliff:g>-г өөрийн зурваст нэмэх боломжгүй."</string>
-    <string name="failed_to_resize_image" msgid="5608354151631833669">"Зургийн хэмжээг дахин өөрчлөөгүй."</string>
-    <string name="resize_image_error_information" msgid="3783200130776554475">"Хэмжээг дахин өөрчилсөн ч энэ зураг илгээхэд хэт том байна."</string>
-    <string name="forward_prefix" msgid="276280492803486464">"Дамжуулсан: "</string>
-    <string name="discard_message_reason" msgid="2667664943003796133">"Таны зурвасын хүлээн авагч буруу байгаа учир цуцлагдах болно."</string>
-    <string name="has_invalid_recipient" msgid="1485388396900997383">"Хүлээн авагч буруу: &lt;<xliff:g id="NAME">%1$s</xliff:g>&gt;"</string>
-    <string name="invalid_destination" msgid="4573835601024786416">"Очих хаяг буруу."</string>
-    <string name="service_not_activated" msgid="9178218144019626176">"Сүлжээнд үйлчилгээг идэвхжүүлээгүй байна."</string>
-    <string name="service_message_not_found" msgid="1908877102600048515">"Зурвасын хугацаа өнгөрсөн буюу байхгүй."</string>
-    <string name="service_network_problem" msgid="4583269174855943025">"Сүлжээний асуудлаас шалтгаалан илгээж чадсангүй."</string>
-    <string name="invalid_recipient_message" msgid="6465343105010999068">"Хүлээн авагчийг залруулахгүй бол зурвасыг хүлээн авахгүй."</string>
-    <string name="cannot_send_message" msgid="3414307479833622644">"Зурвасыг илгээх боломжгүй"</string>
-    <string name="cannot_send_message_reason" msgid="8745080126044054343">"Таны зурвасын хүлээн авагч буруу байна."</string>
-    <string name="cannot_forward_drm_obj" msgid="5047623751430559077">"Зурваст байгаа DRM объектыг дамжуулах боломжгүй."</string>
-    <string name="converting_to_picture_message" msgid="2980023239017588627">"Мультимедиа зурвас руу хөрвүүлж байна…"</string>
-    <string name="cannot_add_slide_anymore" msgid="4631404749618820994">"Өөр слайд нэмж болохгүй."</string>
-    <string name="cannot_add_picture_and_video" msgid="4954353772391381447">"Нэг слайданд видео болон зураг нэмж болохгүй."</string>
-    <string name="cannot_save_message" msgid="3375907366965264446">"Зурвасыг хадгалах боломжгүй."</string>
-    <string name="message_saved_as_draft" msgid="2503018972659880692">"Зурвасыг ноорогт хадгалав."</string>
-    <string name="too_many_recipients" msgid="7003415094007176931">"Зурваст хэт олон хүлээн авагч байна (<xliff:g id="CURRENTCOUNT">%1$s</xliff:g>). Хүлээн авагчийн хязгаар <xliff:g id="MAXLIMIT">%2$s</xliff:g>."</string>
-    <string name="too_many_attachments" msgid="3774037894899750070">"Хавсралтын тооны хязгаар <xliff:g id="MAXLIMIT">%1$s</xliff:g> байна. Зөвхөн эхний <xliff:g id="CURRENTCOUNT">%2$s</xliff:g> нэмэгдэх болно."</string>
-    <string name="adding_attachments_title" msgid="2034535554212405529">"Хавсралт нэмж байна"</string>
-    <string name="adding_attachments" msgid="5871373105122355632">"Слайдшоунд нэмэгдэх хооронд хүлээнэ үү."</string>
-    <string name="building_slideshow_title" msgid="1232338692400726385">"Слайдшоу үүсгэх"</string>
-    <string name="cannot_play_audio" msgid="253920977253666735">"Аудиог тоглуулах боломжгүй."</string>
-    <string name="preview" msgid="5438149136136446756">"Урдьчилж харах"</string>
-    <string name="preview_slideshow" msgid="6824095909448728427">"Урдьчилж харах"</string>
-    <string name="replace_image" msgid="3171240952601443619">"Зургийг солих"</string>
-    <string name="duration_sec" msgid="6617032324007824096">"Үргэлжлэх хугацаа (<xliff:g id="DURATION">%s</xliff:g> сек)"</string>
-    <string name="duration_selector_title" msgid="5981097971537625852">"Слайдын үргэлжлэх хугацаа "</string>
-    <string name="layout_selector_title" msgid="7344600117972450771">"Слайдшоуны байршил "</string>
-    <string name="layout_top" msgid="6811021650398972346">"Байршил (дээр)"</string>
-    <string name="layout_bottom" msgid="5822765871095491843">"Байршил (доор)"</string>
-    <string name="type_to_compose_text_or_leave_blank" msgid="7769792471457574059">"Зурвас бичих буюу хоосон орхино уу"</string>
-    <string name="duration_not_a_number" msgid="2856636898040421237">"Үргэлжлэх хугацаа тоогоор байх шаардлагатай."</string>
-    <string name="duration_zero" msgid="3549377790195185977">"Үргэлжлэх хугацаа тэгээс их байх шаардлагатай."</string>
-    <string name="secs" msgid="6886003523109967972">"сек"</string>
-  <string-array name="select_dialog_items">
-    <item msgid="4840183714016984112">"1 секунд"</item>
-    <item msgid="3734955613666864447">"2 секунд"</item>
-    <item msgid="6032232473048379828">"3 секунд"</item>
-    <item msgid="5978471781525927827">"4 секунд"</item>
-    <item msgid="4888440297621208402">"5 секунд"</item>
-    <item msgid="6047246213264166841">"6 секунд"</item>
-    <item msgid="2327501250056533797">"7 секунд"</item>
-    <item msgid="3400770414689795703">"8 секунд"</item>
-    <item msgid="4358760614161107970">"9 секунд"</item>
-    <item msgid="2618179407176906471">"10 секунд"</item>
-    <item msgid="7786079681602275449">"Бусад"</item>
-  </string-array>
-    <string name="menu_view_contact" msgid="1414670584423909451">"Харилцагчийг харах"</string>
-    <string name="menu_add_to_contacts" msgid="1258127580972228970">"People-д нэмэх"</string>
-    <string name="hidden_sender_address" msgid="2776075636669924968">"Илгээгчийн хаяг нууцлагдсан"</string>
-    <string name="yes" msgid="3246158147503160811">"Тийм"</string>
-    <string name="no" msgid="4289742508556913860">"Цуцлах"</string>
-    <string name="set" msgid="4642365398263275979">"Тохируулах"</string>
-    <string name="play" msgid="1888432400937785115">"Тоглуулах"</string>
-    <string name="edit" msgid="5912118407791492696">"Засах"</string>
-    <string name="try_to_send" msgid="1996751738286080976">"Илгээхээр оролдож үзнэ үү"</string>
-    <string name="preferences_title" msgid="6650089610332670157">"Тохиргоо"</string>
-    <string name="restore_default" msgid="7165341506551155053">"Үндсэн тохиргоог сэргээх"</string>
-    <string name="pref_notification_settings_title" msgid="6420782563630369776">"Мэдэгдэл"</string>
-    <string name="pref_mms_settings_title" msgid="55618772118264355">"Мультимедиа (MMS) зурвасууд"</string>
-    <string name="pref_sms_settings_title" msgid="5173078369851066881">"Текст (SMS) зурвасууд"</string>
-    <string name="pref_sms_storage_title" msgid="9001233319190616445">"Хадгалах сан"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"Өөрийн SIM картад хадгалагдсан зурвасуудыг удирдах"</string>
-    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"Өөрийн илгээх зурвас бүрт хүргэлтийн репорт хүсээрэй"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"Өөрийн илгээх зурвас бүрт уншилтын репорт хүсээрэй"</string>
-    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"Өөрийн илгээх зурвас бүрт хүргэлтийн репорт хүсээрэй"</string>
-    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"Хязгаарт хүрмэгц хуучин зурвасуудыг устгах"</string>
-    <string name="pref_summary_delete_limit" msgid="597128041393045216">"Харилцаа тус бүрт <xliff:g id="COUNT">%1$s</xliff:g> зурвас"</string>
-    <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"Олон хүлээн авагчид нэг зурвас явуулахдаа MMS ашиглаарай"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"SIM картын зурвасуудыг удирдах"</string>
-    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"Хүргэлтийн репортууд"</string>
-    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"Бүлгэмийн зурвас"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Уншилтын репорт"</string>
-    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Хүргэлтийн репортууд"</string>
-    <string name="pref_title_auto_delete" msgid="7227835692631701134">"Хуучин зурвасуудыг устгах"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"Текст зурвасын хязгаар"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"Мультимедиа зурвасын хязгаар"</string>
-    <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Мэдэгдэл"</string>
-    <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Чичиргээ"</string>
-    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Дуу"</string>
-    <string name="pref_messages_to_save" msgid="3202539743892934926">"Хадгалах зурвасын тоог оруулна уу"</string>
-    <string name="silent_ringtone" msgid="7981237991326592780">"Чимээгүй"</string>
-    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Автомат-татагч"</string>
-    <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Зурвасуудыг автоматаар татах"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Роумингын автомат-татагч"</string>
-    <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"Роуминг хийсэн үедээ зурвасуудыг автоматаар татах"</string>
-    <string name="confirm_dialog_title" msgid="2187213750475782725">"Устгах уу?"</string>
-    <string name="confirm_dialog_locked_title" msgid="8179085718150932242">"Түгжигдсэн зурвасыг устгах уу?"</string>
-  <plurals name="confirm_delete_conversation">
-    <item quantity="one" msgid="7509396981963472833">"Нэг харилцаа устгагдах болно."</item>
-    <item quantity="other" msgid="4076915774012081811">"<xliff:g id="NUMBER">%1$s</xliff:g> харилцаа устгагдах болно."</item>
-  </plurals>
-    <string name="confirm_delete_conversation" msgid="6115966687389279855">"Хэлхээс бүхэлдээ устгагдах болно."</string>
-    <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"Бүх хэлхээс устгагдах болно."</string>
-    <string name="confirm_delete_message" msgid="9121480656609809591">"Энэ зурвас устах болно."</string>
-    <string name="confirm_delete_locked_message" msgid="7203411948190100955">"Энэ түгжигдсэн зурвасыг устгах уу?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"SIM карт дээрх бүх зурвасыг устгах болно."</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"SIM карт дээрх энэ зурвасыг устгах болно."</string>
-    <string name="delete_unlocked" msgid="7545321606698162261">"Түгжигдсэн зурвасуудыг устгах"</string>
-    <string name="delete" msgid="1409973060081564612">"Устгах"</string>
-    <string name="select_conversations" msgid="7816517565640002844">"Харилцаануудыг сонгох"</string>
-    <string name="no_conversations" msgid="6773767655149258445">"Харилцаа алга байна."</string>
-    <string name="loading_conversations" msgid="5510430408235967094">"Харилцааг ачаалж байна."</string>
-    <string name="cannot_get_details" msgid="850292987983026806">"Мэдээллийг авах боломжгүй."</string>
-    <string name="message_details_title" msgid="9223295113731634528">"Зурвасын мэдээлэл"</string>
-    <string name="message_type_label" msgid="7975373966795945566">"Төрөл: "</string>
-    <string name="text_message" msgid="8196464345251877972">"Текст зурвас"</string>
-    <string name="multimedia_message" msgid="1512644521083533071">"Мультимедиа зурвас"</string>
-    <string name="multimedia_notification" msgid="4124031788554972308">"Мультимедиа зурвасан мэдэгдэл"</string>
-    <string name="from_label" msgid="2055117571548171397">"Илгээгч: "</string>
-    <string name="to_address_label" msgid="5837363600471845801">"Хэнд: "</string>
-    <string name="bcc_label" msgid="530867161453958774">"Bcc: "</string>
-    <string name="sent_label" msgid="2722190650145251584">"Илгээсэн: "</string>
-    <string name="received_label" msgid="8618029024731693906">"Хүлээн авсан: "</string>
-    <string name="saved_label" msgid="4183160415593488207">"Хадгалагдсан "</string>
-    <string name="subject_label" msgid="8721241914144101631">"Гарчиг: "</string>
-    <string name="message_size_label" msgid="4698016210013319786">"Зурвасын хэмжээ: "</string>
-    <string name="priority_label" msgid="7397600367853359607">"Ач холбогдол: "</string>
-    <string name="priority_high" msgid="5627897207952009214">"Их"</string>
-    <string name="priority_normal" msgid="5715227727384683550">"Энгийн"</string>
-    <string name="priority_low" msgid="8928782666023373987">"Бага"</string>
-    <string name="message_class_label" msgid="5115748690481550562">"Зурвасын ангилал: "</string>
-    <string name="error_code_label" msgid="5810068247647058769">"Алдааны код: "</string>
-    <string name="menu_edit" msgid="3056513240155967777">"Засах"</string>
-    <string name="menu_delete_messages" msgid="2610286783513247420">"Зурвасуудыг устгах"</string>
-    <string name="menu_lock" msgid="7603793126077557472">"Түгжих"</string>
-    <string name="menu_unlock" msgid="6662865558677424039">"Тайлах"</string>
-    <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"Таблетын санах ойд хуулах"</string>
-    <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"Утасны санах ойд хуулах"</string>
-    <string name="sim_delete" msgid="610790510655316922">"Устгах"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"SIM карт дээрх текст зурвасууд"</string>
-    <string name="sim_view" msgid="1997173541766393706">"Үзэх"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"SIM картад зурвас байхгүй."</string>
-    <string name="delivery_header_title" msgid="5361719578869045764">"Репорт"</string>
-    <string name="status_none" msgid="8253075950774894961">"(Байхгүй)"</string>
-    <string name="status_pending" msgid="2739860824607984892">"Хүлээлтэнд"</string>
-    <string name="status_read" msgid="7576195253780627332">"Уншсан"</string>
-    <string name="status_received" msgid="7264334589461906965">"Хүлээн авсан"</string>
-    <string name="status_failed" msgid="1998776666856593544">"Амжилтгүй"</string>
-    <string name="status_unread" msgid="8555305495998700198">"Уншаагүй"</string>
-    <string name="status_rejected" msgid="2613641949065942678">"Аваагүй"</string>
-    <string name="recipient_label" msgid="3922667485312634446">"Хүлээн авагч: "</string>
-    <string name="status_label" msgid="7283375460919181660">"Статус: "</string>
-    <string name="delivered_label" msgid="3514011729156932928">"Хүргэгдсэн: "</string>
-    <string name="attach_image" msgid="6439985727687107742">"Зураг"</string>
-    <string name="attach_take_photo" msgid="4280601313184373837">"Зураг авах"</string>
-    <string name="attach_video" msgid="4264272693501538294">"Видео"</string>
-    <string name="attach_record_video" msgid="3099814114743078615">"Видео авах"</string>
-    <string name="attach_sound" msgid="3149325985970669609">"Аудио"</string>
-    <string name="attach_record_sound" msgid="6011431304469858929">"Аудио бичих"</string>
-    <string name="attach_slideshow" msgid="3497422151091037063">"Слайдшоу"</string>
-    <string name="select_bottom_text" msgid="4201966447623311931">"Текстийг доор нь"</string>
-    <string name="select_top_text" msgid="6734183477539197815">"Текст дээр нь"</string>
-    <string name="delivery_toast_body" msgid="5960519861835727013">"Зурвасыг хүлээж авсан %s."</string>
-    <string name="notification_multiple" msgid="7684007285202109490">"<xliff:g id="COUNT">%s</xliff:g> уншаагүй зурвас."</string>
-    <string name="notification_multiple_title" msgid="332602028959557541">"Шинэ зурвасууд"</string>
-    <string name="notification_failed_multiple" msgid="6192531993698497229">"<xliff:g id="COUNT">%s</xliff:g> зурвасыг илгээж чадсангүй"</string>
-    <string name="notification_failed_multiple_title" msgid="1112032024904397126">"Зурвасууд илгээгдээгүй"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"SIM карт дүүрсэн"</string>
-    <string name="sim_full_body" msgid="6241664980790322925">"Зарим зурвасуудыг устган өөр зурваст зай гаргах."</string>
-    <string name="sms_full_title" msgid="6041287140125011854">"Текст зурвасын санах ой дүүрсэн"</string>
-    <string name="sms_full_body" msgid="4885861852397651868">"Санах ой дүүрсэн учир ирсэн зурвасыг авсангүй. Зарим хуучин зурвасыг устгана уу."</string>
-    <string name="sms_rejected_title" msgid="8548394922491529811">"Текст зурвасыг авсангүй"</string>
-    <string name="sms_rejected_body" msgid="7813671133968158562">"Тодорхойгүй шалтгаанаар ирсэн зурвасыг авсангүй."</string>
-    <string name="type_audio" msgid="3842064092332309756">"Аудио"</string>
-    <string name="type_picture" msgid="4091928975383609443">"зураг"</string>
-    <string name="type_video" msgid="8521556159545168441">"видео"</string>
-    <string name="confirm" msgid="3155110885840591914">"Баталгаажуулах"</string>
-    <string name="message_send_read_report" msgid="6997117678914261250">"Уншсан репорт илгээгдэх болно."</string>
-    <string name="message_queued" msgid="7975945623873194737">"Одоогоор таны зурвасыг илгээх боломжгүй. Үйлчилгээг ашиглах боломжтой болмогц зурвасыг илгээх болно."</string>
-    <string name="fdn_check_failure" msgid="7880740763778173551">"Та зөвхөн өөрийн тогтвортой залгах дугаар руу зурвас илгээж болно."</string>
-    <string name="no_subject" msgid="4168963736134552285">"(Гарчиггүй)"</string>
-    <string name="unknown_sender" msgid="4929330613278853635">"Тодорхойгүй илгээгч"</string>
-    <string name="dl_failure_notification" msgid="8097699679464396537">"<xliff:g id="FROM">%2$s</xliff:g>-с <xliff:g id="SUBJECT">%1$s</xliff:g> зурвасыг татаж чадсангүй."</string>
-    <string name="rate_limit_surpassed" msgid="1347801608211628177">"Баталгаажуулах"</string>
-    <string name="confirm_rate_limit" msgid="234228299751243067">"Маш олон мультмедиа зурвасыг илгээж байна, энэ зүгээр үү?"</string>
-    <string name="message_download_failed_title" msgid="5722226064394767921">"Зурвас татагдсангүй"</string>
-    <string name="message_send_failed_title" msgid="3469894907399046372">"Зурвас илгээгдээгүй"</string>
-    <string name="message_failed_body" msgid="3421296112073915245">"Зурваст хүрэн шалгаад дахин оролдож үзнэ үү."</string>
-    <string name="download_later" msgid="5531365714424360903">"Одоо татаж авах боломжгүй. Дараа дахин оролдоно уу."</string>
-    <string name="no_apn" msgid="505932916503312015">"Төхөөрөмж дээр APN заагаагүй байна."</string>
-    <string name="select_audio" msgid="3528161449756771832">"Аудио сонгох"</string>
-    <string name="copy_to_sdcard" msgid="757028609638184856">"Хавсралтыг хадгалах"</string>
-    <string name="copy_to_sdcard_success" msgid="7948625615155992014">"Хавсралтыг хадгалсан."</string>
-    <string name="copy_to_sdcard_fail" msgid="4944606369631916737">"Хавсралтыг хадгалж чадсангүй."</string>
-    <string name="save_ringtone" msgid="2310157075045201051">"Хонхны ая болгон хадгалах"</string>
-    <string name="saved_ringtone" msgid="3847363932276708626">"Хонхны ая хадгалагдсан."</string>
-    <string name="saved_ringtone_fail" msgid="4778500070919251116">"Хонхны аяыг хадгалж чадсангүй."</string>
-    <string name="menu_insert_smiley" msgid="4964504393061025071">"Инээмсэглэл оруулах"</string>
-    <string name="menu_group_participants" msgid="4288356090262299071">"Бүлгэмд оролцогчид"</string>
-    <string name="select_link_title" msgid="3371818607625768447">"Үйлдлийг сонгох"</string>
-    <string name="slide_number" msgid="1923958526266726635">"Слайд <xliff:g id="NUMBER">%s</xliff:g>"</string>
-  <plurals name="slide_duration">
-    <item quantity="one" msgid="1654101988340583935">"<xliff:g id="NUMBER">%s</xliff:g> сек"</item>
-    <item quantity="few" msgid="7887190171856293871">"<xliff:g id="NUMBER">%s</xliff:g> сек"</item>
-    <item quantity="other" msgid="3736425355579939863">"<xliff:g id="NUMBER">%s</xliff:g> сек"</item>
-  </plurals>
-    <string name="delivery_report_activity" msgid="2957463094232916364">"Хүргэлтийн репорт"</string>
-    <string name="storage_limits_activity" msgid="8810530813311077716">"Хадгалах сангийн хязгаар"</string>
-    <string name="change_duration_activity" msgid="7048606979485031693">"Үргэлжлэх хугацааг өөрчлөх"</string>
-    <string name="edit_slideshow_activity" msgid="8751493388760050529">"Слайдшоу засах"</string>
-    <string name="recipient_list_activity" msgid="1254938236543727019">"Бүлгэмд оролцогчид"</string>
-    <string name="edit_slide_activity" msgid="8752829671778696983">"Слайд засах"</string>
-    <string name="slideshow_activity" msgid="5658249461317434432">"Слайдшоу"</string>
-    <string name="class_0_message_activity" msgid="6631339964159861048">"Ангилал 0 зурвас"</string>
-    <string name="search_label" msgid="6042598929386174964">"Зурвас"</string>
-    <string name="search_hint" msgid="7273727663577472044">"Зурвас хайх"</string>
-    <string name="search" msgid="7560238620274735199">"Зурвас"</string>
-    <string name="search_setting_description" msgid="4104004595086437572">"Зурвас доторх текст"</string>
-    <string name="search_empty" msgid="2109551478056039278">"Илэрц алга."</string>
-  <plurals name="search_results_title">
-    <item quantity="one" msgid="4657073733087431350">"\"<xliff:g id="SEARCH">%2$s</xliff:g>\" тухай <xliff:g id="NUMBER">%1$s</xliff:g> илэрц"</item>
-    <item quantity="other" msgid="6196382287749539209">"\"<xliff:g id="SEARCH">%2$s</xliff:g>\" тухай <xliff:g id="NUMBER">%1$s</xliff:g> илэрц"</item>
-  </plurals>
-    <string name="search_history" msgid="4127805495662693154">"\"<xliff:g id="SEARCH">%2$s</xliff:g>\" тухай <xliff:g id="COUNT">%1$s</xliff:g> илэрц"</string>
-    <string name="confirm_clear_search_title" msgid="8510295993632032904">"Арилгах"</string>
-    <string name="confirm_clear_search_text" msgid="8731877031837077478">"Хайлтын түүхийг арилгах болно."</string>
-    <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Хайлтын түүхийг арилгах"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"Хайлтын нүднээс өмнөх Зурвас хайлтуудыг арилгах"</string>
-    <string name="save" msgid="6847069284991531310">"Хадгалах"</string>
-    <string name="storage_limits_title" msgid="7074684882530693016">"Зурвасуудыг хязгаарлах"</string>
-    <string name="storage_limits_message" msgid="2010501485394745696">"Харилцаа тус бүрт хадгалах зурвасуудын тоог хязгаарлах уу?"</string>
-    <string name="storage_limits_setting" msgid="4952781049308537373">"Хязгаар тогтоох"</string>
-    <string name="storage_limits_setting_dismiss" msgid="1433841310158458034">"Хязгааргүй"</string>
-    <string name="too_many_unsent_mms" msgid="4436493698891224126">"Зурвасыг одоо илгээх боломжгүй. Хэт олон илгээгээгүй мультимедиа зурвасууд."</string>
-    <string name="sending_message" msgid="2054406576361149715">"Илгээж байна..."</string>
-    <string name="pick_too_many_recipients" msgid="650087588867628044">"Хэт олон хүлээн авагч"</string>
-    <string name="adding_recipients" msgid="2962810172527532357">"Хүлээн авагч нэмж байна…"</string>
-    <string name="draft_separator" msgid="5402575086540243019">", "</string>
-    <string name="message_count_format" msgid="4434763220590778012">" <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="message_count_notification" msgid="3629968600032690007">"<xliff:g id="NUMBER">%1$s</xliff:g> шинэ зурвасууд"</string>
-  <plurals name="message_count_notification_overflow">
-    <item quantity="one" msgid="3340591167508150806">"+<xliff:g id="NUMBER">%1$s</xliff:g> өөр зурвас"</item>
-    <item quantity="other" msgid="1393002799298501480">"+<xliff:g id="NUMBER">%1$s</xliff:g> өөр зурвас"</item>
-  </plurals>
-    <string name="error_state" msgid="5177386717626893507">"Тогтворгүй төлөв"</string>
-    <string name="error_state_text" msgid="7918866106335387710">"Хэлхээсүүд болон хүлээн авагчдын төлөв тогтворгүй байна. Согогийн репорт гаргаж http://go/droidanizer -р явуулна уу"</string>
-  <plurals name="recipient_count">
-    <item quantity="other" msgid="7338580381574463136">"<xliff:g id="NUMBER">%1$s</xliff:g> хүн"</item>
-  </plurals>
-    <string name="disable_notifications_dialog_message" msgid="7644011234972074096">"Үндсэн Зурвасын апп-с зурвасан мэдэгдэл давхардаж ирэхийг болиулах уу?"</string>
-    <string name="view_more_conversations" msgid="7275920132410734671">"Өөр харилцаануудыг харах"</string>
-    <string name="attachment_audio" msgid="2867960243300539143">"Аудио"</string>
-    <string name="attachment_slideshow" msgid="5867689101881763318">"Слайдшоу"</string>
-    <string name="attachment_video" msgid="4252062022156694591">"Видео"</string>
-    <string name="attachment_picture" msgid="3709286281567284296">"Зураг"</string>
-    <string name="notification_separator" msgid="2334673105226536422">"  "</string>
-    <string name="enumeration_comma" msgid="213598026698964628">", "</string>
-    <string name="message_timestamp_format" msgid="4188999027493614617">"<xliff:g id="STRING_0">%1$s</xliff:g> - <xliff:g id="STRING_1">%2$s</xliff:g>"</string>
-    <string name="storage_warning_title" msgid="7124740686325942375">"Таны утасны сан дүүрсэн байна"</string>
-    <string name="storage_warning_content" msgid="1100367816649962354">"Та шинэ SMS/MMS зурвас хүлээж авахгүй"</string>
-    <string name="label_mms_send_outbox_msg" msgid="3395185162973061099">"MMS Сэрээгч"</string>
-    <string name="desc_mms_send_outbox_msg" msgid="1837156781311437148">"Илгээх хайрцагаас бүх MMS-г сүлжээрүү илгээнэ"</string>
-</resources>
diff --git a/res/values-mr-rIN/arrays.xml b/res/values-mr-rIN/arrays.xml
index a556f24c..418cedf2 100644
--- a/res/values-mr-rIN/arrays.xml
+++ b/res/values-mr-rIN/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"कोणताही विषय नाही"</item>
-    <item msgid="2214945158821871846">"कोणताही विषय नाही"</item>
   </string-array>
 </resources>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index f318b6d2..d0fe630e 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ध्वनी"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"जतन करण्‍यासाठी संदेशांची संख्‍या सेट करा"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"मूक"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"प्रत्येक वेळी संदेश पाठविला जातो तेव्हा कोणते सिम वापरावे ते विचारा"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"एकाधिक-सिम"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"स्‍वयं-पुनर्प्राप्त करा"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"स्वयंचलितपणे संदेश पुनर्प्राप्त करा"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"रोमिंग स्‍वयं-पुनर्प्राप्त करा"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"संदेशन आपला SMS अ‍ॅप नाही"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"आपला SMS अ‍ॅप <xliff:g id="APPNAME">%s</xliff:g> आहे"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"आपण हे सेटिंग्‍जमध्‍ये बदलू शकता"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"सिम निवडा"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"सिम <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"सिम स्लॉट <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"रद्द करा"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"वर्तमान निवडलेले सिम उपलब्‍ध नाही. सिस्‍टीम सेटिंग्‍जमधील आपले डीफॉल्‍ट सिम निवडा."</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 2cde072e..d4fbe0f1 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Bunyi"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Tetapkan bilangan mesej untuk disimpan"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Senyap"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Tanya SIM untuk digunakan setiap kali mesej dihantar"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Berbilang SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Auto dapat kembali"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Dapatkan semula mesej secara automatik"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Auto dapat kembali perayauan"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Pemesejan bukan apl SMS anda"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> ialah apl SMS anda"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Anda boleh menukar ini dalam Tetapan"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Pilih SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Slot SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Batal"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"SIM pilihan semasa tidak ada. Pilih SIM lalai anda dalam tetapan sistem."</string>
 </resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
deleted file mode 100644
index d6bb2d66..00000000
--- a/res/values-ms/arrays.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- * Copyright (C) 2008 Esmertec AG.
- * Copyright (C) 2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="default_smiley_names">
-    <item msgid="1831934949361041701">"Gembira"</item>
-    <item msgid="1601611480575517120">"Sedih"</item>
-    <item msgid="1531181614218625881">"Mengenyit"</item>
-    <item msgid="3858808057949077894">"Lidah terjelir"</item>
-    <item msgid="7835238297967185651">"Terkejut"</item>
-    <item msgid="1756223535005296033">"Bercium"</item>
-    <item msgid="1093906245140165107">"Menjerit"</item>
-    <item msgid="888834839864150170">"Segak"</item>
-    <item msgid="6320683740534773967">"Mulut duit"</item>
-    <item msgid="6610111212478853990">"Kaki dalam mulut"</item>
-    <item msgid="1706035208563940251">"Malu"</item>
-    <item msgid="9079275787422313427">"Bidadari"</item>
-    <item msgid="4630490399784004880">"Tidak pasti"</item>
-    <item msgid="7002574538342357456">"Menangis"</item>
-    <item msgid="850324578089267455">"Bibir terkunci"</item>
-    <item msgid="6334637439528489607">"Tertawa"</item>
-    <item msgid="7602915122893958066">"Keliru"</item>
-    <item msgid="3939233701582771068">"Hati"</item>
-    <item msgid="1414759480575851587">"Gila"</item>
-    <item msgid="8479809115158836070">"Senyuman sinis"</item>
-    <item msgid="638612939305162424">"Muka selamba"</item>
-  </string-array>
-  <string-array name="empty_subject_strings">
-    <item msgid="7691141505407124426">"tiada subjek"</item>
-  </string-array>
-</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
deleted file mode 100644
index 82de376d..00000000
--- a/res/values-ms/strings.xml
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1503967887341230795">"Pemesejan"</string>
-    <string name="new_message" msgid="1530369762346003973">"Mesej baru"</string>
-    <string name="menu_call_back" msgid="7538482331117914146">"Panggil <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_send_email" msgid="671366308915241664">"Hantar e-mel kepada <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_compose_new" msgid="3763437973691046238">"Karang"</string>
-    <string name="menu_preferences" msgid="4693148116114749414">"Tetapan"</string>
-    <string name="menu_add_address_to_contacts" msgid="4491980950419914944">"Tambahkan <xliff:g id="CONTACTEMAILORNUMBER">%s</xliff:g> pada Orang"</string>
-    <string name="menu_call" msgid="5877123227307074690">"Panggil"</string>
-    <string name="menu_search" msgid="2289469305728821360">"Carian"</string>
-    <string name="menu_delete_all" msgid="808729454898114735">"Padamkan semua urutan"</string>
-    <string name="menu_delete" msgid="1851666911396479006">"Padam urutan"</string>
-    <string name="menu_view" msgid="7448852683948080108">"Lihat urutan"</string>
-    <string name="menu_debug_dump" msgid="6855869130206549643">"LONGGOKAN NYAHPEPIJAT"</string>
-    <string name="refreshing" msgid="987335057871404222">"Memuatkan semula..."</string>
-    <string name="menu_cell_broadcasts" msgid="5646161375983084660">"Siaran sel"</string>
-    <string name="has_draft" msgid="2487465595514636160">"Draf"</string>
-    <string name="no_subject_view" msgid="7795086723069563537">"(Tiada subjek)"</string>
-    <string name="messagelist_sender_self" msgid="3579016854116401602">"Saya"</string>
-    <string name="view_slideshow" msgid="4990460971211388453">"Tonton tayangan slaid"</string>
-    <string name="view_message_details" msgid="7613457646645796831">"Lihat butiran"</string>
-    <string name="view_delivery_report" msgid="8219095994071575215">"Lihat laporan"</string>
-    <string name="delete_message" msgid="6442394955910357234">"Padam"</string>
-    <string name="expire_on" msgid="4436268382742593921">"Tamat tempoh: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="kilobyte" msgid="534782148965716631">"KB"</string>
-    <string name="undelivered_msg_dialog_title" msgid="7479433403599785755">"Mesej tidak diserahkan"</string>
-    <string name="undelivered_msg_dialog_body" msgid="4789268239627694551">"Tidak dapat menghantar mesej ini \nPercubaan dibuat: <xliff:g id="MESSAGE">%s</xliff:g>."</string>
-    <string name="undelivered_sms_dialog_body" msgid="4203703285563450868">"Tidak dapat menghantar mesej ini."</string>
-    <string name="delete_thread" msgid="757258847736632791">"Padam urutan"</string>
-    <string name="menu_forward" msgid="9026858380050046756">"Kirim semula"</string>
-    <string name="download" msgid="4488877642230207631">"Muat turun"</string>
-    <string name="downloading" msgid="1779557575565350637">"Memuat turun"</string>
-    <string name="inline_subject" msgid="4057621785274119260">"&lt;Subjek: <xliff:g id="SUBJECT">%s</xliff:g>&gt;"</string>
-    <string name="drm_protected_text" msgid="1396394157870730742">"* Teks dilindungi DRM *"</string>
-    <string name="insufficient_drm_rights" msgid="6989074725969164383">"Hak DRM yang tidak mencukupi dikesan."</string>
-    <string name="copy_message_text" msgid="4296252229544252834">"Salin teks"</string>
-    <string name="message_options" msgid="6838806653341967550">"Pilihan mesej"</string>
-    <string name="slideshow_options" msgid="3501759384739796431">"Pilihan tayangan slaid"</string>
-    <string name="done" msgid="7479926268660505871">"Selesai"</string>
-    <string name="move_up" msgid="7307578107431739359">"Beralih ke atas"</string>
-    <string name="move_down" msgid="6356509518429479053">"Beralih ke bawah"</string>
-    <string name="remove_slide" msgid="2225604354024914900">"Alih keluar slaid"</string>
-    <string name="add_slide" msgid="9140721399423564187">"Tambah slaid"</string>
-    <string name="add_slide_hint" msgid="7351356961076244584">"Sentuh untuk mencipta slaid baru."</string>
-    <string name="discard_slideshow" msgid="5054239124146413609">"Buang tayangan slaid"</string>
-    <string name="slide_show_part" msgid="5077675385448696846">"Bahagian <xliff:g id="PART">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="remove_text" msgid="2164068850029476539">"Alih keluar teks"</string>
-    <string name="add_picture" msgid="7819574884962571479">"Tambah gambar"</string>
-    <string name="remove_picture" msgid="6378701749074289096">"Alih keluar gambar"</string>
-    <string name="add_music" msgid="3827442822987116233">"Tambah muzik"</string>
-    <string name="remove_music" msgid="858889733416015223">"Alih keluar muzik"</string>
-    <string name="add_video" msgid="7816866867806595144">"Tambah video"</string>
-    <string name="remove_video" msgid="5258603891528497799">"Alih keluar video"</string>
-    <string name="to_hint" msgid="224029549150332986">"Kepada"</string>
-    <string name="subject_hint" msgid="4296714962311604126">"Subjek"</string>
-    <string name="add_attachment" msgid="7103751293360532684">"Lampir"</string>
-    <string name="add_subject" msgid="7616134948428265870">"Tambah subjek"</string>
-    <string name="discard" msgid="1624800293064498479">"Buang"</string>
-    <string name="view" msgid="7929667761715467136">"Lihat"</string>
-    <string name="replace" msgid="7587904998114459388">"Ganti"</string>
-    <string name="remove" msgid="4625444913256213175">"Alih keluar"</string>
-    <string name="send" msgid="4589898724889248486">"Hantar"</string>
-    <string name="mms" msgid="1587631213714914559">"MMS"</string>
-    <string name="send_mms" msgid="2933162044872550662">"Hantar MMS"</string>
-    <string name="all_threads" msgid="2663426830306307194">"Semua urutan"</string>
-    <string name="type_to_compose_text_enter_to_send" msgid="3539985471008581265">"Taip mesej"</string>
-    <string name="open_keyboard_to_compose_message" msgid="7860109685511253191">"Buka papan kekunci untuk menaip mesej"</string>
-    <string name="compressing" msgid="1961357529661045180">"Gambar terlalu besar. Memampatkan..."</string>
-    <string name="unsupported_media_format" msgid="1350489690977363764">"Format <xliff:g id="NAME">%1$s</xliff:g> tidak disokong."</string>
-    <string name="select_different_media" msgid="6241623357299382183">"Pilih <xliff:g id="NAME">%1$s</xliff:g> yang berbeza ."</string>
-    <string name="exceed_message_size_limitation" msgid="6027753647094742437">"Had saiz mesej dicapai."</string>
-    <string name="message_too_big_for_video" msgid="2639367545165352543">"Mesej terlalu besar untuk dilampirkan video."</string>
-    <string name="failed_to_add_media" msgid="7207464170168708485">"Anda tidak boleh menambahkan <xliff:g id="NAME">%1$s</xliff:g> ini pada mesej anda."</string>
-    <string name="failed_to_resize_image" msgid="5608354151631833669">"Gambar tidak berubah saiznya."</string>
-    <string name="resize_image_error_information" msgid="3783200130776554475">"Gambar ini adalah terlalu besar untuk dihantar, walaupun apabila diubah saiz."</string>
-    <string name="forward_prefix" msgid="276280492803486464">"K.s.: "</string>
-    <string name="discard_message_reason" msgid="2667664943003796133">"Mesej anda akan dibuang kerana ia tidak mengandungi penerima yang sah."</string>
-    <string name="has_invalid_recipient" msgid="1485388396900997383">"Penerima tidak sah: &lt;<xliff:g id="NAME">%1$s</xliff:g>&gt;"</string>
-    <string name="invalid_destination" msgid="4573835601024786416">"Alamat destinasi tidak sah."</string>
-    <string name="service_not_activated" msgid="9178218144019626176">"Perkhidmatan tidak diaktifkan pada rangkaian."</string>
-    <string name="service_message_not_found" msgid="1908877102600048515">"Mesej telah tamat tempoh atau tidak tersedia."</string>
-    <string name="service_network_problem" msgid="4583269174855943025">"Tidak dapat menghantar kerana masalah rangkaian."</string>
-    <string name="invalid_recipient_message" msgid="6465343105010999068">"Sila betulkan penerima atau mereka tidak akan menerima mesej."</string>
-    <string name="cannot_send_message" msgid="3414307479833622644">"Tidak boleh menghantar mesej"</string>
-    <string name="cannot_send_message_reason" msgid="8745080126044054343">"Mesej anda tiada penerima yang sah."</string>
-    <string name="cannot_forward_drm_obj" msgid="5047623751430559077">"Objek DRM yang disertakan dalam mesej tidak boleh dikirim semula."</string>
-    <string name="converting_to_picture_message" msgid="2980023239017588627">"Menukarkan kepada mesej multimedia..."</string>
-    <string name="cannot_add_slide_anymore" msgid="4631404749618820994">"Tidak boleh menambah lagi slaid."</string>
-    <string name="cannot_add_picture_and_video" msgid="4954353772391381447">"Tidak boleh menambahkan video dan gambar pada satu slaid."</string>
-    <string name="cannot_save_message" msgid="3375907366965264446">"Tidak boleh menyimpan mesej."</string>
-    <string name="message_saved_as_draft" msgid="2503018972659880692">"Mesej disimpan sebagai draf."</string>
-    <string name="too_many_recipients" msgid="7003415094007176931">"Mesej ini mempunyai terlalu ramai penerima (<xliff:g id="CURRENTCOUNT">%1$s</xliff:g>). Terdapat had <xliff:g id="MAXLIMIT">%2$s</xliff:g> penerima."</string>
-    <string name="too_many_attachments" msgid="3774037894899750070">"Lampiran dihadkan kepada <xliff:g id="MAXLIMIT">%1$s</xliff:g>. Hanya <xliff:g id="CURRENTCOUNT">%2$s</xliff:g> yang pertama sahaja akan ditambahkan."</string>
-    <string name="adding_attachments_title" msgid="2034535554212405529">"Menambah lampiran"</string>
-    <string name="adding_attachments" msgid="5871373105122355632">"Tunggu sementara item ditambahkan pada tayangan slaid."</string>
-    <string name="building_slideshow_title" msgid="1232338692400726385">"Membina tayangan slaid"</string>
-    <string name="cannot_play_audio" msgid="253920977253666735">"Tidak boleh memainkan audio."</string>
-    <string name="preview" msgid="5438149136136446756">"Pratonton"</string>
-    <string name="preview_slideshow" msgid="6824095909448728427">"Pratonton"</string>
-    <string name="replace_image" msgid="3171240952601443619">"Ganti gambar"</string>
-    <string name="duration_sec" msgid="6617032324007824096">"Tempoh (<xliff:g id="DURATION">%s</xliff:g> saat)"</string>
-    <string name="duration_selector_title" msgid="5981097971537625852">"Tempoh slaid "</string>
-    <string name="layout_selector_title" msgid="7344600117972450771">"Reka letak tayangan slaid "</string>
-    <string name="layout_top" msgid="6811021650398972346">"Reka letak (atas)"</string>
-    <string name="layout_bottom" msgid="5822765871095491843">"Reka letak (bahagian bawah)"</string>
-    <string name="type_to_compose_text_or_leave_blank" msgid="7769792471457574059">"Taip mesej, atau biarkan kosong"</string>
-    <string name="duration_not_a_number" msgid="2856636898040421237">"Tempoh mestilah dalam bentuk nombor."</string>
-    <string name="duration_zero" msgid="3549377790195185977">"Tempoh mestilah lebih besar daripada kosong saat."</string>
-    <string name="secs" msgid="6886003523109967972">"saat"</string>
-  <string-array name="select_dialog_items">
-    <item msgid="4840183714016984112">"1 saat"</item>
-    <item msgid="3734955613666864447">"2 saat"</item>
-    <item msgid="6032232473048379828">"3 saat"</item>
-    <item msgid="5978471781525927827">"4 saat"</item>
-    <item msgid="4888440297621208402">"5 saat"</item>
-    <item msgid="6047246213264166841">"6 saat"</item>
-    <item msgid="2327501250056533797">"7 saat"</item>
-    <item msgid="3400770414689795703">"8 saat"</item>
-    <item msgid="4358760614161107970">"9 saat"</item>
-    <item msgid="2618179407176906471">"10 saat"</item>
-    <item msgid="7786079681602275449">"Lain-lain"</item>
-  </string-array>
-    <string name="menu_view_contact" msgid="1414670584423909451">"Lihat kenalan"</string>
-    <string name="menu_add_to_contacts" msgid="1258127580972228970">"Tambahkan pada Orang"</string>
-    <string name="hidden_sender_address" msgid="2776075636669924968">"Alamat pengirim tersembunyi"</string>
-    <string name="yes" msgid="3246158147503160811">"OK"</string>
-    <string name="no" msgid="4289742508556913860">"Batal"</string>
-    <string name="set" msgid="4642365398263275979">"Tetapkan"</string>
-    <string name="play" msgid="1888432400937785115">"Main"</string>
-    <string name="edit" msgid="5912118407791492696">"Edit"</string>
-    <string name="try_to_send" msgid="1996751738286080976">"Cuba menghantar"</string>
-    <string name="preferences_title" msgid="6650089610332670157">"Tetapan"</string>
-    <string name="restore_default" msgid="7165341506551155053">"Pulihkan tetapan lalai"</string>
-    <string name="pref_notification_settings_title" msgid="6420782563630369776">"Pemberitahuan"</string>
-    <string name="pref_mms_settings_title" msgid="55618772118264355">"Mesej multimedia (MMS)"</string>
-    <string name="pref_sms_settings_title" msgid="5173078369851066881">"Mesej teks (SMS)"</string>
-    <string name="pref_sms_storage_title" msgid="9001233319190616445">"Storan"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"Mengurus mesej yang disimpan pada kad SIM anda"</string>
-    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"Minta laporan penghantaran untuk setiap mesej yang anda hantar"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"Minta laporan baca untuk setiap mesej yang anda hantar"</string>
-    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"Meminta laporan penghantaran untuk setiap mesej yang anda hantar"</string>
-    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"Padamkan mesej lama apabila had dicapai"</string>
-    <string name="pref_summary_delete_limit" msgid="597128041393045216">"<xliff:g id="COUNT">%1$s</xliff:g> mesej setiap perbualan"</string>
-    <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"Gunakan MMS untuk menghantar mesej tunggal apabila terdapat berbilang penerima"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"Urus mesej kad SIM"</string>
-    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"Laporan penghantaran"</string>
-    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"Pemesejan kumpulan"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Laporan baca"</string>
-    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Laporan penghantaran"</string>
-    <string name="pref_title_auto_delete" msgid="7227835692631701134">"Padamkan mesej lama"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"Had mesej teks"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"Had mesej multimedia"</string>
-    <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Pemberitahuan"</string>
-    <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Getar"</string>
-    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Bunyi"</string>
-    <string name="pref_messages_to_save" msgid="3202539743892934926">"Tetapkan bilangan mesej untuk disimpan"</string>
-    <string name="silent_ringtone" msgid="7981237991326592780">"Senyap"</string>
-    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Auto dapat kembali"</string>
-    <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Dapatkan semula mesej secara automatik"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Auto dapat kembali perayauan"</string>
-    <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"Dapatkan semula mesej secara automatik semasa perayauan"</string>
-    <string name="confirm_dialog_title" msgid="2187213750475782725">"Padam?"</string>
-    <string name="confirm_dialog_locked_title" msgid="8179085718150932242">"Padamkan mesej berkunci?"</string>
-  <plurals name="confirm_delete_conversation">
-    <item quantity="one" msgid="7509396981963472833">"Satu perbualan akan dipadamkan."</item>
-    <item quantity="other" msgid="4076915774012081811">"<xliff:g id="NUMBER">%1$s</xliff:g> perbualan akan dipadamkan."</item>
-  </plurals>
-    <string name="confirm_delete_conversation" msgid="6115966687389279855">"Keseluruhan urutan akan dipadamkan."</string>
-    <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"Semua urutan akan dipadamkan."</string>
-    <string name="confirm_delete_message" msgid="9121480656609809591">"Mesej akan dipadamkan."</string>
-    <string name="confirm_delete_locked_message" msgid="7203411948190100955">"Padamkan mesej yang dikunci ini?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"Semua mesej pada kad SIM akan dipadamkan."</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"Mesej ini pada kad SIM akan dipadamkan."</string>
-    <string name="delete_unlocked" msgid="7545321606698162261">"Padamkan mesej berkunci"</string>
-    <string name="delete" msgid="1409973060081564612">"Padamkan"</string>
-    <string name="select_conversations" msgid="7816517565640002844">"Pilih perbualan"</string>
-    <string name="no_conversations" msgid="6773767655149258445">"Tiada perbualan."</string>
-    <string name="loading_conversations" msgid="5510430408235967094">"Memuatkan perbualan."</string>
-    <string name="cannot_get_details" msgid="850292987983026806">"Tidak boleh mendapatkan butiran."</string>
-    <string name="message_details_title" msgid="9223295113731634528">"Butiran mesej"</string>
-    <string name="message_type_label" msgid="7975373966795945566">"Jenis: "</string>
-    <string name="text_message" msgid="8196464345251877972">"Mesej teks"</string>
-    <string name="multimedia_message" msgid="1512644521083533071">"Mesej multimedia"</string>
-    <string name="multimedia_notification" msgid="4124031788554972308">"Pemberitahuan mesej multimedia"</string>
-    <string name="from_label" msgid="2055117571548171397">"Daripada: "</string>
-    <string name="to_address_label" msgid="5837363600471845801">"Kepada: "</string>
-    <string name="bcc_label" msgid="530867161453958774">"Skt: "</string>
-    <string name="sent_label" msgid="2722190650145251584">"Dihantar: "</string>
-    <string name="received_label" msgid="8618029024731693906">"Diterima: "</string>
-    <string name="saved_label" msgid="4183160415593488207">"Disimpan: "</string>
-    <string name="subject_label" msgid="8721241914144101631">"Subjek: "</string>
-    <string name="message_size_label" msgid="4698016210013319786">"Saiz mesej: "</string>
-    <string name="priority_label" msgid="7397600367853359607">"Keutamaan: "</string>
-    <string name="priority_high" msgid="5627897207952009214">"Tinggi"</string>
-    <string name="priority_normal" msgid="5715227727384683550">"Biasa"</string>
-    <string name="priority_low" msgid="8928782666023373987">"Rendah"</string>
-    <string name="message_class_label" msgid="5115748690481550562">"Kelas mesej: "</string>
-    <string name="error_code_label" msgid="5810068247647058769">"Kod ralat: "</string>
-    <string name="menu_edit" msgid="3056513240155967777">"Edit"</string>
-    <string name="menu_delete_messages" msgid="2610286783513247420">"Padam mesej"</string>
-    <string name="menu_lock" msgid="7603793126077557472">"Kunci"</string>
-    <string name="menu_unlock" msgid="6662865558677424039">"Buka"</string>
-    <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"Salin ke memori tablet"</string>
-    <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"Salin ke memori telefon"</string>
-    <string name="sim_delete" msgid="610790510655316922">"Padam"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"Mesej teks pada kad SIM"</string>
-    <string name="sim_view" msgid="1997173541766393706">"Lihat"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"Tiada mesej pada kad SIM."</string>
-    <string name="delivery_header_title" msgid="5361719578869045764">"Laporan"</string>
-    <string name="status_none" msgid="8253075950774894961">"(Tiada)"</string>
-    <string name="status_pending" msgid="2739860824607984892">"Belum selesai"</string>
-    <string name="status_read" msgid="7576195253780627332">"Baca"</string>
-    <string name="status_received" msgid="7264334589461906965">"Diterima"</string>
-    <string name="status_failed" msgid="1998776666856593544">"Tidak berjaya"</string>
-    <string name="status_unread" msgid="8555305495998700198">"Belum dibaca"</string>
-    <string name="status_rejected" msgid="2613641949065942678">"Ditolak"</string>
-    <string name="recipient_label" msgid="3922667485312634446">"Penerima: "</string>
-    <string name="status_label" msgid="7283375460919181660">"Status: "</string>
-    <string name="delivered_label" msgid="3514011729156932928">"Dikirimkan: "</string>
-    <string name="attach_image" msgid="6439985727687107742">"Gambar"</string>
-    <string name="attach_take_photo" msgid="4280601313184373837">"Tangkap gambar"</string>
-    <string name="attach_video" msgid="4264272693501538294">"Video"</string>
-    <string name="attach_record_video" msgid="3099814114743078615">"Rakam video"</string>
-    <string name="attach_sound" msgid="3149325985970669609">"Audio"</string>
-    <string name="attach_record_sound" msgid="6011431304469858929">"Rakam audio"</string>
-    <string name="attach_slideshow" msgid="3497422151091037063">"Tayangan slaid"</string>
-    <string name="select_bottom_text" msgid="4201966447623311931">"Teks pada bahagian bawah"</string>
-    <string name="select_top_text" msgid="6734183477539197815">"Teks di bahagian atas"</string>
-    <string name="delivery_toast_body" msgid="5960519861835727013">"Mesej diterima oleh %s."</string>
-    <string name="notification_multiple" msgid="7684007285202109490">"<xliff:g id="COUNT">%s</xliff:g> mesej belum dibaca."</string>
-    <string name="notification_multiple_title" msgid="332602028959557541">"Mesej baru"</string>
-    <string name="notification_failed_multiple" msgid="6192531993698497229">"<xliff:g id="COUNT">%s</xliff:g> mesej tidak boleh dihantar"</string>
-    <string name="notification_failed_multiple_title" msgid="1112032024904397126">"Mesej tidak dihantar"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"Kad SIM penuh"</string>
-    <string name="sim_full_body" msgid="6241664980790322925">"Padam beberapa mesej untuk membuat ruang untuk lebih banyak mesej."</string>
-    <string name="sms_full_title" msgid="6041287140125011854">"Memori mesej teks penuh"</string>
-    <string name="sms_full_body" msgid="4885861852397651868">"Suatu mesej yang masuk telah ditolak kerana memori penuh. Padamkan beberapa mesej lama."</string>
-    <string name="sms_rejected_title" msgid="8548394922491529811">"Mesej teks ditolak"</string>
-    <string name="sms_rejected_body" msgid="7813671133968158562">"Suatu mesej yang masuk telah ditolak kerana sebab yang tidak diketahui."</string>
-    <string name="type_audio" msgid="3842064092332309756">"audio"</string>
-    <string name="type_picture" msgid="4091928975383609443">"gambar"</string>
-    <string name="type_video" msgid="8521556159545168441">"video"</string>
-    <string name="confirm" msgid="3155110885840591914">"Sahkan"</string>
-    <string name="message_send_read_report" msgid="6997117678914261250">"Laporan baca akan dihantar."</string>
-    <string name="message_queued" msgid="7975945623873194737">"Tidak boleh menghantar mesej anda pada masa ini. Ia akan dihantar apabila perkhidmatan tersedia."</string>
-    <string name="fdn_check_failure" msgid="7880740763778173551">"Anda hanya boleh menghantar mesej ke nombor dailan tetap anda."</string>
-    <string name="no_subject" msgid="4168963736134552285">"(Tiada subjek)"</string>
-    <string name="unknown_sender" msgid="4929330613278853635">"Pengirim tidak dikenali"</string>
-    <string name="dl_failure_notification" msgid="8097699679464396537">"Tidak dapat memuat turun <xliff:g id="SUBJECT">%1$s</xliff:g> daripada <xliff:g id="FROM">%2$s</xliff:g>."</string>
-    <string name="rate_limit_surpassed" msgid="1347801608211628177">"Sahkan"</string>
-    <string name="confirm_rate_limit" msgid="234228299751243067">"Sejumlah besar mesej multimedia sedang dihantar. Adakah ini OK?"</string>
-    <string name="message_download_failed_title" msgid="5722226064394767921">"Mesej tidak dimuat turun"</string>
-    <string name="message_send_failed_title" msgid="3469894907399046372">"Mesej tidak dihantar"</string>
-    <string name="message_failed_body" msgid="3421296112073915245">"Sentuh untuk menyemak semula mesej dan cuba lagi."</string>
-    <string name="download_later" msgid="5531365714424360903">"Tidak boleh memuat turun sekarang. Cuba lagi kemudian."</string>
-    <string name="no_apn" msgid="505932916503312015">"Tiada APN dinyatakan pada peranti."</string>
-    <string name="select_audio" msgid="3528161449756771832">"Pilih audio"</string>
-    <string name="copy_to_sdcard" msgid="757028609638184856">"Menyimpan lampiran"</string>
-    <string name="copy_to_sdcard_success" msgid="7948625615155992014">"Lampiran disimpan."</string>
-    <string name="copy_to_sdcard_fail" msgid="4944606369631916737">"Tidak dapat menyimpan lampiran."</string>
-    <string name="save_ringtone" msgid="2310157075045201051">"Simpan sebagai nada dering"</string>
-    <string name="saved_ringtone" msgid="3847363932276708626">"Nada dering disimpan."</string>
-    <string name="saved_ringtone_fail" msgid="4778500070919251116">"Tidak dapat menyimpan nada dering."</string>
-    <string name="menu_insert_smiley" msgid="4964504393061025071">"Masukkan smiley"</string>
-    <string name="menu_group_participants" msgid="4288356090262299071">"Peserta kumpulan"</string>
-    <string name="select_link_title" msgid="3371818607625768447">"Pilih tindakan"</string>
-    <string name="slide_number" msgid="1923958526266726635">"Slaid <xliff:g id="NUMBER">%s</xliff:g>"</string>
-  <plurals name="slide_duration">
-    <item quantity="one" msgid="1654101988340583935">"<xliff:g id="NUMBER">%s</xliff:g> saat"</item>
-    <item quantity="few" msgid="7887190171856293871">"<xliff:g id="NUMBER">%s</xliff:g> saat"</item>
-    <item quantity="other" msgid="3736425355579939863">"<xliff:g id="NUMBER">%s</xliff:g> saat"</item>
-  </plurals>
-    <string name="delivery_report_activity" msgid="2957463094232916364">"Laporan penghantaran"</string>
-    <string name="storage_limits_activity" msgid="8810530813311077716">"Had storan"</string>
-    <string name="change_duration_activity" msgid="7048606979485031693">"Tukar tempoh"</string>
-    <string name="edit_slideshow_activity" msgid="8751493388760050529">"Edit tayangan slaid"</string>
-    <string name="recipient_list_activity" msgid="1254938236543727019">"Peserta kumpulan"</string>
-    <string name="edit_slide_activity" msgid="8752829671778696983">"Edit slaid"</string>
-    <string name="slideshow_activity" msgid="5658249461317434432">"Tayangan slaid"</string>
-    <string name="class_0_message_activity" msgid="6631339964159861048">"Mesej kelas 0"</string>
-    <string name="search_label" msgid="6042598929386174964">"Pemesejan"</string>
-    <string name="search_hint" msgid="7273727663577472044">"Pemesejan carian"</string>
-    <string name="search" msgid="7560238620274735199">"Pemesejan"</string>
-    <string name="search_setting_description" msgid="4104004595086437572">"Teks dalam mesej anda"</string>
-    <string name="search_empty" msgid="2109551478056039278">"Tiada padanan."</string>
-  <plurals name="search_results_title">
-    <item quantity="one" msgid="4657073733087431350">"<xliff:g id="NUMBER">%1$s</xliff:g> hasil untuk \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</item>
-    <item quantity="other" msgid="6196382287749539209">"<xliff:g id="NUMBER">%1$s</xliff:g> hasil untuk \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</item>
-  </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> hasil untuk \"<xliff:g id="SEARCH">%2$s</xliff:g>\""</string>
-    <string name="confirm_clear_search_title" msgid="8510295993632032904">"Padam bersih"</string>
-    <string name="confirm_clear_search_text" msgid="8731877031837077478">"Sejarah carian akan dipadam bersih."</string>
-    <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Padam bersih sejarah carian"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"Padam bersih carian Pemesejan sebelumnya agar tidak muncul dalam kotak Carian"</string>
-    <string name="save" msgid="6847069284991531310">"Simpan"</string>
-    <string name="storage_limits_title" msgid="7074684882530693016">"Hadkan mesej"</string>
-    <string name="storage_limits_message" msgid="2010501485394745696">"Hadkan bilangan mesej yang anda simpan untuk setiap perbualan?"</string>
-    <string name="storage_limits_setting" msgid="4952781049308537373">"Tetapkan had"</string>
-    <string name="storage_limits_setting_dismiss" msgid="1433841310158458034">"Tiada had"</string>
-    <string name="too_many_unsent_mms" msgid="4436493698891224126">"Tidak boleh menghantar mesej sekarang. Terlalu banyak mesej multimedia yang belum dihantar."</string>
-    <string name="sending_message" msgid="2054406576361149715">"MENGHANTAR…"</string>
-    <string name="pick_too_many_recipients" msgid="650087588867628044">"Terlalu banyak penerima"</string>
-    <string name="adding_recipients" msgid="2962810172527532357">"Menambah penerima..."</string>
-    <string name="draft_separator" msgid="5402575086540243019">", "</string>
-    <string name="message_count_format" msgid="4434763220590778012">" <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="message_count_notification" msgid="3629968600032690007">"<xliff:g id="NUMBER">%1$s</xliff:g> mesej baharu"</string>
-  <plurals name="message_count_notification_overflow">
-    <item quantity="one" msgid="3340591167508150806">"+<xliff:g id="NUMBER">%1$s</xliff:g> mesej lain"</item>
-    <item quantity="other" msgid="1393002799298501480">"+<xliff:g id="NUMBER">%1$s</xliff:g> mesej lain"</item>
-  </plurals>
-    <string name="error_state" msgid="5177386717626893507">"Keadaan tidak konsisten"</string>
-    <string name="error_state_text" msgid="7918866106335387710">"Keadaan urutan dan penerima adalah tidak konsisten. Sila dapatkan laporan pepijat dan laporkannya melalui http://go/droidanizer"</string>
-  <plurals name="recipient_count">
-    <item quantity="other" msgid="7338580381574463136">"<xliff:g id="NUMBER">%1$s</xliff:g> orang"</item>
-  </plurals>
-    <string name="disable_notifications_dialog_message" msgid="7644011234972074096">"Berhenti menyalin teks pemberitahuan mesej dari apl Mesej lalai?"</string>
-    <string name="view_more_conversations" msgid="7275920132410734671">"Lihat lagi perbualan"</string>
-    <string name="attachment_audio" msgid="2867960243300539143">"Audio"</string>
-    <string name="attachment_slideshow" msgid="5867689101881763318">"Tayangan slaid"</string>
-    <string name="attachment_video" msgid="4252062022156694591">"Video"</string>
-    <string name="attachment_picture" msgid="3709286281567284296">"Gambar"</string>
-    <string name="notification_separator" msgid="2334673105226536422">"  "</string>
-    <string name="enumeration_comma" msgid="213598026698964628">", "</string>
-    <string name="message_timestamp_format" msgid="4188999027493614617">"<xliff:g id="STRING_0">%1$s</xliff:g> - <xliff:g id="STRING_1">%2$s</xliff:g>"</string>
-    <string name="storage_warning_title" msgid="7124740686325942375">"Storan telefon anda penuh"</string>
-    <string name="storage_warning_content" msgid="1100367816649962354">"Anda tidak akan menerima mesej SMS/MMS baharu"</string>
-    <string name="label_mms_send_outbox_msg" msgid="3395185162973061099">"MMS Wakeup"</string>
-    <string name="desc_mms_send_outbox_msg" msgid="1837156781311437148">"Hantar semua MMS dari peti keluar ke rangkaian"</string>
-
-    <string name="subDataDialog_negative">Batal</string>
-    <string name="subDataDialog_positive">OK</string>
-    <string name="subDataDialog_send">Hidupkan sambungan data <xliff:g id="subName" example="SUB 01">%1$s</xliff:g> sementara untuk menghantar MMS.</string>
-    <string name="sub_select_dialog_title">Pilih SIM</string>
-    <string name="empty_sim_name">Slot SIM <xliff:g id="subId" example="2">%1$d</xliff:g></string>
-    <string name="subDataDialog_download">Hidupkan sambungan data <xliff:g id="subName" example="SUB 01">%1$s</xliff:g> sementara untuk memuat turun MMS.</string>
-    <string name="subSelect_negative">Batal</string>
-    <string name="subDataDialog_title_download">Muat turun MMS</string>
-    <string name="subDataDialog_title_send">Hantar MMS</string>
-    <string name="default_sim_name">SIM <xliff:g id="subId" example="2">%1$d</xliff:g></string>
-</resources>
-\ No newline at end of file
diff --git a/res/values-my-rMM/arrays.xml b/res/values-my-rMM/arrays.xml
index 43b13643..963b8caf 100644
--- a/res/values-my-rMM/arrays.xml
+++ b/res/values-my-rMM/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"အကြောင်းအရာတပ်ထားခြင်းမရှိ"</item>
-    <item msgid="2214945158821871846">"အကြောင်းအရာမဲ့"</item>
   </string-array>
 </resources>
diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml
index 1daa5b25..2118b924 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my-rMM/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -76,7 +76,7 @@
     <string name="subject_hint" msgid="4296714962311604126">"အကြောင်းအရာ"</string>
     <string name="add_attachment" msgid="7103751293360532684">"ပူးတွဲ ထည့်ရန်"</string>
     <string name="add_subject" msgid="7616134948428265870">"အကြောင်းအရာ ထည့်ရန်"</string>
-    <string name="discard" msgid="1624800293064498479">"ထားလိုက်တော့"</string>
+    <string name="discard" msgid="1624800293064498479">"လွှတ်လိုက်ရန်"</string>
     <string name="view" msgid="7929667761715467136">"မြင်ကွင်း"</string>
     <string name="replace" msgid="7587904998114459388">"အစားထိုးမည်"</string>
     <string name="remove" msgid="4625444913256213175">"ဖယ်ရှားရန်"</string>
@@ -147,7 +147,7 @@
     <string name="menu_add_to_contacts" msgid="1258127580972228970">"လူ ထဲသို့ထည့်မည်"</string>
     <string name="hidden_sender_address" msgid="2776075636669924968">"စာပို့သူလိပ်စာအား ဝှက်ထားမည်"</string>
     <string name="yes" msgid="3246158147503160811">"ကောင်းပြီ"</string>
-    <string name="no" msgid="4289742508556913860">"ထားတော့"</string>
+    <string name="no" msgid="4289742508556913860">"ပယ်ဖျက်သည်"</string>
     <string name="set" msgid="4642365398263275979">"အတည်ပြုရန်"</string>
     <string name="play" msgid="1888432400937785115">"ဖွင့်မည်"</string>
     <string name="edit" msgid="5912118407791492696">"ပြင်ဆင်ရန်"</string>
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"အသံ"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"စာမည်မျှ သိမ်းဆည်းမည်ကို သတ်မှတ်မည်။"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"အသံတိတ်ရန်"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"စာ တစ်စောင်ကို ပို့တိုင်း မည်သည့် SIM ကို မေး"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"မာလ်တီ-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"အလိုအလျောက် ပြန်လည်ရယူမည်"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"စာများကို အလိုအလျောက်ပြန်လည်ရရှိရန်ပြုလုပ်မည်။"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"ရုန်းမင်းလုပ်စဉ် အလိုအလျောက် ပြန်လည်ထုတ်ယူမည်"</string>
@@ -203,8 +201,8 @@
     <string name="delete_unlocked" msgid="7545321606698162261">"သော့ချထားသောစာကို ဖျက်မည်"</string>
     <string name="delete" msgid="1409973060081564612">"ဖျက်ပစ်ရန်"</string>
     <string name="select_conversations" msgid="7816517565640002844">"စကားပြောဆက်သွယ်မှုကို ရွေးရန်"</string>
-    <string name="no_conversations" msgid="6773767655149258445">"စကားပြောဆိုထားခြင်း မရှိသေးပါ"</string>
-    <string name="loading_conversations" msgid="5510430408235967094">"စကားပြောဆိုထားခြင်းများကို ဆွဲတင်နေပါတယ်"</string>
+    <string name="no_conversations" msgid="6773767655149258445">"စကားပြောဆက်သွယ်ထားခြင်းမရှိပါ"</string>
+    <string name="loading_conversations" msgid="5510430408235967094">"စကားပြောဆက်သွယ်ထားခြင်းများကို တင်နေပါသည်"</string>
     <string name="cannot_get_details" msgid="850292987983026806">"အသေးစိတ်များ မရနိုင်ပါ"</string>
     <string name="message_details_title" msgid="9223295113731634528">"စာ၏အသေးစိတ်"</string>
     <string name="message_type_label" msgid="7975373966795945566">"အမျိုးအစား - "</string>
@@ -320,7 +318,7 @@
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"ရှာဖွေချက်မှတ်တမ်းကိုံ ရှင်းလင်းနေသည်"</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"ရှာဖွေထားသည့်မှတ်တမ်းကို ရှင်းလင်းနေသည်။"</string>
     <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"ရှာဖွေရန် အကွက်ထဲတွင် ယခင်စာများ ရှာဖွေထားခြင်းများ ပေါ်လာခြင်းကို ဖယ်ရှင်းမည်"</string>
-    <string name="save" msgid="6847069284991531310">"သိမ်းပါ"</string>
+    <string name="save" msgid="6847069284991531310">"သိမ်းဆည်းရန်"</string>
     <string name="storage_limits_title" msgid="7074684882530693016">"စာအရေအတွက်ကို ကန့်သတ်မည်"</string>
     <string name="storage_limits_message" msgid="2010501485394745696">"စာဆက်သွယ်မှုတစ်ခုတွင် စာဘယ်နှစ်စောင်သိမ်းဆည်းမည်ကို ကန့်သတ်မည်"</string>
     <string name="storage_limits_setting" msgid="4952781049308537373">"ကန့်သတ်ချက်ကို သတ်မှတ်မည်"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"စာပို့ခြင်းမှာ သင့်၏ စာတိုပို့ရန် အပလီကေးရှင်း မဟုတ်ပါ"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g>မှာ သင့် စတိုပို့ရန် အပလီကေးရှင်းဖြစ်သည်"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"၎င်းကို ဆက်တင်းများထဲသွား၍ ပြင်ဆင်နိုင်ပါသည်။"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"ဆင်းမ် ကို ရွေးရန်"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"ဆင်းမ် <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"ဆင်းမ် အပေါက် <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"ထားတော့"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"လက်ရှိ ရွေးထားသည့် SIM မရှိပါ။ စနစ် ဆက်တင်များ ထဲမျာ သင်၏ ပုံသေ SIM ကို ရွေးပါ။"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 3d9daad8..83814588 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Lyd"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Angi antall meldinger som skal lagres"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Stille"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Spør hvilket SIM-kort som skal brukes hver gang en melding sendes"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Autohent"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Hent meldinger automatisk"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automatisk henting ved bruk i utlandet"</string>
@@ -355,11 +353,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Messaging er ikke SMS-appen din"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> er SMS-appen din"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Du kan endre dette i innstillingene."</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Velg SIM-kort"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM-spor <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Avbryt"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"SIM-kortet som er valgt for øyeblikket, er ikke satt inn. Velg standard SIM-kort i systeminnstillingene."</string>
 </resources>
diff --git a/res/values-ne-rNP/arrays.xml b/res/values-ne-rNP/arrays.xml
index fd3a1e01..60cf9f51 100644
--- a/res/values-ne-rNP/arrays.xml
+++ b/res/values-ne-rNP/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"शीर्षक नभएको"</item>
-    <item msgid="2214945158821871846">"विषय छैन"</item>
   </string-array>
 </resources>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml
index 78fd605b..195b392b 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne-rNP/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -357,11 +357,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"सन्देशन तपाईँको SMS अनुप्रयोग होइन"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> तपाईँको SMS अनुप्रयोग हो"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"तपाईँ यसलाई सेटिङहरूमा बदल्न सक्नु हुन्छ"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"SIM चयन गर्नुहोस्"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"सिम <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"सिम स्लट <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"रद्द गर्नुहोस्"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"..."</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"हालैमा चयन गरिएको SIM छैन। प्रणाली सेटिङहरूमा तपाईँ पूर्वनिर्धारित SIM छान्नुहोस्।"</string>
 </resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
deleted file mode 100644
index 656d6c18..00000000
--- a/res/values-ne/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1503967887341230795">"सन्देश पठाउँदै"</string>
-    <string name="new_message" msgid="1530369762346003973">"नयाँ सन्देश"</string>
-    <string name="menu_call_back" msgid="7538482331117914146">"कल <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_send_email" msgid="671366308915241664">"<xliff:g id="NAME">%s</xliff:g>मा इमेल पठाउनुहोस्"</string>
-    <string name="menu_compose_new" msgid="3763437973691046238">"रचना गर्नुहोस्"</string>
-    <string name="menu_preferences" msgid="4693148116114749414">"सेटिङहरू"</string>
-    <string name="menu_add_address_to_contacts" msgid="4491980950419914944">"<xliff:g id="CONTACTEMAILORNUMBER">%s</xliff:g> व्यक्तिहरूमा थप गर्नुहोस्"</string>
-    <string name="menu_call" msgid="5877123227307074690">"कल गर्नुहोस्"</string>
-    <string name="menu_search" msgid="2289469305728821360">"खोज्नुहोस्"</string>
-    <string name="menu_delete_all" msgid="808729454898114735">"सबै थ्रेडहरू मेटाउनुहोस्"</string>
-    <string name="menu_delete" msgid="1851666911396479006">"थ्रेड मेटाउनुहोस्"</string>
-    <string name="menu_view" msgid="7448852683948080108">"थ्रेड हेर्नुहोस्"</string>
-    <string name="menu_debug_dump" msgid="6855869130206549643">"DEBUG DUMP"</string>
-    <string name="refreshing" msgid="987335057871404222">"पुनःताजकिकरण..."</string>
-    <string name="menu_cell_broadcasts" msgid="5646161375983084660">"सेल प्रसारणहरू"</string>
-    <string name="has_draft" msgid="2487465595514636160">"ड्राफ्ट"</string>
-    <string name="no_subject_view" msgid="7795086723069563537">"(कुनै विषय छैन)"</string>
-    <string name="messagelist_sender_self" msgid="3579016854116401602">"मलाई"</string>
-    <string name="view_slideshow" msgid="4990460971211388453">"स्लाइड प्रस्तुति हेर्नुहोस्"</string>
-    <string name="view_message_details" msgid="7613457646645796831">"विवरणहरू हेर्नुहोस्"</string>
-    <string name="view_delivery_report" msgid="8219095994071575215">"रिपोर्ट हेर्नुहोस्"</string>
-    <string name="delete_message" msgid="6442394955910357234">"मेट्नुहोस्"</string>
-    <string name="expire_on" msgid="4436268382742593921">"अवधि सकियो: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="kilobyte" msgid="534782148965716631">"KB"</string>
-    <string name="undelivered_msg_dialog_title" msgid="7479433403599785755">"डेलिभर नगरिएको सन्देश"</string>
-    <string name="undelivered_msg_dialog_body" msgid="4789268239627694551">"यो सन्देश पठाउन सकेन।\nप्रयास गरियो: <xliff:g id="MESSAGE">%s</xliff:g>।"</string>
-    <string name="undelivered_sms_dialog_body" msgid="4203703285563450868">"यो सन्देश पठाउन सकेन।"</string>
-    <string name="delete_thread" msgid="757258847736632791">"थ्रेड मेट्नुहोस्"</string>
-    <string name="menu_forward" msgid="9026858380050046756">"अग्रेषित गर्नुहोस्"</string>
-    <string name="download" msgid="4488877642230207631">"डाउनलोड"</string>
-    <string name="downloading" msgid="1779557575565350637">"डाउनलोड हुँदै"</string>
-    <string name="inline_subject" msgid="4057621785274119260">"&lt;विषय: <xliff:g id="SUBJECT">%s</xliff:g>&gt;"</string>
-    <string name="drm_protected_text" msgid="1396394157870730742">"* DRM संरक्षित पाठ *"</string>
-    <string name="insufficient_drm_rights" msgid="6989074725969164383">"अपर्याप्त DRM अधिकारहरू पत्ता लगाइयो।"</string>
-    <string name="copy_message_text" msgid="4296252229544252834">"पाठ प्रतिलिपि गर्नुहोस्"</string>
-    <string name="message_options" msgid="6838806653341967550">"सन्देश विकल्पहरू"</string>
-    <string name="slideshow_options" msgid="3501759384739796431">"स्लाइड प्रदर्शन विकल्पहरू"</string>
-    <string name="done" msgid="7479926268660505871">"भयो"</string>
-    <string name="move_up" msgid="7307578107431739359">"माथि सार्नुहोस्"</string>
-    <string name="move_down" msgid="6356509518429479053">"तल सार्नुहोस्"</string>
-    <string name="remove_slide" msgid="2225604354024914900">"स्लाइड हटाउनुहोस्"</string>
-    <string name="add_slide" msgid="9140721399423564187">"स्लाइड थप्नुहोस्"</string>
-    <string name="add_slide_hint" msgid="7351356961076244584">"नयाँ स्लाइड सिर्जना गर्न छुनुहोस्।"</string>
-    <string name="discard_slideshow" msgid="5054239124146413609">"स्लाइड प्रदर्शन त्याग्नुहोस्"</string>
-    <string name="slide_show_part" msgid="5077675385448696846">"अंश <xliff:g id="PART">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="remove_text" msgid="2164068850029476539">"पाठ हटाउनुहोस्"</string>
-    <string name="add_picture" msgid="7819574884962571479">"चित्र थप्नुहोस्"</string>
-    <string name="remove_picture" msgid="6378701749074289096">"तस्बिर हटाउनुहोस्"</string>
-    <string name="add_music" msgid="3827442822987116233">"संगीत थप्नुहोस्"</string>
-    <string name="remove_music" msgid="858889733416015223">"संगीत हटाउनुहोस्"</string>
-    <string name="add_video" msgid="7816866867806595144">"भिडियो थप्नुहोस्"</string>
-    <string name="remove_video" msgid="5258603891528497799">"भिडियो हटाउनुहोस्"</string>
-    <string name="to_hint" msgid="224029549150332986">"प्रापक"</string>
-    <string name="subject_hint" msgid="4296714962311604126">"विषय"</string>
-    <string name="add_attachment" msgid="7103751293360532684">"जोड्नुहोस्"</string>
-    <string name="add_subject" msgid="7616134948428265870">"विषय थप्नुहोस्"</string>
-    <string name="discard" msgid="1624800293064498479">"त्याग्नुहोस्"</string>
-    <string name="view" msgid="7929667761715467136">"दृश्य"</string>
-    <string name="replace" msgid="7587904998114459388">"बदल्नुहोस्"</string>
-    <string name="remove" msgid="4625444913256213175">"हटाउनुहोस्"</string>
-    <string name="send" msgid="4589898724889248486">"पठाउनुहोस्"</string>
-    <string name="mms" msgid="1587631213714914559">"MMS"</string>
-    <string name="send_mms" msgid="2933162044872550662">"MMS पठाउनुहोस्"</string>
-    <string name="all_threads" msgid="2663426830306307194">"सबै थ्रेडहरू"</string>
-    <string name="type_to_compose_text_enter_to_send" msgid="3539985471008581265">"सन्देश टाइप गर्नुहोस्"</string>
-    <string name="open_keyboard_to_compose_message" msgid="7860109685511253191">"सन्देश टाइप गर्न किबोर्ड खोल्नुहोस्"</string>
-    <string name="compressing" msgid="1961357529661045180">"तस्बिर एकदमै ठूलो। कम्प्रेस गर्दै..."</string>
-    <string name="unsupported_media_format" msgid="1350489690977363764">"असमर्थित <xliff:g id="NAME">%1$s</xliff:g> ढाँचा।"</string>
-    <string name="select_different_media" msgid="6241623357299382183">"एक भिन्न <xliff:g id="NAME">%1$s</xliff:g> छनौट गर्नुहोस्।"</string>
-    <string name="exceed_message_size_limitation" msgid="6027753647094742437">"सन्देश आकार सीमा सीमित भयो।"</string>
-    <string name="message_too_big_for_video" msgid="2639367545165352543">"भिडियो संलग्न गर्न सन्देश निकै ठूलो छ।"</string>
-    <string name="failed_to_add_media" msgid="7207464170168708485">"तपाईं यो <xliff:g id="NAME">%1$s</xliff:g> आफ्नो सन्देशमा थप गर्न सक्नु हुन्न।"</string>
-    <string name="failed_to_resize_image" msgid="5608354151631833669">"तस्बिर रिसाइज भएन।"</string>
-    <string name="resize_image_error_information" msgid="3783200130776554475">"पुनःआकार गर्दा पनि यो तस्बिर पठाउनको लागि निकै ठूलो छ।"</string>
-    <string name="forward_prefix" msgid="276280492803486464">"Fwd: "</string>
-    <string name="discard_message_reason" msgid="2667664943003796133">"तपाईंको सन्देश खारेज हुने छ किनभने यससँग कुनै मान्य प्राप्तकर्ताहरू छैनन्।"</string>
-    <string name="has_invalid_recipient" msgid="1485388396900997383">"अमान्य प्राप्तकर्ता(हरू): &lt;<xliff:g id="NAME">%1$s</xliff:g>&gt;"</string>
-    <string name="invalid_destination" msgid="4573835601024786416">"अवैध गन्तव्य ठेगाना।"</string>
-    <string name="service_not_activated" msgid="9178218144019626176">"सेवा नेटवर्कमा सक्रिय गरिएको छैन।"</string>
-    <string name="service_message_not_found" msgid="1908877102600048515">"सन्देशको अवधि सकियो वा उपलब्ध छैन।"</string>
-    <string name="service_network_problem" msgid="4583269174855943025">"नेटवर्क समस्याको कारण पठाउन सकेन।"</string>
-    <string name="invalid_recipient_message" msgid="6465343105010999068">"प्राप्तकर्ता(हरू) सुधार्नुहोस् वा उनीहरूले सन्देश प्राप्त गर्दैनन्।"</string>
-    <string name="cannot_send_message" msgid="3414307479833622644">"सन्देश पठाउन सक्दैन।"</string>
-    <string name="cannot_send_message_reason" msgid="8745080126044054343">"तपाईंको सन्देशमा कुनै मान्य प्राप्तकर्ताहरू छैनन्।"</string>
-    <string name="cannot_forward_drm_obj" msgid="5047623751430559077">"सन्देशमा समावेश DRM वस्तु अग्रेषित गर्न सकिँदैन।"</string>
-    <string name="converting_to_picture_message" msgid="2980023239017588627">"मल्टिमिडिया सन्देशमा रूपान्तर हुँदै..."</string>
-    <string name="cannot_add_slide_anymore" msgid="4631404749618820994">"अधिक स्लाइडहरू थप गर्न सक्दैन।"</string>
-    <string name="cannot_add_picture_and_video" msgid="4954353772391381447">"एउटा स्लाइडमा भिडियो र तस्बिर थप गर्न सक्दैन।"</string>
-    <string name="cannot_save_message" msgid="3375907366965264446">"सन्देश बचत गर्न सक्दैन।"</string>
-    <string name="message_saved_as_draft" msgid="2503018972659880692">"सन्देश ड्राफ्टको रूपमा बचत गरियो।"</string>
-    <string name="too_many_recipients" msgid="7003415094007176931">"सन्देशसँग धेरै नै प्राप्तकर्ताहरू (<xliff:g id="CURRENTCOUNT">%1$s</xliff:g>) रहेका छन्। त्यहाँ <xliff:g id="MAXLIMIT">%2$s</xliff:g> प्राप्तकर्ताहरूको सीमा छ।"</string>
-    <string name="too_many_attachments" msgid="3774037894899750070">"त्यहाँ <xliff:g id="MAXLIMIT">%1$s</xliff:g> संलग्नहरूको सीमा छ। केवल पहिलो <xliff:g id="CURRENTCOUNT">%2$s</xliff:g> थप गरिने छ।"</string>
-    <string name="adding_attachments_title" msgid="2034535554212405529">"अनुलग्नकहरू थप गरिँदै"</string>
-    <string name="adding_attachments" msgid="5871373105122355632">"आइटम स्लाइड प्रदर्शनमा थप भइन्जेल प्रतिक्षा गर्नुहोस्।"</string>
-    <string name="building_slideshow_title" msgid="1232338692400726385">"स्लाइड प्रस्तुति बनाउँदै"</string>
-    <string name="cannot_play_audio" msgid="253920977253666735">"अडियो बजाउन सक्दैन।"</string>
-    <string name="preview" msgid="5438149136136446756">"पूर्वावलोकन"</string>
-    <string name="preview_slideshow" msgid="6824095909448728427">"पूर्वावलोकन"</string>
-    <string name="replace_image" msgid="3171240952601443619">"तस्बिर बदल्नुहोस्"</string>
-    <string name="duration_sec" msgid="6617032324007824096">"अवधि (<xliff:g id="DURATION">%s</xliff:g> सेकेन्ड)"</string>
-    <string name="duration_selector_title" msgid="5981097971537625852">"स्लाइडको लागि अवधि "</string>
-    <string name="layout_selector_title" msgid="7344600117972450771">"स्लाइड प्रदर्शन बनावट "</string>
-    <string name="layout_top" msgid="6811021650398972346">"बनावट (शीर्ष)"</string>
-    <string name="layout_bottom" msgid="5822765871095491843">"बनावट (तल)"</string>
-    <string name="type_to_compose_text_or_leave_blank" msgid="7769792471457574059">"सन्देश टाइप गर्नुहोस् वा खाली छोड्नुहोस्"</string>
-    <string name="duration_not_a_number" msgid="2856636898040421237">"अवधि एउटा संख्या हुनुपर्दछ।"</string>
-    <string name="duration_zero" msgid="3549377790195185977">"अवधि शून्य सेकेन्डभन्दा ठूलो हुनु पर्दछ।"</string>
-    <string name="secs" msgid="6886003523109967972">"सेकेन्ड"</string>
-  <string-array name="select_dialog_items">
-    <item msgid="4840183714016984112">"१ सेकेन्ड"</item>
-    <item msgid="3734955613666864447">"२ सेकेन्ड"</item>
-    <item msgid="6032232473048379828">"३ सेकेन्ड"</item>
-    <item msgid="5978471781525927827">"४ सेकेन्ड"</item>
-    <item msgid="4888440297621208402">"५ सेकेन्ड"</item>
-    <item msgid="6047246213264166841">"६ सेकेन्ड"</item>
-    <item msgid="2327501250056533797">"७ सेकेन्ड"</item>
-    <item msgid="3400770414689795703">"८ सेकेन्ड"</item>
-    <item msgid="4358760614161107970">"९ सेकेन्ड"</item>
-    <item msgid="2618179407176906471">"१० सेकेन्ड"</item>
-    <item msgid="7786079681602275449">"अन्य"</item>
-  </string-array>
-    <string name="menu_view_contact" msgid="1414670584423909451">"सम्पर्क हेर्नुहोस्"</string>
-    <string name="menu_add_to_contacts" msgid="1258127580972228970">"व्यक्तिहरूमा थप गर्नुहोस्"</string>
-    <string name="hidden_sender_address" msgid="2776075636669924968">"प्रेषक ठेगाना लुकेको"</string>
-    <string name="yes" msgid="3246158147503160811">"ठिक छ"</string>
-    <string name="no" msgid="4289742508556913860">"रद्द गर्नुहोस्"</string>
-    <string name="set" msgid="4642365398263275979">"मिलाउनुहोस्"</string>
-    <string name="play" msgid="1888432400937785115">"बजाउनुहोस्"</string>
-    <string name="edit" msgid="5912118407791492696">"सम्पादन गर्नुहोस्"</string>
-    <string name="try_to_send" msgid="1996751738286080976">"पठाउन प्रयास गर्नुहोस्"</string>
-    <string name="preferences_title" msgid="6650089610332670157">"सेटिङहरू"</string>
-    <string name="restore_default" msgid="7165341506551155053">"पूर्वनिर्धारित सेटिङ पुनर्स्थापित गर्नुहोस्"</string>
-    <string name="pref_notification_settings_title" msgid="6420782563630369776">"सूचनाहरू"</string>
-    <string name="pref_mms_settings_title" msgid="55618772118264355">"मल्टिमिडिया (MMS) सन्देश"</string>
-    <string name="pref_sms_settings_title" msgid="5173078369851066881">"पाठ (SMS) सन्देश"</string>
-    <string name="pref_sms_storage_title" msgid="9001233319190616445">"भण्डारण"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"तपाईंको SIM कार्डमा संग्रहित सन्देश प्रबन्ध गर्नुहोस्"</string>
-    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"तपाईंले पठाउनुभएको प्रत्येक सन्देशको लागि डेलिभरी अनुरोध गर्नुहोस्"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"तपाईंले पठाउनुभएको हरेक सन्देशको लागि पढेको रिपोर्ट अनुरोध गर्नुहोस्"</string>
-    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"तपाईंले पठाउनु हुने हरेक सन्देशको लागि डेलिभरी रिपोर्टको अनुरोध गर्नुहोस्"</string>
-    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"सीमामा पुगेका पुराना सन्देशहरू मेटाउनुहोस्"</string>
-    <string name="pref_summary_delete_limit" msgid="597128041393045216">"<xliff:g id="COUNT">%1$s</xliff:g> सन्देशहरू प्रति कुराकानीमा"</string>
-    <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"एकल सन्देश पठाउनको लागि MMS प्रयोग गर्नुहोस् जब त्यहाँ बहुप्राप्तकर्ताहरू हुन्छन्।"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"SIM कार्ड सन्देशहरू प्रबन्ध गर्नुहोस्"</string>
-    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"डेलिभरी रिपोर्टहरू"</string>
-    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"समूह सन्देश पठाइ"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"रिपोर्टहरू पढ्नुहोस्"</string>
-    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"डेलिभरी रिपोर्टहरू"</string>
-    <string name="pref_title_auto_delete" msgid="7227835692631701134">"पुराना सन्देशहरू मेटाउनुहोस्"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"पाठ सन्देश सीमा"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"मल्टिमिडिया सन्देश सीमा"</string>
-    <string name="pref_title_notification_enabled" msgid="9118792213953729414">"सूचनाहरू"</string>
-    <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"कम्पन"</string>
-    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ध्वनि"</string>
-    <string name="pref_messages_to_save" msgid="3202539743892934926">"बचत गर्न सन्देशका संख्याहरू मिलाउनुहोस्"</string>
-    <string name="silent_ringtone" msgid="7981237991326592780">"मौन"</string>
-    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"स्वतः पुनःप्राप्ति"</string>
-    <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"सन्देश स्वतः रूपमा पुनःप्राप्त गर्नुहोस्"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"स्वत: पुनः प्राप्ति रोमिङ"</string>
-    <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"रोमिङको बखत स्वचालित रूपमा सन्देशहरू पुनःप्राप्त गर्नुहोस्"</string>
-    <string name="confirm_dialog_title" msgid="2187213750475782725">"मेट्नु हुन्छ?"</string>
-    <string name="confirm_dialog_locked_title" msgid="8179085718150932242">"लक गरिएको सन्देश मेटाउनु हुन्छ?"</string>
-  <plurals name="confirm_delete_conversation">
-    <item quantity="one" msgid="7509396981963472833">"एउटा कुराकानी मेटिने छ।"</item>
-    <item quantity="other" msgid="4076915774012081811">"<xliff:g id="NUMBER">%1$s</xliff:g> कुराकानीहरू मेटिने छन्।"</item>
-  </plurals>
-    <string name="confirm_delete_conversation" msgid="6115966687389279855">"सम्पूर्ण थ्रेड मेटिने छन्।"</string>
-    <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"सबै थ्रेडहरू मेटिने छन्।"</string>
-    <string name="confirm_delete_message" msgid="9121480656609809591">"सन्देश मेटिने छ।"</string>
-    <string name="confirm_delete_locked_message" msgid="7203411948190100955">"यो लक गरिएको सन्देश मेटाउनु हुन्छ?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"SIM कार्डमा भएका सबै सन्देशहरू मेटिने छन्।"</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"SIM कार्डमा भएको सन्देश मेटिने छन्।"</string>
-    <string name="delete_unlocked" msgid="7545321606698162261">"लक गरिएका सन्देशहरू मेट्नुहोस्"</string>
-    <string name="delete" msgid="1409973060081564612">"मेट्नुहोस्"</string>
-    <string name="select_conversations" msgid="7816517565640002844">"कुराकानीहरू छनौट गर्नुहोस्"</string>
-    <string name="no_conversations" msgid="6773767655149258445">"कुनै कुराकानीहरू छैनन्।"</string>
-    <string name="loading_conversations" msgid="5510430408235967094">"कुराकानीहरू लोड हुँदै।"</string>
-    <string name="cannot_get_details" msgid="850292987983026806">"विवरण प्राप्त गर्न सक्दैन।"</string>
-    <string name="message_details_title" msgid="9223295113731634528">"सन्देश विवरणहरू"</string>
-    <string name="message_type_label" msgid="7975373966795945566">"प्रकार: "</string>
-    <string name="text_message" msgid="8196464345251877972">"पाठ सन्देश"</string>
-    <string name="multimedia_message" msgid="1512644521083533071">"मल्टिमिडिया सन्देश"</string>
-    <string name="multimedia_notification" msgid="4124031788554972308">"मल्टिमिडिया सन्देश सूचना"</string>
-    <string name="from_label" msgid="2055117571548171397">"बाट: "</string>
-    <string name="to_address_label" msgid="5837363600471845801">"प्रापक: "</string>
-    <string name="bcc_label" msgid="530867161453958774">"Bcc: "</string>
-    <string name="sent_label" msgid="2722190650145251584">"पठाइयो: "</string>
-    <string name="received_label" msgid="8618029024731693906">"प्राप्त: "</string>
-    <string name="saved_label" msgid="4183160415593488207">"बचत गरियो: "</string>
-    <string name="subject_label" msgid="8721241914144101631">"विषय: "</string>
-    <string name="message_size_label" msgid="4698016210013319786">"सन्देश आकार: "</string>
-    <string name="priority_label" msgid="7397600367853359607">"प्राथमिकता: "</string>
-    <string name="priority_high" msgid="5627897207952009214">"उच्च"</string>
-    <string name="priority_normal" msgid="5715227727384683550">"साधारण"</string>
-    <string name="priority_low" msgid="8928782666023373987">"कम"</string>
-    <string name="message_class_label" msgid="5115748690481550562">"सन्देश वर्ग: "</string>
-    <string name="error_code_label" msgid="5810068247647058769">"त्रुटि कोड: "</string>
-    <string name="menu_edit" msgid="3056513240155967777">"सम्पादन गर्नुहोस्"</string>
-    <string name="menu_delete_messages" msgid="2610286783513247420">"सन्देशहरू मेटाउनुहोस्"</string>
-    <string name="menu_lock" msgid="7603793126077557472">"लक गर्नुहोस्"</string>
-    <string name="menu_unlock" msgid="6662865558677424039">"अनलक गर्नुहोस्"</string>
-    <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"ट्याब्लेट मेमोरीमा प्रतिलिपि गर्नुहोस्"</string>
-    <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"फोन मेमोरीमा प्रतिलिपि गर्नुहोस्"</string>
-    <string name="sim_delete" msgid="610790510655316922">"मेट्नुहोस्"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"SIM कार्डमा पाठ सन्देशहरू"</string>
-    <string name="sim_view" msgid="1997173541766393706">"दृश्य"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"SIM कार्डमा कुनै सन्देशहरू छैन।"</string>
-    <string name="delivery_header_title" msgid="5361719578869045764">"रिपोर्ट"</string>
-    <string name="status_none" msgid="8253075950774894961">"(कुनै पनि होइन)"</string>
-    <string name="status_pending" msgid="2739860824607984892">"थाती"</string>
-    <string name="status_read" msgid="7576195253780627332">"पढ्नुहोस्"</string>
-    <string name="status_received" msgid="7264334589461906965">"प्राप्त"</string>
-    <string name="status_failed" msgid="1998776666856593544">"असफल"</string>
-    <string name="status_unread" msgid="8555305495998700198">"नपढिएको"</string>
-    <string name="status_rejected" msgid="2613641949065942678">"रद्द गरिएको"</string>
-    <string name="recipient_label" msgid="3922667485312634446">"प्राप्तकर्ता: "</string>
-    <string name="status_label" msgid="7283375460919181660">"स्थिति: "</string>
-    <string name="delivered_label" msgid="3514011729156932928">"डेलिभर भयो: "</string>
-    <string name="attach_image" msgid="6439985727687107742">"तस्बिरहरू"</string>
-    <string name="attach_take_photo" msgid="4280601313184373837">"तस्बिर क्याप्चर गर्नुहोस्"</string>
-    <string name="attach_video" msgid="4264272693501538294">"भिडियोहरू"</string>
-    <string name="attach_record_video" msgid="3099814114743078615">"भिडियो क्याप्चर गर्नुहोस्"</string>
-    <string name="attach_sound" msgid="3149325985970669609">"अडियो"</string>
-    <string name="attach_record_sound" msgid="6011431304469858929">"अडियो रेकर्ड गर्नुहोस्"</string>
-    <string name="attach_slideshow" msgid="3497422151091037063">"स्लाइड प्रदर्शन"</string>
-    <string name="select_bottom_text" msgid="4201966447623311931">"तलको पाठ"</string>
-    <string name="select_top_text" msgid="6734183477539197815">"शीर्षमा पाठ"</string>
-    <string name="delivery_toast_body" msgid="5960519861835727013">"सन्देश %s द्वारा प्राप्त भयो।"</string>
-    <string name="notification_multiple" msgid="7684007285202109490">"<xliff:g id="COUNT">%s</xliff:g> अपठित सन्देशहरू।"</string>
-    <string name="notification_multiple_title" msgid="332602028959557541">"नयाँ सन्देशहरू"</string>
-    <string name="notification_failed_multiple" msgid="6192531993698497229">"<xliff:g id="COUNT">%s</xliff:g> सन्देशहरू पठाउन सकिएन"</string>
-    <string name="notification_failed_multiple_title" msgid="1112032024904397126">"सन्देश पठाइएन"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"SIM कार्ड भरियो"</string>
-    <string name="sim_full_body" msgid="6241664980790322925">"थप ठाउँ बनाउनको लागि केही सन्देशहरू मेट्नुहोस्।"</string>
-    <string name="sms_full_title" msgid="6041287140125011854">"पाठ सन्देश मेमोरी पुरा"</string>
-    <string name="sms_full_body" msgid="4885861852397651868">"पुरा मेमोरीको कारण आउने सन्देश रद्द गरियो। केही पुराना सन्देशहरू मेट्नुहोस्।"</string>
-    <string name="sms_rejected_title" msgid="8548394922491529811">"पाठ सन्देश रद्द गरियो"</string>
-    <string name="sms_rejected_body" msgid="7813671133968158562">"एउटा अज्ञात कारणले गर्दा आउने सन्देश रद्द गरियो।"</string>
-    <string name="type_audio" msgid="3842064092332309756">"अडियो"</string>
-    <string name="type_picture" msgid="4091928975383609443">"तस्बिर"</string>
-    <string name="type_video" msgid="8521556159545168441">"भिडियो"</string>
-    <string name="confirm" msgid="3155110885840591914">"निश्चित गर्नुहोस्"</string>
-    <string name="message_send_read_report" msgid="6997117678914261250">"एउटा पढिएको रिपोर्ट पठाइने छ।"</string>
-    <string name="message_queued" msgid="7975945623873194737">"वर्तमानमा तपाईंको सन्देश पठाउन सकेन। यो सेवा उपलब्ध भएको बेलामा पठाइने छ।"</string>
-    <string name="fdn_check_failure" msgid="7880740763778173551">"तपाईंको फिक्स डायलिङ नम्बरहरूमा मात्र तपाईं सन्देश पठाउन सक्नु हुने छ।"</string>
-    <string name="no_subject" msgid="4168963736134552285">"(कुनै विषय छैन)"</string>
-    <string name="unknown_sender" msgid="4929330613278853635">"अज्ञात प्रेषक"</string>
-    <string name="dl_failure_notification" msgid="8097699679464396537">"सन्देश <xliff:g id="SUBJECT">%1$s</xliff:g> यस <xliff:g id="FROM">%2$s</xliff:g>बाट डाउनलोड गर्न सकेन।"</string>
-    <string name="rate_limit_surpassed" msgid="1347801608211628177">"निश्चित गर्नुहोस्"</string>
-    <string name="confirm_rate_limit" msgid="234228299751243067">"ठूलो संख्याको मल्टिमिडिया सन्देश पठाईँदै छ। के यो ठिक छ?"</string>
-    <string name="message_download_failed_title" msgid="5722226064394767921">"सन्देश डाउनलोड भएन"</string>
-    <string name="message_send_failed_title" msgid="3469894907399046372">"सन्देश पठाइएन"</string>
-    <string name="message_failed_body" msgid="3421296112073915245">"सन्देश समीक्षा गर्न छुनुहोस् र फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="download_later" msgid="5531365714424360903">"अहिले डाउनलोड गर्न सक्दैन। पछि फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="no_apn" msgid="505932916503312015">"उपकरणमा कुनै निर्दिष्ट APN छैन।"</string>
-    <string name="select_audio" msgid="3528161449756771832">"अडियो छनौट गर्नुहोस्"</string>
-    <string name="copy_to_sdcard" msgid="757028609638184856">"संलग्न बचत गर्नुहोस्"</string>
-    <string name="copy_to_sdcard_success" msgid="7948625615155992014">"संलग्न बचत भयो।"</string>
-    <string name="copy_to_sdcard_fail" msgid="4944606369631916737">"संलग्न बचत गर्न सकिँदैन।"</string>
-    <string name="save_ringtone" msgid="2310157075045201051">"रिङटोनको रूपमा बचत गर्नुहोस्"</string>
-    <string name="saved_ringtone" msgid="3847363932276708626">"रिङटोन बचत गरियो।"</string>
-    <string name="saved_ringtone_fail" msgid="4778500070919251116">"रिङटोन बचत गर्न सकेन।"</string>
-    <string name="menu_insert_smiley" msgid="4964504393061025071">"स्माइली घुसाउनुहोस्"</string>
-    <string name="menu_group_participants" msgid="4288356090262299071">"समूह सहभागीहरू"</string>
-    <string name="select_link_title" msgid="3371818607625768447">"कार्य छनौट गर्नुहोस्"</string>
-    <string name="slide_number" msgid="1923958526266726635">"स्लाइड <xliff:g id="NUMBER">%s</xliff:g>"</string>
-  <plurals name="slide_duration">
-    <item quantity="one" msgid="1654101988340583935">"<xliff:g id="NUMBER">%s</xliff:g> सेकेन्ड"</item>
-    <item quantity="few" msgid="7887190171856293871">"<xliff:g id="NUMBER">%s</xliff:g> सेकेन्ड"</item>
-    <item quantity="other" msgid="3736425355579939863">"<xliff:g id="NUMBER">%s</xliff:g> सेकेन्ड"</item>
-  </plurals>
-    <string name="delivery_report_activity" msgid="2957463094232916364">"डेलिभरी रिपोर्ट"</string>
-    <string name="storage_limits_activity" msgid="8810530813311077716">"भण्डारण सीमाहरू"</string>
-    <string name="change_duration_activity" msgid="7048606979485031693">"अवधि परिवर्तन गर्नुहोस्"</string>
-    <string name="edit_slideshow_activity" msgid="8751493388760050529">"स्लाइड प्रदर्शन सम्पादन गर्नुहोस्"</string>
-    <string name="recipient_list_activity" msgid="1254938236543727019">"समूह सहभागीहरू"</string>
-    <string name="edit_slide_activity" msgid="8752829671778696983">"स्लाइड सम्पादन गर्नुहोस्"</string>
-    <string name="slideshow_activity" msgid="5658249461317434432">"स्लाइड प्रदर्शन"</string>
-    <string name="class_0_message_activity" msgid="6631339964159861048">"वर्ग ० सन्देश"</string>
-    <string name="search_label" msgid="6042598929386174964">"सन्देश पठाइ"</string>
-    <string name="search_hint" msgid="7273727663577472044">"सन्देश पठाइ खोज्नुहोस्"</string>
-    <string name="search" msgid="7560238620274735199">"सन्देश पठाइ"</string>
-    <string name="search_setting_description" msgid="4104004595086437572">"तपाईंको सन्देशहरूमा पाठ"</string>
-    <string name="search_empty" msgid="2109551478056039278">"कुनै मिलानहरू छैनन्।"</string>
-  <plurals name="search_results_title">
-    <item quantity="one" msgid="4657073733087431350">"<xliff:g id="NUMBER">%1$s</xliff:g> यस \"<xliff:g id="SEARCH">%2$s</xliff:g>\"का लागि परिणाम"</item>
-    <item quantity="other" msgid="6196382287749539209">"<xliff:g id="NUMBER">%1$s</xliff:g> यस \"<xliff:g id="SEARCH">%2$s</xliff:g>\"का लागि परिणामहरू"</item>
-  </plurals>
-    <string name="search_history" msgid="4127805495662693154">"<xliff:g id="COUNT">%1$s</xliff:g> परिणामहरू \"<xliff:g id="SEARCH">%2$s</xliff:g>\"को लागि"</string>
-    <string name="confirm_clear_search_title" msgid="8510295993632032904">"सफा"</string>
-    <string name="confirm_clear_search_text" msgid="8731877031837077478">"खोज इतिहास सफा हुने छ।"</string>
-    <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"खोज इतिहास सफा गर्नुहोस्"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"खोजी बकसमा प्रदर्शित अघिल्ला सन्देश खोजीहरू सफा गर्नुहोस्"</string>
-    <string name="save" msgid="6847069284991531310">"बचत गर्नुहोस्"</string>
-    <string name="storage_limits_title" msgid="7074684882530693016">"सीमित सन्देशहरू"</string>
-    <string name="storage_limits_message" msgid="2010501485394745696">"प्रति कुराकानीमा बचत गरिएका सन्देशहरूको संख्या सीमित गर्न चाहनु हुन्छ?"</string>
-    <string name="storage_limits_setting" msgid="4952781049308537373">"निर्धारित सीमाहरू"</string>
-    <string name="storage_limits_setting_dismiss" msgid="1433841310158458034">"कुनै सीमाहरू छैन"</string>
-    <string name="too_many_unsent_mms" msgid="4436493698891224126">"अहिले सन्देश पठाउन सकेन। धेरै नै नपठाइएका मल्टिमिडिया सन्देशहरू छन्।"</string>
-    <string name="sending_message" msgid="2054406576361149715">"पठाउँदै..."</string>
-    <string name="pick_too_many_recipients" msgid="650087588867628044">"अधिक धेरै प्राप्तकर्ताहरू"</string>
-    <string name="adding_recipients" msgid="2962810172527532357">"प्राप्तकर्ताहरू थप गरिँदै..."</string>
-    <string name="draft_separator" msgid="5402575086540243019">", "</string>
-    <string name="message_count_format" msgid="4434763220590778012">" <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="message_count_notification" msgid="3629968600032690007">"<xliff:g id="NUMBER">%1$s</xliff:g> नयाँ सन्देशहरू"</string>
-  <plurals name="message_count_notification_overflow">
-    <item quantity="one" msgid="3340591167508150806">"+<xliff:g id="NUMBER">%1$s</xliff:g> अन्य सन्देश"</item>
-    <item quantity="other" msgid="1393002799298501480">"+<xliff:g id="NUMBER">%1$s</xliff:g> अन्य सन्देशहरू"</item>
-  </plurals>
-    <string name="error_state" msgid="5177386717626893507">"असंगत स्थिति"</string>
-    <string name="error_state_text" msgid="7918866106335387710">"थ्रेड र प्राप्तकर्ताहरूको स्थिति असंगत छ। कृपया बग रिपोर्ट क्याप्चर गर्नुहोस् र http://go/droidanizer मार्फत रिपोर्ट गर्नुहोस्।"</string>
-  <plurals name="recipient_count">
-    <item quantity="other" msgid="7338580381574463136">"<xliff:g id="NUMBER">%1$s</xliff:g> व्यक्तिहरू"</item>
-  </plurals>
-    <string name="disable_notifications_dialog_message" msgid="7644011234972074096">"पूर्वनिर्धारित सन्देश अनुप्रयोगबाट नक्कल पाठ सन्देश सूचनाहरू रोक्नु हुन्छ?"</string>
-    <string name="view_more_conversations" msgid="7275920132410734671">"अधिक कुराकानीहरू हेर्नुहोस्"</string>
-    <string name="attachment_audio" msgid="2867960243300539143">"अडियो"</string>
-    <string name="attachment_slideshow" msgid="5867689101881763318">"स्लाइड प्रदर्शन"</string>
-    <string name="attachment_video" msgid="4252062022156694591">"भिडियो"</string>
-    <string name="attachment_picture" msgid="3709286281567284296">"चित्र"</string>
-    <string name="notification_separator" msgid="2334673105226536422">"  "</string>
-    <string name="enumeration_comma" msgid="213598026698964628">", "</string>
-    <string name="message_timestamp_format" msgid="4188999027493614617">"<xliff:g id="STRING_0">%1$s</xliff:g> - <xliff:g id="STRING_1">%2$s</xliff:g>"</string>
-    <string name="storage_warning_title" msgid="7124740686325942375">"तपाईँको फोनको भण्डारण भरिएको छ"</string>
-    <string name="storage_warning_content" msgid="1100367816649962354">"तपाईँले कुनै पनि नयाँ SMS/MMS सन्देशहरू प्राप्त गर्नु हुने छैन"</string>
-    <string name="label_mms_send_outbox_msg" msgid="3395185162973061099">"MMS वेकअप"</string>
-    <string name="desc_mms_send_outbox_msg" msgid="1837156781311437148">"सबै MMS हरू आउटबक्सबाट नेटवर्कमा पठाउँछ"</string>
-</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 3479681b..a3697e9c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Geluid"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Aantal berichten instellen voor opslaan"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Stil"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Vragen welke simkaart moet worden gebruikt wanneer een bericht wordt verzonden"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Meerdere simkaarten"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatisch ophalen"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Berichten automatisch ophalen"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Ophalen tijdens roaming"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Berichten is niet uw sms-app"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> is uw sms-app"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"U kunt dit wijzigen via Instellingen."</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Simkaart selecteren"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"Simkaart <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Simkaartsleuf <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Annuleren"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Huidige geselecteerde simkaart is niet aanwezig. Kies uw standaardsimkaart in de systeeminstellingen."</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6b2990bb..51f7a517 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Dźwięk"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Ustaw liczbę zapisywanych wiadomości"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Wyciszony"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Pytaj, której karty SIM użyć, zawsze gdy wysyłam wiadomość"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Autoodbieranie"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Pobieraj wiadomości automatycznie"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"W roamingu"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"SMS nie jest Twoją aplikacją do SMS-ów"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"Twoją aplikacją do SMS-ów jest <xliff:g id="APPNAME">%s</xliff:g>"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Możesz to zmienić w Ustawieniach"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Wybierz kartę SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"Karta SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Gniazdo karty SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Anuluj"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Obecnie wybrana karta SIM jest nieobecna. Wybierz domyślną kartę SIM w ustawieniach systemowych."</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 39edbc23..58a57dab 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Som"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Definir o número de mensagens a guardar"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Silencioso"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Perguntar qual o SIM a utilizar sempre que for enviada uma mensagem"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Retoma automática"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Retomar mensagens automaticamente"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Recuper. em roaming"</string>
@@ -359,11 +357,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Mensagens não é a sua aplicação de SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> é a sua aplicação de SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Pode alterar esta opção nas Definições"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Selecionar SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Ranhura do SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Cancelar"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"O SIM atualmente selecionado está em falta. Escolha o SIM predefinido nas definições do sistema."</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index f3181e27..4a1bc3ff 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Som"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Definir número de mensagens a serem salvas"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Silencioso"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Perguntar qual SIM usar sempre que uma mensagem for enviada"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Vários cartões SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Recuperação automática"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Recupera mensagens automaticamente"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Recuper. em roaming"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"O Mensagens não é seu app de SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"O <xliff:g id="APPNAME">%s</xliff:g> é seu app de SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Você pode alterar isto em \"Configurações\""</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Selecionar SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Slot do SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Cancelar"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"O SIM selecionado no momento não está presente. Escolha o SIM padrão nas configurações do sistema."</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
deleted file mode 100644
index 34f4d60d..00000000
--- a/res/values-rm/strings.xml
+++ /dev/null
@@ -1,464 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1503967887341230795">"SMS/MMS"</string>
-    <string name="new_message" msgid="1530369762346003973">"Nov messadi"</string>
-    <string name="menu_call_back" msgid="7538482331117914146">"Telefonar a <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_send_email" msgid="671366308915241664">"Trametter in e-mail a <xliff:g id="NAME">%s</xliff:g>"</string>
-    <string name="menu_compose_new" msgid="3763437973691046238">"Scriver"</string>
-    <string name="menu_preferences" msgid="4693148116114749414">"Parameters"</string>
-    <!-- no translation found for menu_add_address_to_contacts (4491980950419914944) -->
-    <skip />
-    <string name="menu_call" msgid="5877123227307074690">"Telefonar"</string>
-    <!-- no translation found for menu_search (2289469305728821360) -->
-    <skip />
-    <string name="menu_delete_all" msgid="808729454898114735">"Stizzar tut ils temas"</string>
-    <string name="menu_delete" msgid="1851666911396479006">"Stizzar il fil da discussiun"</string>
-    <string name="menu_view" msgid="7448852683948080108">"Mussar il fil da discussiun"</string>
-    <!-- no translation found for menu_debug_dump (6855869130206549643) -->
-    <skip />
-    <string name="refreshing" msgid="987335057871404222">"Actualisar…"</string>
-    <!-- no translation found for menu_cell_broadcasts (5646161375983084660) -->
-    <skip />
-    <string name="has_draft" msgid="2487465595514636160">"Sboz"</string>
-    <string name="no_subject_view" msgid="7795086723069563537">"(Nagin object)"</string>
-    <string name="messagelist_sender_self" msgid="3579016854116401602">"Jau"</string>
-    <string name="view_slideshow" msgid="4990460971211388453">"Mussar la preschentaziun da dias"</string>
-    <!-- no translation found for view_message_details (7613457646645796831) -->
-    <skip />
-    <string name="view_delivery_report" msgid="8219095994071575215">"Mussar il rapport"</string>
-    <!-- no translation found for delete_message (6442394955910357234) -->
-    <skip />
-    <string name="expire_on" msgid="4436268382742593921">"Data da scadenza: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="kilobyte" msgid="534782148965716631">"KB"</string>
-    <string name="undelivered_msg_dialog_title" msgid="7479433403599785755">"Betg spedì il messadi"</string>
-    <!-- no translation found for undelivered_msg_dialog_body (4789268239627694551) -->
-    <skip />
-    <!-- no translation found for undelivered_sms_dialog_body (4203703285563450868) -->
-    <skip />
-    <string name="delete_thread" msgid="757258847736632791">"Stizzar il fil da discussiun"</string>
-    <string name="menu_forward" msgid="9026858380050046756">"Renviar"</string>
-    <string name="download" msgid="4488877642230207631">"Telechargiar"</string>
-    <string name="downloading" msgid="1779557575565350637">"Telechargiada en process…"</string>
-    <string name="inline_subject" msgid="4057621785274119260">"&lt;Object: <xliff:g id="SUBJECT">%s</xliff:g>&gt;"</string>
-    <string name="drm_protected_text" msgid="1396394157870730742">"* Text protegì cun DRM *"</string>
-    <string name="insufficient_drm_rights" msgid="6989074725969164383">"Eruì dretgs DRM nunsuffizients."</string>
-    <!-- no translation found for copy_message_text (4296252229544252834) -->
-    <skip />
-    <string name="message_options" msgid="6838806653341967550">"Opziuns dal messadi"</string>
-    <!-- no translation found for slideshow_options (3501759384739796431) -->
-    <skip />
-    <string name="done" msgid="7479926268660505871">"Finì"</string>
-    <string name="move_up" msgid="7307578107431739359">"Spustar ensi"</string>
-    <string name="move_down" msgid="6356509518429479053">"Spustar engiu"</string>
-    <string name="remove_slide" msgid="2225604354024914900">"Allontanar il dia"</string>
-    <string name="add_slide" msgid="9140721399423564187">"Agiuntar in dia"</string>
-    <!-- no translation found for add_slide_hint (7351356961076244584) -->
-    <skip />
-    <string name="discard_slideshow" msgid="5054239124146413609">"Stizzar la preschentaziun da dias"</string>
-    <string name="slide_show_part" msgid="5077675385448696846">"Part <xliff:g id="PART">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="remove_text" msgid="2164068850029476539">"Allontanar il text"</string>
-    <string name="add_picture" msgid="7819574884962571479">"Agiuntar in maletg"</string>
-    <string name="remove_picture" msgid="6378701749074289096">"Allontanar il maletg"</string>
-    <string name="add_music" msgid="3827442822987116233">"Agiuntar musica"</string>
-    <string name="remove_music" msgid="858889733416015223">"Allontanar la musica"</string>
-    <string name="add_video" msgid="7816866867806595144">"Agiuntar in video"</string>
-    <string name="remove_video" msgid="5258603891528497799">"Allontanar il video"</string>
-    <string name="to_hint" msgid="224029549150332986">"A"</string>
-    <string name="subject_hint" msgid="4296714962311604126">"Object"</string>
-    <string name="add_attachment" msgid="7103751293360532684">"Agiuntar"</string>
-    <string name="add_subject" msgid="7616134948428265870">"Agiuntar in object"</string>
-    <string name="discard" msgid="1624800293064498479">"Annullar"</string>
-    <string name="view" msgid="7929667761715467136">"Mussar"</string>
-    <string name="replace" msgid="7587904998114459388">"Remplazzar"</string>
-    <string name="remove" msgid="4625444913256213175">"Allontanar"</string>
-    <string name="send" msgid="4589898724889248486">"Trametter"</string>
-    <string name="mms" msgid="1587631213714914559">"MMS"</string>
-    <!-- no translation found for send_mms (2933162044872550662) -->
-    <skip />
-    <string name="all_threads" msgid="2663426830306307194">"Tut ils fils da discussiun"</string>
-    <!-- no translation found for type_to_compose_text_enter_to_send (3539985471008581265) -->
-    <skip />
-    <!-- no translation found for open_keyboard_to_compose_message (7860109685511253191) -->
-    <skip />
-    <!-- no translation found for sending_disabled_not_default_app (6685337318181265136) -->
-    <skip />
-    <!-- no translation found for compose_disabled_toast (1838175321052707875) -->
-    <skip />
-    <string name="compressing" msgid="1961357529661045180">"Il maletg è memia grond. Cumpressiun en process…"</string>
-    <!-- no translation found for unsupported_media_format (1350489690977363764) -->
-    <skip />
-    <!-- no translation found for select_different_media (6241623357299382183) -->
-    <skip />
-    <string name="exceed_message_size_limitation" msgid="6027753647094742437">"Cuntanschì la grondezza maximala per quest messadi"</string>
-    <string name="message_too_big_for_video" msgid="2639367545165352543">"Impussibel d\'agiuntar in video. Il messadi è memia grond."</string>
-    <!-- no translation found for failed_to_add_media (7207464170168708485) -->
-    <skip />
-    <string name="failed_to_resize_image" msgid="5608354151631833669">"Betg adattà la grondezza dal maletg"</string>
-    <!-- no translation found for resize_image_error_information (3783200130776554475) -->
-    <skip />
-    <string name="forward_prefix" msgid="276280492803486464">"Fwd: "</string>
-    <string name="discard_message_reason" msgid="2667664943003796133">"Il messadi vegn stizzà cunquai che nagin destinatur valid è vegnì inditgà."</string>
-    <string name="has_invalid_recipient" msgid="1485388396900997383">"Destinatur(s) nunvalid(s): &lt;<xliff:g id="NAME">%1$s</xliff:g>&gt;"</string>
-    <!-- no translation found for invalid_destination (4573835601024786416) -->
-    <skip />
-    <!-- no translation found for service_not_activated (9178218144019626176) -->
-    <skip />
-    <!-- no translation found for service_message_not_found (1908877102600048515) -->
-    <skip />
-    <!-- no translation found for service_network_problem (4583269174855943025) -->
-    <skip />
-    <!-- no translation found for invalid_recipient_message (6465343105010999068) -->
-    <skip />
-    <!-- no translation found for cannot_send_message (3414307479833622644) -->
-    <skip />
-    <string name="cannot_send_message_reason" msgid="8745080126044054343">"Nagin destinatur valid è vegnì specifitgà per Voss messadi."</string>
-    <!-- no translation found for cannot_forward_drm_obj (5047623751430559077) -->
-    <skip />
-    <string name="converting_to_picture_message" msgid="2980023239017588627">"Conversiun en messadi multimedia…"</string>
-    <!-- no translation found for cannot_add_slide_anymore (4631404749618820994) -->
-    <skip />
-    <!-- no translation found for cannot_add_picture_and_video (4954353772391381447) -->
-    <skip />
-    <!-- no translation found for cannot_save_message (3375907366965264446) -->
-    <skip />
-    <string name="message_saved_as_draft" msgid="2503018972659880692">"Memorisà il messadi sco sboz"</string>
-    <!-- no translation found for too_many_recipients (7003415094007176931) -->
-    <skip />
-    <string name="too_many_attachments" msgid="3774037894899750070">"Il dumber d\'agiuntas è limità a <xliff:g id="MAXLIMIT">%1$s</xliff:g>. Mo ils emprims <xliff:g id="CURRENTCOUNT">%2$s</xliff:g> vegnan agiuntads."</string>
-    <string name="adding_attachments_title" msgid="2034535554212405529">"Agiuntas vegnan inseridas"</string>
-    <!-- no translation found for adding_attachments (5871373105122355632) -->
-    <skip />
-    <!-- no translation found for building_slideshow_title (1232338692400726385) -->
-    <skip />
-    <!-- no translation found for cannot_play_audio (253920977253666735) -->
-    <skip />
-    <string name="preview" msgid="5438149136136446756">"Prevista"</string>
-    <string name="preview_slideshow" msgid="6824095909448728427">"Prevista"</string>
-    <string name="replace_image" msgid="3171240952601443619">"Remplazzar il maletg"</string>
-    <string name="duration_sec" msgid="6617032324007824096">"Durada (<xliff:g id="DURATION">%s</xliff:g> sec)"</string>
-    <string name="duration_selector_title" msgid="5981097971537625852">"Durada per il dia "</string>
-    <string name="layout_selector_title" msgid="7344600117972450771">"Layout da la preschentaziun da dias "</string>
-    <string name="layout_top" msgid="6811021650398972346">"Layout (sura)"</string>
-    <string name="layout_bottom" msgid="5822765871095491843">"Layout (sut)"</string>
-    <!-- no translation found for type_to_compose_text_or_leave_blank (7769792471457574059) -->
-    <skip />
-    <!-- no translation found for duration_not_a_number (2856636898040421237) -->
-    <skip />
-    <!-- no translation found for duration_zero (3549377790195185977) -->
-    <skip />
-    <string name="secs" msgid="6886003523109967972">"s"</string>
-    <!-- no translation found for select_dialog_items:10 (7786079681602275449) -->
-    <string name="menu_view_contact" msgid="1414670584423909451">"Mussar il contact"</string>
-    <!-- no translation found for menu_add_to_contacts (1258127580972228970) -->
-    <skip />
-    <string name="hidden_sender_address" msgid="2776075636669924968">"Adressa da speditur zuppentada"</string>
-    <string name="yes" msgid="3246158147503160811">"OK"</string>
-    <string name="no" msgid="4289742508556913860">"Interrumper"</string>
-    <string name="set" msgid="4642365398263275979">"Definir"</string>
-    <string name="play" msgid="1888432400937785115">"Far ir"</string>
-    <string name="edit" msgid="5912118407791492696">"Modifitgar"</string>
-    <string name="try_to_send" msgid="1996751738286080976">"Empruvar da trametter"</string>
-    <string name="preferences_title" msgid="6650089610332670157">"Parameters"</string>
-    <string name="restore_default" msgid="7165341506551155053">"Restaurar ils parameters da standard"</string>
-    <!-- no translation found for pref_notification_settings_title (6420782563630369776) -->
-    <skip />
-    <!-- no translation found for pref_mms_settings_title (55618772118264355) -->
-    <skip />
-    <!-- no translation found for pref_sms_settings_title (5173078369851066881) -->
-    <skip />
-    <!-- no translation found for pref_sms_storage_title (9001233319190616445) -->
-    <skip />
-    <!-- no translation found for pref_title_sms_disabled (1441894740130104326) -->
-    <skip />
-    <!-- no translation found for pref_summary_sms_disabled (8975773722051230744) -->
-    <skip />
-    <!-- no translation found for pref_title_sms_enabled (1857849790200375277) -->
-    <skip />
-    <!-- no translation found for pref_summary_sms_enabled (2106125420361911250) -->
-    <skip />
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"Administrar ils messadis memorisads sin Vossa carta SIM"</string>
-    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"Dumandar ina conferma da retschavida per mintga messadi tramess"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"Dumandar ina conferma da lectura per mintga messadi tramess"</string>
-    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"Dumandar ina conferma da retschavida per mintga messadi tramess"</string>
-    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"Stizzar il messadis vegls sche las suandantas limitas èn cuntanschidas"</string>
-    <string name="pref_summary_delete_limit" msgid="597128041393045216">"<xliff:g id="COUNT">%1$s</xliff:g> messadis per conversaziun"</string>
-    <!-- no translation found for pref_summary_mms_group_mms (2266928687440696745) -->
-    <skip />
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"Administrar ils messadis sin la carta SIM"</string>
-    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"Confermas da retschavida"</string>
-    <!-- no translation found for pref_title_mms_group_mms (1251698526583908432) -->
-    <skip />
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"Confermas da lectura"</string>
-    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"Rapports da spediziun"</string>
-    <string name="pref_title_auto_delete" msgid="7227835692631701134">"Stizzar messadis vegls"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"Limita dad SMS"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"Limita per ils MMS"</string>
-    <string name="pref_title_notification_enabled" msgid="9118792213953729414">"Avis"</string>
-    <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"Vibrar"</string>
-    <!-- no translation found for pref_title_notification_ringtone (8667533917574559659) -->
-    <skip />
-    <string name="pref_messages_to_save" msgid="3202539743892934926">"Definir il dumber da messadis per memorisar"</string>
-    <!-- no translation found for silent_ringtone (7981237991326592780) -->
-    <skip />
-    <!-- no translation found for pref_summary_sim_ask (5815190975933015621) -->
-    <skip />
-    <!-- no translation found for pref_title_sim_ask (4794530561349736162) -->
-    <skip />
-    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Retschaiver automaticamain"</string>
-    <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Retschaiver automaticamain ils messadis"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Retschaiver autom. cun roaming"</string>
-    <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"Retschaiver automaticamain ils messadis durant roaming"</string>
-    <!-- no translation found for confirm_dialog_title (2187213750475782725) -->
-    <skip />
-    <string name="confirm_dialog_locked_title" msgid="8179085718150932242">"Allontanar il messadi bloccà?"</string>
-    <!-- no translation found for confirm_delete_conversation:one (7509396981963472833) -->
-    <!-- no translation found for confirm_delete_conversation:other (4076915774012081811) -->
-    <string name="confirm_delete_conversation" msgid="6115966687389279855">"L\'entir fil da discussiun vegn stizzà."</string>
-    <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"Tut ils fils da discussiun vegnan stizzads."</string>
-    <string name="confirm_delete_message" msgid="9121480656609809591">"Il messadi vegn stizzà."</string>
-    <!-- no translation found for confirm_delete_locked_message (7203411948190100955) -->
-    <skip />
-    <!-- no translation found for confirm_delete_all_SIM_messages (8693652297557966665) -->
-    <skip />
-    <!-- no translation found for confirm_delete_SIM_message (8535128079045452425) -->
-    <skip />
-    <string name="delete_unlocked" msgid="7545321606698162261">"Stizzar ils messadis bloccads"</string>
-    <string name="delete" msgid="1409973060081564612">"Stizzar"</string>
-    <!-- no translation found for select_conversations (7816517565640002844) -->
-    <skip />
-    <!-- no translation found for no_conversations (6773767655149258445) -->
-    <skip />
-    <!-- no translation found for loading_conversations (5510430408235967094) -->
-    <skip />
-    <!-- no translation found for cannot_get_details (850292987983026806) -->
-    <skip />
-    <string name="message_details_title" msgid="9223295113731634528">"Detagls dal messadi"</string>
-    <string name="message_type_label" msgid="7975373966795945566">"Tip: "</string>
-    <string name="text_message" msgid="8196464345251877972">"Messadi SMS"</string>
-    <string name="multimedia_message" msgid="1512644521083533071">"Messadi multimedia"</string>
-    <string name="multimedia_notification" msgid="4124031788554972308">"Avis a messadis MMS"</string>
-    <string name="from_label" msgid="2055117571548171397">"Da: "</string>
-    <string name="to_address_label" msgid="5837363600471845801">"A: "</string>
-    <string name="bcc_label" msgid="530867161453958774">"Bcc: "</string>
-    <string name="sent_label" msgid="2722190650145251584">"Tramess: "</string>
-    <string name="received_label" msgid="8618029024731693906">"Retschavì: "</string>
-    <string name="saved_label" msgid="4183160415593488207">"Memorisà: "</string>
-    <string name="subject_label" msgid="8721241914144101631">"Object: "</string>
-    <string name="message_size_label" msgid="4698016210013319786">"Grondezza dal messadi: "</string>
-    <string name="priority_label" msgid="7397600367853359607">"Prioritad: "</string>
-    <string name="priority_high" msgid="5627897207952009214">"Aut"</string>
-    <string name="priority_normal" msgid="5715227727384683550">"Normal"</string>
-    <string name="priority_low" msgid="8928782666023373987">"Bass"</string>
-    <string name="message_class_label" msgid="5115748690481550562">"Categoria dal messadi: "</string>
-    <string name="error_code_label" msgid="5810068247647058769">"Code d\'errur: "</string>
-    <string name="menu_edit" msgid="3056513240155967777">"Modifitgar"</string>
-    <string name="menu_delete_messages" msgid="2610286783513247420">"Stizzar ils messadis"</string>
-    <!-- no translation found for menu_lock (7603793126077557472) -->
-    <skip />
-    <!-- no translation found for menu_unlock (6662865558677424039) -->
-    <skip />
-    <!-- no translation found for sim_copy_to_phone_memory (3721000641648594602) -->
-    <skip />
-    <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"Copiar en la memoria dal telefonin"</string>
-    <string name="sim_delete" msgid="610790510655316922">"Stizzar"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"Messadis SMS sin la carta SIM"</string>
-    <string name="sim_view" msgid="1997173541766393706">"Mussar"</string>
-    <!-- no translation found for sim_empty (2356766833071636297) -->
-    <skip />
-    <string name="delivery_header_title" msgid="5361719578869045764">"Rapport"</string>
-    <string name="status_none" msgid="8253075950774894961">"(Nagin)"</string>
-    <string name="status_pending" msgid="2739860824607984892">"Pendent"</string>
-    <string name="status_read" msgid="7576195253780627332">"Leger"</string>
-    <string name="status_received" msgid="7264334589461906965">"Retschavì"</string>
-    <string name="status_failed" msgid="1998776666856593544">"Betg reussì"</string>
-    <string name="status_unread" msgid="8555305495998700198">"Nunlegì"</string>
-    <string name="status_rejected" msgid="2613641949065942678">"Refusà"</string>
-    <string name="recipient_label" msgid="3922667485312634446">"Destinatur: "</string>
-    <string name="status_label" msgid="7283375460919181660">"Status: "</string>
-    <!-- no translation found for delivered_label (3514011729156932928) -->
-    <skip />
-    <string name="attach_image" msgid="6439985727687107742">"Maletgs"</string>
-    <string name="attach_take_photo" msgid="4280601313184373837">"Far ina foto"</string>
-    <string name="attach_video" msgid="4264272693501538294">"Videos"</string>
-    <string name="attach_record_video" msgid="3099814114743078615">"Registrar in video"</string>
-    <string name="attach_sound" msgid="3149325985970669609">"Audio"</string>
-    <string name="attach_record_sound" msgid="6011431304469858929">"Registrar audio"</string>
-    <string name="attach_slideshow" msgid="3497422151091037063">"Preschentaziun da dias"</string>
-    <string name="select_bottom_text" msgid="4201966447623311931">"Text sutvart"</string>
-    <string name="select_top_text" msgid="6734183477539197815">"Text survart"</string>
-    <!-- no translation found for delivery_toast_body (5960519861835727013) -->
-    <skip />
-    <string name="notification_multiple" msgid="7684007285202109490">"<xliff:g id="COUNT">%s</xliff:g> messadis nunlegids"</string>
-    <string name="notification_multiple_title" msgid="332602028959557541">"Novs messadis"</string>
-    <!-- no translation found for notification_failed_multiple (6192531993698497229) -->
-    <skip />
-    <string name="notification_failed_multiple_title" msgid="1112032024904397126">"Betg tramess ils messadis"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"La carta SIM è plaina"</string>
-    <string name="sim_full_body" msgid="6241664980790322925">"Stizzai intgins messadis per crear spazi per novs."</string>
-    <string name="sms_full_title" msgid="6041287140125011854">"La memoria per messadis da text è plaina."</string>
-    <!-- no translation found for sms_full_body (4885861852397651868) -->
-    <skip />
-    <string name="sms_rejected_title" msgid="8548394922491529811">"SMS refusà"</string>
-    <!-- no translation found for sms_rejected_body (7813671133968158562) -->
-    <skip />
-    <string name="type_audio" msgid="3842064092332309756">"audio"</string>
-    <string name="type_picture" msgid="4091928975383609443">"Maletg"</string>
-    <string name="type_video" msgid="8521556159545168441">"video"</string>
-    <string name="confirm" msgid="3155110885840591914">"Confermar"</string>
-    <string name="message_send_read_report" msgid="6997117678914261250">"Ina conferma da lectura vegn tramessa."</string>
-    <!-- no translation found for message_queued (7975945623873194737) -->
-    <skip />
-    <string name="fdn_check_failure" msgid="7880740763778173551">"Vus pudais mo trametter messadis a Voss numers da telefon autorisads."</string>
-    <string name="no_subject" msgid="4168963736134552285">"(Nagin object)"</string>
-    <string name="unknown_sender" msgid="4929330613278853635">"Speditur nunenconuschent"</string>
-    <!-- no translation found for dl_failure_notification (8097699679464396537) -->
-    <skip />
-    <string name="rate_limit_surpassed" msgid="1347801608211628177">"Confermar"</string>
-    <string name="confirm_rate_limit" msgid="234228299751243067">"In grond dumber da messadis multimedia vegnan tramess. Vulais Vus cuntinuar?"</string>
-    <string name="message_download_failed_title" msgid="5722226064394767921">"Betg telechargià il messadi"</string>
-    <string name="message_send_failed_title" msgid="3469894907399046372">"Betg tramess il messadi"</string>
-    <!-- no translation found for message_failed_body (3421296112073915245) -->
-    <skip />
-    <!-- no translation found for download_later (5531365714424360903) -->
-    <skip />
-    <!-- no translation found for no_apn (505932916503312015) -->
-    <skip />
-    <!-- no translation found for select_audio (3528161449756771832) -->
-    <skip />
-    <!-- no translation found for copy_to_sdcard (757028609638184856) -->
-    <skip />
-    <!-- no translation found for copy_to_sdcard_success (7948625615155992014) -->
-    <skip />
-    <!-- no translation found for copy_to_sdcard_fail (4944606369631916737) -->
-    <skip />
-    <string name="save_ringtone" msgid="2310157075045201051">"Memorisar sco tun da scalin"</string>
-    <!-- no translation found for saved_ringtone (3847363932276708626) -->
-    <skip />
-    <!-- no translation found for saved_ringtone_fail (4778500070919251116) -->
-    <skip />
-    <!-- no translation found for menu_group_participants (4288356090262299071) -->
-    <skip />
-    <!-- no translation found for select_link_title (3371818607625768447) -->
-    <skip />
-    <string name="slide_number" msgid="1923958526266726635">"Dia <xliff:g id="NUMBER">%s</xliff:g>"</string>
-  <plurals name="slide_duration">
-    <item quantity="one" msgid="1654101988340583935">"<xliff:g id="NUMBER">%s</xliff:g> sec."</item>
-    <item quantity="few" msgid="7887190171856293871">"<xliff:g id="NUMBER">%s</xliff:g> sec"</item>
-    <item quantity="other" msgid="3736425355579939863">"<xliff:g id="NUMBER">%s</xliff:g> sec"</item>
-  </plurals>
-    <string name="delivery_report_activity" msgid="2957463094232916364">"Conferma da retschavida"</string>
-    <string name="storage_limits_activity" msgid="8810530813311077716">"Limitas da memorisaziun"</string>
-    <string name="change_duration_activity" msgid="7048606979485031693">"Midar la durada"</string>
-    <string name="edit_slideshow_activity" msgid="8751493388760050529">"Modifitgar la preschentaziun da dia"</string>
-    <!-- no translation found for recipient_list_activity (1254938236543727019) -->
-    <skip />
-    <string name="edit_slide_activity" msgid="8752829671778696983">"Modifitgar il dia"</string>
-    <string name="slideshow_activity" msgid="5658249461317434432">"Preschentaziun da dia"</string>
-    <!-- no translation found for class_0_message_activity (6631339964159861048) -->
-    <skip />
-    <string name="search_label" msgid="6042598929386174964">"SMS/MMS"</string>
-    <!-- no translation found for search_hint (7273727663577472044) -->
-    <skip />
-    <string name="search" msgid="7560238620274735199">"SMS/MMS"</string>
-    <string name="search_setting_description" msgid="4104004595086437572">"Text en Voss messadis"</string>
-    <!-- no translation found for search_empty (2109551478056039278) -->
-    <skip />
-  <plurals name="search_results_title">
-    <item quantity="one" msgid="4657073733087431350">"<xliff:g id="NUMBER">%1$s</xliff:g> resultats per <xliff:g id="SEARCH">%2$s</xliff:g>"</item>
-    <item quantity="other" msgid="6196382287749539209">"<xliff:g id="NUMBER">%1$s</xliff:g> resultats per <xliff:g id="SEARCH">%2$s</xliff:g>"</item>
-  </plurals>
-    <string name="search_history" msgid="4127805495662693154">"\"<xliff:g id="COUNT">%1$s</xliff:g> resultats per \"\"<xliff:g id="SEARCH">%2$s</xliff:g>\"\"\""</string>
-    <string name="confirm_clear_search_title" msgid="8510295993632032904">"Stizzar"</string>
-    <string name="confirm_clear_search_text" msgid="8731877031837077478">"La cronologia da las tschertgas vegn stizzada."</string>
-    <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"Stizzar la cronologia da tschertga"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"Stizzar anteriuras tschertgas dad SMS/MMS e betg pli mussar ellas en il champ da tschertgar"</string>
-    <string name="save" msgid="6847069284991531310">"Memorisar"</string>
-    <string name="storage_limits_title" msgid="7074684882530693016">"Limitar ils messadis"</string>
-    <!-- no translation found for storage_limits_message (2010501485394745696) -->
-    <skip />
-    <string name="storage_limits_setting" msgid="4952781049308537373">"Definir las limitas"</string>
-    <string name="storage_limits_setting_dismiss" msgid="1433841310158458034">"Nagina limita"</string>
-    <!-- no translation found for too_many_unsent_mms (4436493698891224126) -->
-    <skip />
-    <!-- no translation found for sending_message (2054406576361149715) -->
-    <skip />
-    <string name="pick_too_many_recipients" msgid="650087588867628044">"Memia blers destinaturs"</string>
-    <string name="adding_recipients" msgid="2962810172527532357">"Agiuntar destinaturs..."</string>
-    <!-- no translation found for draft_separator (5402575086540243019) -->
-    <skip />
-    <!-- no translation found for message_count_format (4434763220590778012) -->
-    <skip />
-    <!-- no translation found for message_count_notification (3629968600032690007) -->
-    <skip />
-    <!-- no translation found for message_count_notification_overflow:one (3340591167508150806) -->
-    <!-- no translation found for message_count_notification_overflow:other (1393002799298501480) -->
-    <!-- no translation found for error_state (5177386717626893507) -->
-    <skip />
-    <!-- no translation found for error_state_text (7918866106335387710) -->
-    <skip />
-    <!-- no translation found for recipient_count:other (7338580381574463136) -->
-    <!-- no translation found for disable_notifications_dialog_message (7644011234972074096) -->
-    <skip />
-    <!-- no translation found for view_more_conversations (7275920132410734671) -->
-    <skip />
-    <!-- no translation found for attachment_audio (2867960243300539143) -->
-    <skip />
-    <!-- no translation found for attachment_slideshow (5867689101881763318) -->
-    <skip />
-    <!-- no translation found for attachment_video (4252062022156694591) -->
-    <skip />
-    <!-- no translation found for attachment_picture (3709286281567284296) -->
-    <skip />
-    <!-- no translation found for notification_separator (2334673105226536422) -->
-    <skip />
-    <!-- no translation found for enumeration_comma (213598026698964628) -->
-    <skip />
-    <!-- no translation found for message_timestamp_format (4188999027493614617) -->
-    <skip />
-    <!-- no translation found for storage_warning_title (7124740686325942375) -->
-    <skip />
-    <!-- no translation found for storage_warning_content (1100367816649962354) -->
-    <skip />
-    <!-- no translation found for label_mms_send_outbox_msg (3395185162973061099) -->
-    <skip />
-    <!-- no translation found for desc_mms_send_outbox_msg (1837156781311437148) -->
-    <skip />
-    <!-- no translation found for banner_sms_promo_title_initial (510014388581481569) -->
-    <skip />
-    <!-- no translation found for banner_sms_promo_title_application (8123569785369713254) -->
-    <skip />
-    <!-- no translation found for banner_sms_promo_message (3536714414252763826) -->
-    <skip />
-    <!-- no translation found for sub_select_dialog_title (8210168935409702285) -->
-    <skip />
-    <!-- no translation found for default_sim_name (903290497566800216) -->
-    <skip />
-    <!-- no translation found for empty_sim_name (1008631117599170591) -->
-    <skip />
-    <!-- no translation found for subSelect_negative (6139403806707801822) -->
-    <skip />
-    <!-- no translation found for sub_name_container (4802195955108231738) -->
-    <skip />
-    <!-- no translation found for sub_name_ellipsis (2475475055178768223) -->
-    <skip />
-</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 4a149d99..0688b1aa 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Sunet"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Setaţi numărul de mesaje pentru salvare"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Silențios"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Întrebați ce card SIM se utilizează la trimiterea fiecărui mesaj"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Preluare automată"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Primiţi automat mesajele"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Preluare automată a mesajelor când este activat serviciul de roaming"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Aplicația Mesagerie nu este aplicația dvs. pentru SMS-uri"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> este aplicația dvs. pentru SMS-uri."</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Puteți modifica această opțiune în Setări."</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Selectați SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Slotul SIM-ului <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Anulați"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Cardul SIM selectat nu este prezent. Alegeți cardul SIM implicit din setările de sistem."</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 170526b5..a6d5a025 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Рингтон"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Установить макс. кол-во сообщений в цепочке для хранения"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Без звука"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Спрашивать, какую SIM-карту использовать, каждый раз перед отправкой SMS"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Настройки нескольких SIM-карт"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Автозагрузка"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Автоматически загружать MMS-сообщения"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Автозагрузка в роуминге"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Приложение SMS/MMS не используется для обмена SMS-сообщениями."</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"Попробуйте \"<xliff:g id="APPNAME">%s</xliff:g>\" для SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Этот параметр можно изменить в настройках"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Выберите SIM-карту"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM-карта <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Гнездо SIM-карты <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Отмена"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Указанная SIM-карта не найдена. Выберите SIM-карту по умолчанию в системных настройках."</string>
 </resources>
diff --git a/res/values-si-rLK/arrays.xml b/res/values-si-rLK/arrays.xml
index 8b4593f4..791134c2 100644
--- a/res/values-si-rLK/arrays.xml
+++ b/res/values-si-rLK/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"කාරණාවක් නොමැත"</item>
-    <item msgid="2214945158821871846">"කාරණාවක් නොමැත"</item>
   </string-array>
 </resources>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml
index db939ca9..2c0c79f0 100644
--- a/res/values-si-rLK/strings.xml
+++ b/res/values-si-rLK/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -357,11 +357,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"පනිවිඩකරණය ඔබගේ SMS යෙදුම නොවේ"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"ඔබගේ SMS යෙදුම <xliff:g id="APPNAME">%s</xliff:g> ය"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"ඔබට මෙය සැකසීම් තුළ වෙනස් කළ හැක"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"SIM එක තෝරන්න"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM විවරය <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"අවලංගු කරන්න"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"දැනට තෝරන ලද SIM එක නොතිබේ. පද්ධති සැකසීම් තුළ ඔබගේ සුපුරුදු SIM එක තෝරන්න."</string>
 </resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
deleted file mode 100644
index 7e298cb6..00000000
--- a/res/values-si/strings.xml
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-/*
- * Copyright (C) 2007-2008 Esmertec AG.
- * Copyright (C) 2007-2008 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:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1503967887341230795">"පණිවිඩ යැවීම"</string>
-    <string name="new_message" msgid="1530369762346003973">"නව පණිවිඩය"</string>
-    <string name="menu_call_back" msgid="7538482331117914146">"<xliff:g id="NAME">%s</xliff:g> අමතන්න"</string>
-    <string name="menu_send_email" msgid="671366308915241664">"ඊ-තැපෑල <xliff:g id="NAME">%s</xliff:g> වෙත යවන්න"</string>
-    <string name="menu_compose_new" msgid="3763437973691046238">"සකසනය"</string>
-    <string name="menu_preferences" msgid="4693148116114749414">"සැකසීම්"</string>
-    <string name="menu_add_address_to_contacts" msgid="4491980950419914944">"<xliff:g id="CONTACTEMAILORNUMBER">%s</xliff:g> පුද්ගලයින් වෙත එක් කරන්න"</string>
-    <string name="menu_call" msgid="5877123227307074690">"ඇමතුම"</string>
-    <string name="menu_search" msgid="2289469305728821360">"සෙවීම"</string>
-    <string name="menu_delete_all" msgid="808729454898114735">"සියලුම පොටවල් මකන්න"</string>
-    <string name="menu_delete" msgid="1851666911396479006">"පොට මකන්න"</string>
-    <string name="menu_view" msgid="7448852683948080108">"පට බලන්න"</string>
-    <string name="menu_debug_dump" msgid="6855869130206549643">"DEBUG DUMP"</string>
-    <string name="refreshing" msgid="987335057871404222">"යළි නැවුම් කරන්න…"</string>
-    <string name="menu_cell_broadcasts" msgid="5646161375983084660">"සෙල් විකාශකයින්"</string>
-    <string name="has_draft" msgid="2487465595514636160">"කටු සටහන"</string>
-    <string name="no_subject_view" msgid="7795086723069563537">"(කාරණාවක් නොමැත)"</string>
-    <string name="messagelist_sender_self" msgid="3579016854116401602">"මම"</string>
-    <string name="view_slideshow" msgid="4990460971211388453">"කදා දර්ශනය දක්වන්න"</string>
-    <string name="view_message_details" msgid="7613457646645796831">"විස්තර පෙන්වන්න"</string>
-    <string name="view_delivery_report" msgid="8219095994071575215">"වාර්තාව පෙන්වන්න"</string>
-    <string name="delete_message" msgid="6442394955910357234">"මකන්න"</string>
-    <string name="expire_on" msgid="4436268382742593921">"කල් ඉකුත් වන්නේ: <xliff:g id="DATE">%s</xliff:g>"</string>
-    <string name="kilobyte" msgid="534782148965716631">"KB"</string>
-    <string name="undelivered_msg_dialog_title" msgid="7479433403599785755">"නොයවන ලද පණිවිඩය"</string>
-    <string name="undelivered_msg_dialog_body" msgid="4789268239627694551">"මෙම පණිවිඩය යැවීමට නොහැකි විය.\nදරණ ලද උත්සාහය: <xliff:g id="MESSAGE">%s</xliff:g>."</string>
-    <string name="undelivered_sms_dialog_body" msgid="4203703285563450868">"මෙම පණිවිඩය යැවීමට නොහැකි විය."</string>
-    <string name="delete_thread" msgid="757258847736632791">"පොට මකන්න"</string>
-    <string name="menu_forward" msgid="9026858380050046756">"ඉදිරියට"</string>
-    <string name="download" msgid="4488877642230207631">"බාගන්න"</string>
-    <string name="downloading" msgid="1779557575565350637">"බාගතකරමින්"</string>
-    <string name="inline_subject" msgid="4057621785274119260">"&lt;කාරණාව: <xliff:g id="SUBJECT">%s</xliff:g>&gt;"</string>
-    <string name="drm_protected_text" msgid="1396394157870730742">"* DRM ආරක්‍ෂිත පෙළ *"</string>
-    <string name="insufficient_drm_rights" msgid="6989074725969164383">"ප්‍රමාණවත් DRM හිමිකම් සොයාගත නොහැකි විය."</string>
-    <string name="copy_message_text" msgid="4296252229544252834">"පෙළ පිටපත් කරන්න"</string>
-    <string name="message_options" msgid="6838806653341967550">"පණිවිඩ විකල්ප"</string>
-    <string name="slideshow_options" msgid="3501759384739796431">"කදා දර්ශන විකල්ප"</string>
-    <string name="done" msgid="7479926268660505871">"හරි"</string>
-    <string name="move_up" msgid="7307578107431739359">"ඉහළට ගෙනයන්න"</string>
-    <string name="move_down" msgid="6356509518429479053">"පහලට ගෙන යන්න"</string>
-    <string name="remove_slide" msgid="2225604354024914900">"කදාව ඉවත් කරන්න"</string>
-    <string name="add_slide" msgid="9140721399423564187">"කදාව එක් කරන්න"</string>
-    <string name="add_slide_hint" msgid="7351356961076244584">"නව කදාවක් සෑදීමට ස්පර්ශ කරන්න."</string>
-    <string name="discard_slideshow" msgid="5054239124146413609">"කදා දර්ශනය ඉවත ලන්න"</string>
-    <string name="slide_show_part" msgid="5077675385448696846">"කොටස <xliff:g id="PART">%1$s</xliff:g>/<xliff:g id="TOTAL">%2$s</xliff:g>"</string>
-    <string name="remove_text" msgid="2164068850029476539">"පෙළ ඉවත් කරන්න"</string>
-    <string name="add_picture" msgid="7819574884962571479">"පින්තූරය එක් කරන්න"</string>
-    <string name="remove_picture" msgid="6378701749074289096">"පින්තූරය ඉවත් කරන්න"</string>
-    <string name="add_music" msgid="3827442822987116233">"සංගීතය එක් කරන්න"</string>
-    <string name="remove_music" msgid="858889733416015223">"සංගීතය ඉවත් කරන්න"</string>
-    <string name="add_video" msgid="7816866867806595144">"වීඩියෝව එක් කරන්න"</string>
-    <string name="remove_video" msgid="5258603891528497799">"වීඩියෝව ඉවත් කරන්න"</string>
-    <string name="to_hint" msgid="224029549150332986">"වෙත"</string>
-    <string name="subject_hint" msgid="4296714962311604126">"කාරණය"</string>
-    <string name="add_attachment" msgid="7103751293360532684">"අමුණන්න"</string>
-    <string name="add_subject" msgid="7616134948428265870">"කාරණාව එක් කරන්න"</string>
-    <string name="discard" msgid="1624800293064498479">"ඉවත ලන්න"</string>
-    <string name="view" msgid="7929667761715467136">"පෙනුම"</string>
-    <string name="replace" msgid="7587904998114459388">"ප්‍රතිස්ථාපනය කරන්න"</string>
-    <string name="remove" msgid="4625444913256213175">"ඉවත් කරන්න"</string>
-    <string name="send" msgid="4589898724889248486">"යවන්න"</string>
-    <string name="mms" msgid="1587631213714914559">"MMS"</string>
-    <string name="send_mms" msgid="2933162044872550662">"MMS යවන්න"</string>
-    <string name="all_threads" msgid="2663426830306307194">"සියලුම පොටවල්"</string>
-    <string name="type_to_compose_text_enter_to_send" msgid="3539985471008581265">"පණිවිඩයක් ටයිප් කරන්න"</string>
-    <string name="open_keyboard_to_compose_message" msgid="7860109685511253191">"පණිවිඩයක් ටයිප් කිරීමට යතුරු පුවරුව විවෘත කරන්න"</string>
-    <string name="compressing" msgid="1961357529661045180">"පින්තූරය විශාල වැඩියි. සම්පීඩනය කරමින්..."</string>
-    <string name="unsupported_media_format" msgid="1350489690977363764">"සහාය නොදක්වන <xliff:g id="NAME">%1$s</xliff:g> ආකෘතිය."</string>
-    <string name="select_different_media" msgid="6241623357299382183">"වෙනත් <xliff:g id="NAME">%1$s</xliff:g> තෝරන්න."</string>
-    <string name="exceed_message_size_limitation" msgid="6027753647094742437">"පණිවිඩයේ ප්‍රමාණයේ සීමාවට ළඟාවී ඇත."</string>
-    <string name="message_too_big_for_video" msgid="2639367545165352543">"වීඩියෝවක් ඇමිණිමට මෙම පණිවිඩය විශාල වැඩිය."</string>
-    <string name="failed_to_add_media" msgid="7207464170168708485">"ඔබට මෙම <xliff:g id="NAME">%1$s</xliff:g> ඔබගේ පණිවිඩයට එක් කළ නොහැක."</string>
-    <string name="failed_to_resize_image" msgid="5608354151631833669">"පින්තූරය නැවත ප්‍රමාණකරණය නොවුණි."</string>
-    <string name="resize_image_error_information" msgid="3783200130776554475">"පින්තූරය යැවීමට යළි ප්‍රමාණගත කළද විශාල වැඩිය."</string>
-    <string name="forward_prefix" msgid="276280492803486464">"ඉදිරි: "</string>
-    <string name="discard_message_reason" msgid="2667664943003796133">"වලංගු ලබන්නන් නොමැති බැවින් ඔබගේ පණිවිඩය ඉවත ලනු ඇත."</string>
-    <string name="has_invalid_recipient" msgid="1485388396900997383">"වලංගු නොවන ලබන්නා(ලබන්නන්): &lt;<xliff:g id="NAME">%1$s</xliff:g>&gt;"</string>
-    <string name="invalid_destination" msgid="4573835601024786416">"වලංගු නොවන ගමනාන්ත ලිපිනය."</string>
-    <string name="service_not_activated" msgid="9178218144019626176">"ජාලයෙහි සේවාව සක්‍රිය නොමැත."</string>
-    <string name="service_message_not_found" msgid="1908877102600048515">"පණිවිඩය කල් ඉකුත්වී ඇත හෝ දැනට නොමැත."</string>
-    <string name="service_network_problem" msgid="4583269174855943025">"ජාල ගැටලුවක් හේතුවෙන් යැවිය නොහැකි විය."</string>
-    <string name="invalid_recipient_message" msgid="6465343105010999068">"ලබන්නා(ලබන්නන්) නිවැරදි කරන්න නැතිනම් ඔවුනට පණිවිඩය නොලැබෙනු ඇත."</string>
-    <string name="cannot_send_message" msgid="3414307479833622644">"පණිවිඩය යැවිය නොහැක"</string>
-    <string name="cannot_send_message_reason" msgid="8745080126044054343">"ඔබේ පණිවිඩයේ වලංගු ලබන්නන් නොමැත."</string>
-    <string name="cannot_forward_drm_obj" msgid="5047623751430559077">"පණිවිඩයේ ඇතුලත්වන DRM වස්තුව ඉදිරියට ගෙන යා නොහැක."</string>
-    <string name="converting_to_picture_message" msgid="2980023239017588627">"බහු මාධ්‍ය පණිවිඩයක් ලෙසට පරිවර්තනය කරමින්…"</string>
-    <string name="cannot_add_slide_anymore" msgid="4631404749618820994">"තවත් කදා එක් කළ නොහැක."</string>
-    <string name="cannot_add_picture_and_video" msgid="4954353772391381447">"වීඩියෝ සහ පින්තූර එක් කදාවකට එක් කළ නොහැක."</string>
-    <string name="cannot_save_message" msgid="3375907366965264446">"පණිවිඩය සුරැකිය නොහැක."</string>
-    <string name="message_saved_as_draft" msgid="2503018972659880692">"පණිවිඩය කටු සටහනක් ලෙස සුරැකිණි."</string>
-    <string name="too_many_recipients" msgid="7003415094007176931">"පණිවිඩයේ ලබන්නන් වැඩි ගණනක් සිටියි (<xliff:g id="CURRENTCOUNT">%1$s</xliff:g>). මෙහි යවන්නන් <xliff:g id="MAXLIMIT">%2$s</xliff:g> ක සීමාවක් තිබේ."</string>
-    <string name="too_many_attachments" msgid="3774037894899750070">"ඇමිණුම් <xliff:g id="MAXLIMIT">%1$s</xliff:g> ක සීමාවක් මෙහි තිබේ. මුල් <xliff:g id="CURRENTCOUNT">%2$s</xliff:g> පමණක් එක් වෙයි."</string>
-    <string name="adding_attachments_title" msgid="2034535554212405529">"ඇමිණුම් එක් කරමින්"</string>
-    <string name="adding_attachments" msgid="5871373105122355632">"අයිතමයන් කදා දර්ශනයට එක් වනතෙක් මඳක් රැඳී සිටින්න."</string>
-    <string name="building_slideshow_title" msgid="1232338692400726385">"කදා දර්ශනය තනමින්"</string>
-    <string name="cannot_play_audio" msgid="253920977253666735">"ශ්‍රව්‍ය ධාවනය කළ නොහැක."</string>
-    <string name="preview" msgid="5438149136136446756">"පූර්ව දර්ශනය"</string>
-    <string name="preview_slideshow" msgid="6824095909448728427">"පූර්ව දර්ශනය"</string>
-    <string name="replace_image" msgid="3171240952601443619">"පින්තූරය ප්‍රතිස්ථාපනය කරන්න"</string>
-    <string name="duration_sec" msgid="6617032324007824096">"කාල සීමාව (තත් <xliff:g id="DURATION">%s</xliff:g>)"</string>
-    <string name="duration_selector_title" msgid="5981097971537625852">"කදාවක් සඳහා කාල සීමාව "</string>
-    <string name="layout_selector_title" msgid="7344600117972450771">"කදා දර්ශනයේ පිරිසැලැස්ම "</string>
-    <string name="layout_top" msgid="6811021650398972346">"පිරිසැලැස්ම (ඉහල)"</string>
-    <string name="layout_bottom" msgid="5822765871095491843">"පිරිසැලැස්ම (පහල)"</string>
-    <string name="type_to_compose_text_or_leave_blank" msgid="7769792471457574059">"පණිවිඩය ටයිප් කරන්න, නැතිනම් හිස්ව තබන්න"</string>
-    <string name="duration_not_a_number" msgid="2856636898040421237">"කාල සීමාව අංකයක් විය යුතුය."</string>
-    <string name="duration_zero" msgid="3549377790195185977">"කාල සීමාව තත්පර බිංදුවට වඩා වැඩි විය යුතුය."</string>
-    <string name="secs" msgid="6886003523109967972">"තත්පර"</string>
-  <string-array name="select_dialog_items">
-    <item msgid="4840183714016984112">"තත්පර 1"</item>
-    <item msgid="3734955613666864447">"තත්පර 2"</item>
-    <item msgid="6032232473048379828">"තත්පර 3"</item>
-    <item msgid="5978471781525927827">"තත්පර 4"</item>
-    <item msgid="4888440297621208402">"තත්පර 5"</item>
-    <item msgid="6047246213264166841">"තත්පර 6"</item>
-    <item msgid="2327501250056533797">"තත්පර 7"</item>
-    <item msgid="3400770414689795703">"තත්පර 8"</item>
-    <item msgid="4358760614161107970">"තත්පර 9"</item>
-    <item msgid="2618179407176906471">"තත්පර 10"</item>
-    <item msgid="7786079681602275449">"වෙනත්"</item>
-  </string-array>
-    <string name="menu_view_contact" msgid="1414670584423909451">"සම්බන්ධතාව පෙන්වන්න"</string>
-    <string name="menu_add_to_contacts" msgid="1258127580972228970">"පුද්ගලයින් වෙත එක් කරන්න"</string>
-    <string name="hidden_sender_address" msgid="2776075636669924968">"සැඟවුණු යවන්නාගේ ලිපිනය"</string>
-    <string name="yes" msgid="3246158147503160811">"හරි"</string>
-    <string name="no" msgid="4289742508556913860">"අවලංගු කරන්න"</string>
-    <string name="set" msgid="4642365398263275979">"සකසන්න"</string>
-    <string name="play" msgid="1888432400937785115">"ධාවනය කරන්න"</string>
-    <string name="edit" msgid="5912118407791492696">"සංස්කරණය කරන්න"</string>
-    <string name="try_to_send" msgid="1996751738286080976">"යැවීමට උත්සාහ කරන්න"</string>
-    <string name="preferences_title" msgid="6650089610332670157">"සැකසීම්"</string>
-    <string name="restore_default" msgid="7165341506551155053">"සුපුරුදු සැකසීම් ප්‍රතිස්ථාපනය කරන්න"</string>
-    <string name="pref_notification_settings_title" msgid="6420782563630369776">"දැනුම්දීම්"</string>
-    <string name="pref_mms_settings_title" msgid="55618772118264355">"බහු මාධ්‍ය (MMS) පණිවිඩ"</string>
-    <string name="pref_sms_settings_title" msgid="5173078369851066881">"කෙටි (SMS) පණිවිඩ"</string>
-    <string name="pref_sms_storage_title" msgid="9001233319190616445">"ආචයනය"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"ඔබගේ SIM කාඩ් පතෙහි ආචය වී තිබෙන පණිවිඩ කළමනාකරණය කරන්න"</string>
-    <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"ඔබ යවන ලද සෑම පණිවිඩයකටම යැවීමේ වාර්තාවක් ඉල්ලන්න"</string>
-    <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"ඔබ යවන ලද සෑම පණිවිඩයකටම කියවීමේ වාර්තාවක් ඉල්ලන්න"</string>
-    <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"ඔබ යවන ලද සෑම පණිවිඩයකටම යැවීමේ වාර්තාවක් ඉල්ලන්න"</string>
-    <string name="pref_summary_auto_delete" msgid="7719538116486177613">"සීමාවන් ඉක්මන බැවින් පැරණි පණිවිඩ මකන්න"</string>
-    <string name="pref_summary_delete_limit" msgid="597128041393045216">"සංවාදයකට පණිවිඩ <xliff:g id="COUNT">%1$s</xliff:g>"</string>
-    <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"ලබන්නන් කිහිපදෙනෙක් සිටින විට එක් පණිවිඩයක් යැවීමට MMS භාවිතා කරන්න"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"SIM කඩ් පතේ පණිවිඩ කළමනාකරණය කරන්න"</string>
-    <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"යැවීමේ වාර්තා"</string>
-    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"කණ්ඩායම් පණිවිඩ යැවීම්"</string>
-    <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"වාර්තා කියවන්න"</string>
-    <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"යැවීමේ වාර්තා"</string>
-    <string name="pref_title_auto_delete" msgid="7227835692631701134">"පැරණි පණිවිඩ මකන්න"</string>
-    <string name="pref_title_sms_delete" msgid="6890538316799296878">"පෙළ පණිවිඩ සීමාව"</string>
-    <string name="pref_title_mms_delete" msgid="7265878070847351664">"බහු මාධ්‍ය පණිවිඩ සීමාව"</string>
-    <string name="pref_title_notification_enabled" msgid="9118792213953729414">"දැනුම්දීම්"</string>
-    <string name="pref_title_notification_vibrateWhen" msgid="4251208067092761057">"කම්පනය වීම"</string>
-    <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ශබ්දය"</string>
-    <string name="pref_messages_to_save" msgid="3202539743892934926">"සුරැකීමට අවශ්‍ය පණිවිඩ ගණන සකසන්න"</string>
-    <string name="silent_ringtone" msgid="7981237991326592780">"නිහඬ"</string>
-    <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"ස්වයං-ලබාගැනීම"</string>
-    <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"ස්වයංක්‍රීයව පණිවිඩ ලබාගන්න"</string>
-    <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"රෝමින් ස්වයං-ලබාගැනීම"</string>
-    <string name="pref_summary_mms_retrieval_during_roaming" msgid="2427892806582531020">"රෝමින් කරන විට ස්වයංක්‍රීයව පණිවිඩ ලබාගන්න"</string>
-    <string name="confirm_dialog_title" msgid="2187213750475782725">"මකන්නද?"</string>
-    <string name="confirm_dialog_locked_title" msgid="8179085718150932242">"අඟුළු ලන ලද පණිවිඩය මකන්නද?"</string>
-  <plurals name="confirm_delete_conversation">
-    <item quantity="one" msgid="7509396981963472833">"එක් සංවාදයක් මැකෙනු ඇත."</item>
-    <item quantity="other" msgid="4076915774012081811">"සංවාද <xliff:g id="NUMBER">%1$s</xliff:g> ක් මැකෙනු ඇත."</item>
-  </plurals>
-    <string name="confirm_delete_conversation" msgid="6115966687389279855">"සම්පුර්ණ පොටම මකා දැමෙනු ඇත."</string>
-    <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"සියලුම පොටවල් මකා දැමෙනු ඇත."</string>
-    <string name="confirm_delete_message" msgid="9121480656609809591">"මෙම පණිවිඩය මකා දැමෙනු ඇත."</string>
-    <string name="confirm_delete_locked_message" msgid="7203411948190100955">"මෙම අඟුළු ලන ලද පණිවිඩය මකන්නද?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"SIM කාඩ් පතෙහි ඇති සියලුම පණිවිඩ මකා දැමෙනු ඇත."</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"SIM කාඩ් පතෙහි ඇති මෙම පණිවිඩය මකා දැමෙනු ඇත."</string>
-    <string name="delete_unlocked" msgid="7545321606698162261">"අඟුළු ලන ලද පණිවිඩ මකන්න"</string>
-    <string name="delete" msgid="1409973060081564612">"මකන්න"</string>
-    <string name="select_conversations" msgid="7816517565640002844">"සංවාද තෝරන්න"</string>
-    <string name="no_conversations" msgid="6773767655149258445">"සංවාද නොමැත."</string>
-    <string name="loading_conversations" msgid="5510430408235967094">"සංවාද පුර්ණය වෙමින්."</string>
-    <string name="cannot_get_details" msgid="850292987983026806">"විස්තර ලබාගත නොහැක."</string>
-    <string name="message_details_title" msgid="9223295113731634528">"පණිවිඩ විස්තර"</string>
-    <string name="message_type_label" msgid="7975373966795945566">"වර්ගය: "</string>
-    <string name="text_message" msgid="8196464345251877972">"පෙළ පණිවුඩය"</string>
-    <string name="multimedia_message" msgid="1512644521083533071">"බහු මාධ්‍ය පණිවිඩය"</string>
-    <string name="multimedia_notification" msgid="4124031788554972308">"බහු මාධ්‍ය පණිවිඩ දැනුම්දීම"</string>
-    <string name="from_label" msgid="2055117571548171397">"වෙතින්: "</string>
-    <string name="to_address_label" msgid="5837363600471845801">"වෙත: "</string>
-    <string name="bcc_label" msgid="530867161453958774">"ර.කා.පි.: "</string>
-    <string name="sent_label" msgid="2722190650145251584">"යවන ලදී: "</string>
-    <string name="received_label" msgid="8618029024731693906">"ලැබුණේ: "</string>
-    <string name="saved_label" msgid="4183160415593488207">"සුරකින ලදි "</string>
-    <string name="subject_label" msgid="8721241914144101631">"කාරණාව: "</string>
-    <string name="message_size_label" msgid="4698016210013319786">"පණිවිඩයේ ප්‍රමාණය: "</string>
-    <string name="priority_label" msgid="7397600367853359607">"ප්‍රමුඛතාව: "</string>
-    <string name="priority_high" msgid="5627897207952009214">"ඉහළ"</string>
-    <string name="priority_normal" msgid="5715227727384683550">"සාමාන්‍ය"</string>
-    <string name="priority_low" msgid="8928782666023373987">"පහළ"</string>
-    <string name="message_class_label" msgid="5115748690481550562">"පණිවිඩ පන්තිය: "</string>
-    <string name="error_code_label" msgid="5810068247647058769">"දෝෂ කේතය: "</string>
-    <string name="menu_edit" msgid="3056513240155967777">"සංස්කරණය කරන්න"</string>
-    <string name="menu_delete_messages" msgid="2610286783513247420">"පණිවිඩ මකන්න"</string>
-    <string name="menu_lock" msgid="7603793126077557472">"අඟුළුලන්න"</string>
-    <string name="menu_unlock" msgid="6662865558677424039">"අඟුල අරින්න"</string>
-    <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"ටැබ්ලටයේ මතකයට පිටපත් කරන්න"</string>
-    <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"දුරකතනයේ මතකයට පිටපත් කරන්න"</string>
-    <string name="sim_delete" msgid="610790510655316922">"මකන්න"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"SIM කඩ් පතෙහි පෙළ පණිවිඩ"</string>
-    <string name="sim_view" msgid="1997173541766393706">"පෙනුම"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"SIM කඩ් පතෙහි පණිවිඩ නොමැත."</string>
-    <string name="delivery_header_title" msgid="5361719578869045764">"වාර්තාව"</string>
-    <string name="status_none" msgid="8253075950774894961">"(කිසිවක් නැත)"</string>
-    <string name="status_pending" msgid="2739860824607984892">"බලාපොරොත්තු වෙමින්"</string>
-    <string name="status_read" msgid="7576195253780627332">"කියවූ"</string>
-    <string name="status_received" msgid="7264334589461906965">"ලැබුණු"</string>
-    <string name="status_failed" msgid="1998776666856593544">"අසාර්ථකයි"</string>
-    <string name="status_unread" msgid="8555305495998700198">"නොකියැවූ"</string>
-    <string name="status_rejected" msgid="2613641949065942678">"ප්‍රතික්ෂේප කරන ලද"</string>
-    <string name="recipient_label" msgid="3922667485312634446">"ලබන්නන්: "</string>
-    <string name="status_label" msgid="7283375460919181660">"තත්වය: "</string>
-    <string name="delivered_label" msgid="3514011729156932928">"යවන ලද: "</string>
-    <string name="attach_image" msgid="6439985727687107742">"පින්තූර"</string>
-    <string name="attach_take_photo" msgid="4280601313184373837">"පින්තූරය ග්‍රහණය කරගන්න"</string>
-    <string name="attach_video" msgid="4264272693501538294">"වීඩියෝ"</string>
-    <string name="attach_record_video" msgid="3099814114743078615">"වීඩියෝව ග්‍රහණය කරගන්න"</string>
-    <string name="attach_sound" msgid="3149325985970669609">"ශ්‍රව්‍ය"</string>
-    <string name="attach_record_sound" msgid="6011431304469858929">"ශ්‍රව්‍ය තැටිගත කරන්න"</string>
-    <string name="attach_slideshow" msgid="3497422151091037063">"කදා දර්ශනය"</string>
-    <string name="select_bottom_text" msgid="4201966447623311931">"පෙළ පහළින්"</string>
-    <string name="select_top_text" msgid="6734183477539197815">"පෙළ ඉහලින්"</string>
-    <string name="delivery_toast_body" msgid="5960519861835727013">"%s විසින් පණිවිඩය ලබා ගන්නා ලදී."</string>
-    <string name="notification_multiple" msgid="7684007285202109490">"නොකියවූ පණිවිඩ <xliff:g id="COUNT">%s</xliff:g>."</string>
-    <string name="notification_multiple_title" msgid="332602028959557541">"නව පණිවිඩ"</string>
-    <string name="notification_failed_multiple" msgid="6192531993698497229">"පණිවිඩ <xliff:g id="COUNT">%s</xliff:g> ක් යැවිය නොහැක"</string>
-    <string name="notification_failed_multiple_title" msgid="1112032024904397126">"පණිවිඩ නොයැවුණි"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"SIM කඩ් පත පුර්ණයි"</string>
-    <string name="sim_full_body" msgid="6241664980790322925">"තවත් ඉඩ ලබා ගැනීම සඳහා පණිවිඩ කිහිපයක් මකන්න."</string>
-    <string name="sms_full_title" msgid="6041287140125011854">"පෙළ පණිවිඩය මතකය පුර්ණයි"</string>
-    <string name="sms_full_body" msgid="4885861852397651868">"පිරුණු මතකය හේතුවෙන් එන පණිවිඩයක් ප්‍රතික්ෂේප කෙරුණි. කරුණාකර පැරණි පණිවිඩ කිහිපයක් මකන්න."</string>
-    <string name="sms_rejected_title" msgid="8548394922491529811">"පෙළ පණිවිඩය ප්‍රතික්ෂේප කරන ලදී"</string>
-    <string name="sms_rejected_body" msgid="7813671133968158562">"නොදන්නා හේතුවක් නිසා ලැබෙන පණිවිඩයක් ප්‍රතික්ෂේප කෙරුණි."</string>
-    <string name="type_audio" msgid="3842064092332309756">"ශ්‍රව්‍ය"</string>
-    <string name="type_picture" msgid="4091928975383609443">"පින්තූරය"</string>
-    <string name="type_video" msgid="8521556159545168441">"වීඩියෝව"</string>
-    <string name="confirm" msgid="3155110885840591914">"තහවුරු කරන්න"</string>
-    <string name="message_send_read_report" msgid="6997117678914261250">"කියවීමේ වාර්තාවක් යැවෙනු ඇත."</string>
-    <string name="message_queued" msgid="7975945623873194737">"දැනට ඔබගේ පණිවිඩය යැවිය නොහැක. සේවාව ලැබුණු විට එය යැවෙනු ඇත."</string>
-    <string name="fdn_check_failure" msgid="7880740763778173551">"ඔබට පණිවිඩ යැවිය හැක්කේ ඔබගේ ස්ථාවර අංක වෙත පමණි."</string>
-    <string name="no_subject" msgid="4168963736134552285">"(කාරණාවක් නොමැත)"</string>
-    <string name="unknown_sender" msgid="4929330613278853635">"නොහඳුනන යවන්නෙක්"</string>
-    <string name="dl_failure_notification" msgid="8097699679464396537">"<xliff:g id="SUBJECT">%1$s</xliff:g> පණිවිඩය <xliff:g id="FROM">%2$s</xliff:g> වෙතින් බාගත නොහැකි විය."</string>
-    <string name="rate_limit_surpassed" msgid="1347801608211628177">"තහවුරු කරන්න"</string>
-    <string name="confirm_rate_limit" msgid="234228299751243067">"බහු මාධ්‍ය පණිවිඩ විශාල ගණනක් යැවෙමින් පවතී. එය ගැටලුවක් නැද්ද?"</string>
-    <string name="message_download_failed_title" msgid="5722226064394767921">"පණිවිඩය බාගතකර නොගැනුණි"</string>
-    <string name="message_send_failed_title" msgid="3469894907399046372">"පණිවිඩය යැවුවේ නැත"</string>
-    <string name="message_failed_body" msgid="3421296112073915245">"පණිවිඩය සමලෝචනය කිරීමට ස්පර්ශ කර යළි උත්සාහ කරන්න."</string>
-    <string name="download_later" msgid="5531365714424360903">"මේ දැන් බාගත නොහැක. පසුව යළි උත්සාහ කරන්න."</string>
-    <string name="no_apn" msgid="505932916503312015">"උපාංගය මත APN කිසිවක් නිශ්චය කර නැත."</string>
-    <string name="select_audio" msgid="3528161449756771832">"ශ්‍රව්‍ය තෝරන්න"</string>
-    <string name="copy_to_sdcard" msgid="757028609638184856">"ඇමිණුම් සුරකින්න"</string>
-    <string name="copy_to_sdcard_success" msgid="7948625615155992014">"ඇමිණුම සුරැකිණි."</string>
-    <string name="copy_to_sdcard_fail" msgid="4944606369631916737">"ඇමිණුම් සුරැකීමට නොහැකි විය."</string>
-    <string name="save_ringtone" msgid="2310157075045201051">"රිංග්ටෝනයක් ලෙස සුරකින්න"</string>
-    <string name="saved_ringtone" msgid="3847363932276708626">"රිංග්ටෝන් සුරැකිණි."</string>
-    <string name="saved_ringtone_fail" msgid="4778500070919251116">"රිංග්ටෝන් සුරැකිය නොහැකි විය."</string>
-    <string name="menu_insert_smiley" msgid="4964504393061025071">"සිනාසිමක් ඇතුලත් කරන්න"</string>
-    <string name="menu_group_participants" msgid="4288356090262299071">"කණ්ඩායම් සාමාජිකයින්"</string>
-    <string name="select_link_title" msgid="3371818607625768447">"ක්‍රියාව තෝරන්න"</string>
-    <string name="slide_number" msgid="1923958526266726635">"කදාව <xliff:g id="NUMBER">%s</xliff:g>"</string>
-  <plurals name="slide_duration">
-    <item quantity="one" msgid="1654101988340583935">"තත්පර <xliff:g id="NUMBER">%s</xliff:g>"</item>
-    <item quantity="few" msgid="7887190171856293871">"තත්පර <xliff:g id="NUMBER">%s</xliff:g>"</item>
-    <item quantity="other" msgid="3736425355579939863">"තත්පර <xliff:g id="NUMBER">%s</xliff:g>"</item>
-  </plurals>
-    <string name="delivery_report_activity" msgid="2957463094232916364">"යැවීමේ වාර්තාව"</string>
-    <string name="storage_limits_activity" msgid="8810530813311077716">"ආචයන සීමා"</string>
-    <string name="change_duration_activity" msgid="7048606979485031693">"කාල සීමාව වෙනස් කරන්න"</string>
-    <string name="edit_slideshow_activity" msgid="8751493388760050529">"කදා දර්ශනය සංස්කරණය කරන්න"</string>
-    <string name="recipient_list_activity" msgid="1254938236543727019">"කණ්ඩායම් සාමාජිකයින්"</string>
-    <string name="edit_slide_activity" msgid="8752829671778696983">"කදාව සංස්කරණය කරන්න"</string>
-    <string name="slideshow_activity" msgid="5658249461317434432">"කදා දර්ශනය"</string>
-    <string name="class_0_message_activity" msgid="6631339964159861048">"0 පන්තියේ පණිවිඩය"</string>
-    <string name="search_label" msgid="6042598929386174964">"පණිවිඩ යැවීම"</string>
-    <string name="search_hint" msgid="7273727663577472044">"පණිවිඩ යැවීම සොයන්න"</string>
-    <string name="search" msgid="7560238620274735199">"පණිවිඩ යැවීම"</string>
-    <string name="search_setting_description" msgid="4104004595086437572">"ඔබගේ පණිවිඩයේ පෙළ"</string>
-    <string name="search_empty" msgid="2109551478056039278">"ගැලපීම් නැත."</string>
-  <plurals name="search_results_title">
-    <item quantity="one" msgid="4657073733087431350">"\"<xliff:g id="SEARCH">%2$s</xliff:g>\" සඳහා ප්‍රතිඑල <xliff:g id="NUMBER">%1$s</xliff:g>"</item>
-    <item quantity="other" msgid="6196382287749539209">"\"<xliff:g id="NUMBER">%1$s</xliff:g>\" සඳහා ප්‍රතිඑල <xliff:g id="SEARCH">%2$s</xliff:g>"</item>
-  </plurals>
-    <string name="search_history" msgid="4127805495662693154">"\"<xliff:g id="SEARCH">%2$s</xliff:g>\" සඳහා ප්‍රතිඑල <xliff:g id="COUNT">%1$s</xliff:g>"</string>
-    <string name="confirm_clear_search_title" msgid="8510295993632032904">"හිස් කරන්න"</string>
-    <string name="confirm_clear_search_text" msgid="8731877031837077478">"සෙවුම් ඉතිහාසය හිස් කෙරෙණු ඇත."</string>
-    <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"සෙවුම් ඉතිහාසය අස් කරන්න"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"පෙර පණිවිඩ සෙවුම්, සෙවුම් කොටුවේ පෙන්වීමෙන් වැළැක්වීමට ඒවා ඉවත් කර දමන්න"</string>
-    <string name="save" msgid="6847069284991531310">"සුරකින්න"</string>
-    <string name="storage_limits_title" msgid="7074684882530693016">"සීමිත පණිවිඩ"</string>
-    <string name="storage_limits_message" msgid="2010501485394745696">"ඔබ සංවාදයක් සඳහා සුරකින පණිවිඩ ගණන සීමා කරන්නද?"</string>
-    <string name="storage_limits_setting" msgid="4952781049308537373">"සීමා සකසන්න"</string>
-    <string name="storage_limits_setting_dismiss" msgid="1433841310158458034">"සීමාවක් නැත"</string>
-    <string name="too_many_unsent_mms" msgid="4436493698891224126">"පණිවිඩය දැන් යැවිය නොහැක. නොයවන ලද බහු මාධ්‍ය පණිවිඩ විශාල ගණනක් ඇත."</string>
-    <string name="sending_message" msgid="2054406576361149715">"යවමින්..."</string>
-    <string name="pick_too_many_recipients" msgid="650087588867628044">"ලබන්නන් විශාල සංඛ්‍යාවකි"</string>
-    <string name="adding_recipients" msgid="2962810172527532357">"ලබන්නන් එක් කරමින්…"</string>
-    <string name="draft_separator" msgid="5402575086540243019">", "</string>
-    <string name="message_count_format" msgid="4434763220590778012">" <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-    <string name="message_count_notification" msgid="3629968600032690007">"නව පණිවිඩ <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
-  <plurals name="message_count_notification_overflow">
-    <item quantity="one" msgid="3340591167508150806">"+තවත් පණිවිඩ <xliff:g id="NUMBER">%1$s</xliff:g>"</item>
-    <item quantity="other" msgid="1393002799298501480">"+තවත් පණිවිඩ <xliff:g id="NUMBER">%1$s</xliff:g>"</item>
-  </plurals>
-    <string name="error_state" msgid="5177386717626893507">"අස්ථිර තත්වය"</string>
-    <string name="error_state_text" msgid="7918866106335387710">"පොටවල තත්වය සහ ලබන්නන් අස්ථිරයි. කරුණාකර දෝෂ වාර්තාවක් ලබාගෙන එය http://go/droidanizer හරහා වාර්තා කරන්න"</string>
-  <plurals name="recipient_count">
-    <item quantity="other" msgid="7338580381574463136">"පුද්ගලයින් <xliff:g id="NUMBER">%1$s</xliff:g>"</item>
-  </plurals>
-    <string name="disable_notifications_dialog_message" msgid="7644011234972074096">"සුපුරුදු පණිවිඩ යැවීමේ යෙදුමෙන් කෙටි පණිවිඩ දැනුම්දීම් අනුපිටපත් කිරීම නවන්ත්වන්නද?"</string>
-    <string name="view_more_conversations" msgid="7275920132410734671">"තවත් සංවාද පෙන්වන්න"</string>
-    <string name="attachment_audio" msgid="2867960243300539143">"ශ්‍රව්‍ය"</string>
-    <string name="attachment_slideshow" msgid="5867689101881763318">"කදා දර්ශනය"</string>
-    <string name="attachment_video" msgid="4252062022156694591">"වීඩියෝව"</string>
-    <string name="attachment_picture" msgid="3709286281567284296">"පින්තූරය"</string>
-    <string name="notification_separator" msgid="2334673105226536422">"  "</string>
-    <string name="enumeration_comma" msgid="213598026698964628">", "</string>
-    <string name="message_timestamp_format" msgid="4188999027493614617">"<xliff:g id="STRING_0">%1$s</xliff:g> - <xliff:g id="STRING_1">%2$s</xliff:g>"</string>
-    <string name="storage_warning_title" msgid="7124740686325942375">"ඔබගේ දුරකථනයේ ආචනය සම්පුර්ණයි"</string>
-    <string name="storage_warning_content" msgid="1100367816649962354">"ඔබට නව SMS/MMS පණිවිඩ නොලැබෙයි"</string>
-    <string name="label_mms_send_outbox_msg" msgid="3395185162973061099">"MMS අවදි කිරීම"</string>
-    <string name="desc_mms_send_outbox_msg" msgid="1837156781311437148">"සියලු MMSs යන ලිපි වෙතින් ජාලය වෙත යවයි"</string>
-</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 244a262f..4e306082 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Zvuk"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Nastaviť počet ukladaných správ"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Tichý"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Spýtať sa pri každom posielaní správy, ktorú SIM kartu chcete použiť"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Viacero SIM kariet"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Automatické načítanie"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Automaticky načítať správy"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Automatické načítanie pri roamingu"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Aplikácia SMS a MMS nie je vašou aplikáciou pre správy SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> je vaša aplikácia SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Zmeniť to môžete v Nastaveniach"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Vybrať SIM kartu"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM karta <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"<xliff:g id="SUBID">%1$d</xliff:g>. slot na kartu SIM"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Zrušiť"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Aktuálne vybraná SIM karta sa nenašla. Vyberte predvolenú SIM kartu v systémových nastaveniach."</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 7da9ce48..c58161cc 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Zvok"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Nastavi število sporočil za shranjevanje"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Tiho"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Ob vsakem pošiljanju sporočila vprašaj, katera kartica SIM naj se uporabi"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Več kartic SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Samodejni prenos"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Samodejni prenos sporočil"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Samodejna pridobitev med gostovanjem"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Sporočila ni vaša aplikacija za SMS-e"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> je vaša aplikacija za SMS-e"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"To lahko spremenite v nastavitvah"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Izberite kartico SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"Kartica SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Reža za kartico SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Prekliči"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Trenutno izbrane kartice SIM ni. V sistemskih nastavitvah izberite privzeto kartico SIM."</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 2c402160..a6eecc43 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Звук"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Подеси број порука за чување"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Нечујно"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Питај који SIM треба користити сваки пут када се шаље порука"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Вишеструки SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Аутоматско преузимање"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Аутоматско преузимање порука"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Аутоматско преузимање у ромингу"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Размена порука није ваша апликација за SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> је ваша апликација за SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Ово можете да промените у Подешавањима"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Изаберите SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Отвор за SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Откажи"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Актуелна изабрана SIM картица није присутна. Изаберите подразумевану SIM картицу у системским подешавањима."</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a49628e4..4afa6ef9 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Ljud"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Ange hur många meddelanden som ska sparas"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Tyst"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Fråga vilket SIM-kort som ska användas varje gång ett meddelande skickas"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Flera SIM-kort"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Autohämtning"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Hämta meddelanden automatiskt"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Autohämtning vid roaming"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Du använder inte Meddelanden som sms-app"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"Du använder <xliff:g id="APPNAME">%s</xliff:g> som sms-app"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Du kan ändra det här i Inställningar"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Välj SIM-kort"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM-kort <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM-kortplats <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Avbryt"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Det valda SIM-kortet saknas. Välj det SIM-kort som ska användas som standard i systeminställningarna."</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 43272b12..602c976a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Sauti"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Weka nambari ya ujumbe wa kuhifadhi"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Kimya"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Uliza SIM ipi ya kutumia kila wakati ujumbe unapotumwa"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"SIM nyingi"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Epua kiotomatiki"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Epua kiotomatiki ujumbe"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Kurejesha kiotomatiki urandaji"</string>
@@ -359,11 +357,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Ujumbe si programu yako ya SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> ndiyo programu yako ya SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Unaweza kubadilisha hili katika Mipangilio"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Chagua SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Nafasi ya SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Ghairi"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"..."</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"SIM iliyochaguliwa sasa haipo. Chagua SIM yako chaguo-msingi kwenye mipangilio ya mfumo."</string>
 </resources>
diff --git a/res/values-ta-rIN/arrays.xml b/res/values-ta-rIN/arrays.xml
index 5dd0ab95..1eb1dac4 100644
--- a/res/values-ta-rIN/arrays.xml
+++ b/res/values-ta-rIN/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"தலைப்பு இல்லை"</item>
-    <item msgid="2214945158821871846">"தலைப்பு இல்லை"</item>
   </string-array>
 </resources>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml
index c2110259..ad05e70e 100644
--- a/res/values-ta-rIN/strings.xml
+++ b/res/values-ta-rIN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -20,7 +20,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_label" msgid="1503967887341230795">"மெசேஜ்"</string>
+    <string name="app_label" msgid="1503967887341230795">"செய்தியிடல்"</string>
     <string name="new_message" msgid="1530369762346003973">"புதிய செய்தி"</string>
     <string name="menu_call_back" msgid="7538482331117914146">"<xliff:g id="NAME">%s</xliff:g> ஐ அழை"</string>
     <string name="menu_send_email" msgid="671366308915241664">"<xliff:g id="NAME">%s</xliff:g> க்கு மின்னஞ்சல் அனுப்பு"</string>
@@ -162,16 +162,16 @@
     <string name="pref_summary_sms_disabled" msgid="8975773722051230744">"செய்தியிடலை உங்கள் இயல்புநிலை SMS பயன்பாடாக உருவாக்குவதற்குத் தொடவும்"</string>
     <string name="pref_title_sms_enabled" msgid="1857849790200375277">"SMS இயக்கப்பட்டது"</string>
     <string name="pref_summary_sms_enabled" msgid="2106125420361911250">"உங்கள் இயல்புநிலை SMS பயன்பாட்டை மாற்ற தொடவும்"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"உங்கள் சிம் கார்டில் சேமிக்கப்பட்ட செய்திகளை நிர்வகி"</string>
+    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"உங்கள் SIM கார்டில் சேமிக்கப்பட்ட செய்திகளை நிர்வகி"</string>
     <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"நீங்கள் அனுப்பும் ஒவ்வொரு செய்திக்கும் வழங்கல் அறிக்கையைக் கோரு"</string>
     <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"நீங்கள் அனுப்பும் ஒவ்வொரு செய்திக்கும் படித்த அறிக்கையைக் கோரவும்"</string>
     <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"நீங்கள் அனுப்பும் ஒவ்வொரு செய்திக்கும் வழங்கல் அறிக்கையைக் கோரவும்"</string>
     <string name="pref_summary_auto_delete" msgid="7719538116486177613">"வரம்புகளை அடைந்தவுடன் பழைய செய்திகளை நீக்கு"</string>
     <string name="pref_summary_delete_limit" msgid="597128041393045216">"உரையாடலுக்கு <xliff:g id="COUNT">%1$s</xliff:g> செய்திகள்"</string>
     <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"செய்தியைப் பல பெறுநர்களுக்கு அனுப்புவதற்கு MMS ஐப் பயன்படுத்து"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"சிம் கார்டின் செய்திகளை நிர்வகி"</string>
+    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"SIM கார்டின் செய்திகளை நிர்வகி"</string>
     <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"வழங்கல் அறிக்கைகள்"</string>
-    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"குழு மெசேஜ்"</string>
+    <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"குழு செய்தியிடல்"</string>
     <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"படித்தற்கான அறிக்கைகள்"</string>
     <string name="pref_title_sms_delivery_reports" msgid="876064208254451038">"வழங்கல் அறிக்கைகள்"</string>
     <string name="pref_title_auto_delete" msgid="7227835692631701134">"பழைய செய்திகளை நீக்கு"</string>
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ஒலி"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"சேமிக்க வேண்டிய செய்திகளின் எண்ணிக்கையை அமை"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"நிசப்தம்"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"ஒவ்வொரு முறை செய்தி அனுப்பும் போது பயன்படுத்த வேண்டிய சிம் ஐக் கேள்"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"பல சிம்"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"தானாக மீட்டெடு"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"செய்திகளைத் தானாகவே மீட்டெடு"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"ரோமிங்கில் தானாக மீட்டெடு"</string>
@@ -198,8 +196,8 @@
     <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"எல்லா தொடரிழைகளும் நீக்கப்படும்."</string>
     <string name="confirm_delete_message" msgid="9121480656609809591">"செய்தி நீக்கப்படும்."</string>
     <string name="confirm_delete_locked_message" msgid="7203411948190100955">"பூட்டிய செய்தியை நீக்கவா?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"சிம் கார்டில் உள்ள எல்லா செய்திகளும் நீக்கப்படும்."</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"சிம் கார்டில் உள்ள இந்தச் செய்தி நீக்கப்படும்."</string>
+    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"SIM கார்டில் உள்ள எல்லா செய்திகளும் நீக்கப்படும்."</string>
+    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"SIM கார்டில் உள்ள இந்தச் செய்தி நீக்கப்படும்."</string>
     <string name="delete_unlocked" msgid="7545321606698162261">"பூட்டிய செய்திகளை நீக்கு"</string>
     <string name="delete" msgid="1409973060081564612">"நீக்கு"</string>
     <string name="select_conversations" msgid="7816517565640002844">"உரையாடல்களைத் தேர்வுசெய்"</string>
@@ -232,9 +230,9 @@
     <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"டேப்லெட் நினைவகத்தில் நகலெடு"</string>
     <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"மொபைல் நினைவகத்தில் நகலெடு"</string>
     <string name="sim_delete" msgid="610790510655316922">"நீக்கு"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"சிம் கார்டில் உள்ள உரைச் செய்திகள்"</string>
+    <string name="sim_manage_messages_title" msgid="3989147182100584333">"SIM கார்டில் உள்ள உரைச் செய்திகள்"</string>
     <string name="sim_view" msgid="1997173541766393706">"காட்டு"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"சிம் கார்டில் செய்திகள் இல்லை."</string>
+    <string name="sim_empty" msgid="2356766833071636297">"SIM கார்டில் செய்திகள் இல்லை."</string>
     <string name="delivery_header_title" msgid="5361719578869045764">"அறிக்கை"</string>
     <string name="status_none" msgid="8253075950774894961">"(ஏதுமில்லை)"</string>
     <string name="status_pending" msgid="2739860824607984892">"நிலுவையிலுள்ளது"</string>
@@ -260,7 +258,7 @@
     <string name="notification_multiple_title" msgid="332602028959557541">"புதிய செய்திகள்"</string>
     <string name="notification_failed_multiple" msgid="6192531993698497229">"<xliff:g id="COUNT">%s</xliff:g> செய்திகளை அனுப்ப முடியவில்லை"</string>
     <string name="notification_failed_multiple_title" msgid="1112032024904397126">"செய்திகள் அனுப்பப்படவில்லை"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"சிம் கார்டு நிரம்பியது"</string>
+    <string name="sim_full_title" msgid="1809829051697702810">"SIM கார்டு நிரம்பியது"</string>
     <string name="sim_full_body" msgid="6241664980790322925">"கூடுதல் சேமிப்பிடத்தை உருவாக்க சில செய்திகளை நீக்கவும்."</string>
     <string name="sms_full_title" msgid="6041287140125011854">"உரைச் செய்தியின் நினைவகம் நிரம்பியது"</string>
     <string name="sms_full_body" msgid="4885861852397651868">"நினைவகம் நிரம்பியதால் உள்வரும் செய்தி நிராகரிக்கப்பட்டது. பழைய செய்திகள் சிலவற்றை நீக்கவும்."</string>
@@ -306,9 +304,9 @@
     <string name="edit_slide_activity" msgid="8752829671778696983">"ஸ்லைடை திருத்து"</string>
     <string name="slideshow_activity" msgid="5658249461317434432">"ஸ்லைடுகாட்சி"</string>
     <string name="class_0_message_activity" msgid="6631339964159861048">"கிளாஸ் 0 செய்தி"</string>
-    <string name="search_label" msgid="6042598929386174964">"மெசேஜ்"</string>
+    <string name="search_label" msgid="6042598929386174964">"செய்தியிடல்"</string>
     <string name="search_hint" msgid="7273727663577472044">"செய்தியிடலைத் தேடு"</string>
-    <string name="search" msgid="7560238620274735199">"மெசேஜ்"</string>
+    <string name="search" msgid="7560238620274735199">"செய்தியிடல்"</string>
     <string name="search_setting_description" msgid="4104004595086437572">"உங்கள் செய்திகளில் உள்ள உரை"</string>
     <string name="search_empty" msgid="2109551478056039278">"பொருத்தங்கள் ஏதுமில்லை."</string>
   <plurals name="search_results_title">
@@ -319,7 +317,7 @@
     <string name="confirm_clear_search_title" msgid="8510295993632032904">"அழி"</string>
     <string name="confirm_clear_search_text" msgid="8731877031837077478">"தேடல் வரலாறு அழிக்கப்படும்."</string>
     <string name="pref_mms_clear_search_history_title" msgid="6159758850628148164">"தேடல் வரலாற்றை அழி"</string>
-    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"முந்தைய மெசேஜ் தேடல்களைத் தேடல் பெட்டியில் காட்டுவதிலிருந்து அழி"</string>
+    <string name="pref_mms_clear_search_history_summary" msgid="7960005384066460035">"முந்தைய செய்தியிடல் தேடல்களைத் தேடல் பெட்டியில் காட்டுவதிலிருந்து அழி"</string>
     <string name="save" msgid="6847069284991531310">"சேமி"</string>
     <string name="storage_limits_title" msgid="7074684882530693016">"செய்திகளை வரம்பிடு"</string>
     <string name="storage_limits_message" msgid="2010501485394745696">"உரையாடல் ஒன்றிற்கு எத்தனை செய்திகளை நீங்கள் சேமிக்கலாம் என்பதை வரம்பிடவா?"</string>
@@ -341,7 +339,7 @@
   <plurals name="recipient_count">
     <item quantity="other" msgid="7338580381574463136">"<xliff:g id="NUMBER">%1$s</xliff:g> பேர்"</item>
   </plurals>
-    <string name="disable_notifications_dialog_message" msgid="7644011234972074096">"இயல்பான மெசேஜ் பயன்பாட்டிலிருந்து பிரதி உரைச் செய்தி அறிவிப்புகளை நிறுத்தவா?"</string>
+    <string name="disable_notifications_dialog_message" msgid="7644011234972074096">"இயல்பான செய்தியிடல் பயன்பாட்டிலிருந்து பிரதி உரைச் செய்தி அறிவிப்புகளை நிறுத்தவா?"</string>
     <string name="view_more_conversations" msgid="7275920132410734671">"மேலும் உரையாடல்களைக் காட்டு"</string>
     <string name="attachment_audio" msgid="2867960243300539143">"ஆடியோ"</string>
     <string name="attachment_slideshow" msgid="5867689101881763318">"ஸ்லைடுகாட்சி"</string>
@@ -354,14 +352,7 @@
     <string name="storage_warning_content" msgid="1100367816649962354">"புதிய SMS/MMS செய்திகளைப் பெறமாட்டீர்கள்"</string>
     <string name="label_mms_send_outbox_msg" msgid="3395185162973061099">"MMS விழிப்பு"</string>
     <string name="desc_mms_send_outbox_msg" msgid="1837156781311437148">"எல்லா MMSகளையும் அவுட்பாக்ஸிலிருந்து நெட்வொர்க்கிற்கு அனுப்புகிறது"</string>
-    <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"மெசேஜ், உங்கள் SMS பயன்பாடு இல்லை"</string>
+    <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"செய்தியிடல், உங்கள் SMS பயன்பாடு இல்லை"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g>, உங்கள் SMS பயன்பாடாகும்"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"நீங்கள் இதை அமைப்புகளில் மாற்றலாம்"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"சிம் ஐத் தேர்ந்தெடுக்கவும்"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"சிம் <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"சிம் ஸ்லாட் <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"ரத்துசெய்"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"தேர்ந்தெடுத்த சிம் இல்லை. முறைமை அமைப்புகளில் இயல்பு சிம்ஐத் தேர்வுசெய்க."</string>
 </resources>
diff --git a/res/values-te-rIN/arrays.xml b/res/values-te-rIN/arrays.xml
index 424b2ade..fd1183b0 100644
--- a/res/values-te-rIN/arrays.xml
+++ b/res/values-te-rIN/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"విషయం లేదు"</item>
-    <item msgid="2214945158821871846">"విషయం లేదు"</item>
   </string-array>
 </resources>
diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml
index 5559ed4e..6ed2c5af 100644
--- a/res/values-te-rIN/strings.xml
+++ b/res/values-te-rIN/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -162,14 +162,14 @@
     <string name="pref_summary_sms_disabled" msgid="8975773722051230744">"మెసేజింగ్‌ను మీ డిఫాల్ట్ SMS అనువర్తనంగా చేయడానికి తాకండి"</string>
     <string name="pref_title_sms_enabled" msgid="1857849790200375277">"SMS ప్రారంభించబడింది"</string>
     <string name="pref_summary_sms_enabled" msgid="2106125420361911250">"మీ డిఫాల్ట్ SMS అనువర్తనాన్ని మార్చడానికి తాకండి"</string>
-    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"మీ సిమ్ కార్డులో నిల్వ చేయబడిన సందేశాలను నిర్వహించండి"</string>
+    <string name="pref_summary_manage_sim_messages" msgid="4141349892597640864">"మీ SIM కార్డులో నిల్వ చేయబడిన సందేశాలను నిర్వహించండి"</string>
     <string name="pref_summary_mms_delivery_reports" msgid="4874657984217756112">"మీరు పంపే ప్రతి సందేశం కోసం బట్వాడా నివేదికను అభ్యర్థించండి"</string>
     <string name="pref_summary_mms_read_reports" msgid="2748323864008907440">"మీరు పంపే ప్రతి సందేశం కోసం చదివినట్లుగా తెలిపే నివేదికను అభ్యర్థించండి"</string>
     <string name="pref_summary_sms_delivery_reports" msgid="5852207702358546129">"మీరు పంపే ప్రతి సందేశం కోసం బట్వాడా నివేదికను అభ్యర్థించండి"</string>
     <string name="pref_summary_auto_delete" msgid="7719538116486177613">"పరిమితులను చేరుకున్నప్పుడు పాత సందేశాలను తొలగించు"</string>
     <string name="pref_summary_delete_limit" msgid="597128041393045216">"సంభాషణకు <xliff:g id="COUNT">%1$s</xliff:g> సందేశాలు"</string>
     <string name="pref_summary_mms_group_mms" msgid="2266928687440696745">"ఒక సందేశాన్ని బహుళ స్వీకర్తలకు పంపాల్సినప్పుడు MMSను ఉపయోగించండి"</string>
-    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"సిమ్ కార్డు సందేశాలను తొలగించు"</string>
+    <string name="pref_title_manage_sim_messages" msgid="7820895261757881177">"SIM కార్డు సందేశాలను తొలగించు"</string>
     <string name="pref_title_mms_delivery_reports" msgid="6666857926679451910">"బట్వాడా నివేదికలు"</string>
     <string name="pref_title_mms_group_mms" msgid="1251698526583908432">"సమూహ సందేశాలు"</string>
     <string name="pref_title_mms_read_reports" msgid="4882179829495828541">"చదవినట్లుగా తెలిపే నివేదికలు"</string>
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"ధ్వని"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"సేవ్ చేయాల్సిన సందేశాల సంఖ్యను సెట్ చేయి"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"నిశ్శబ్దం"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"సందేశం పంపే ప్రతిసారి ఏ సిమ్‌ను ఉపయోగించాలో అడుగు"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"బహుళ-సిమ్"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"స్వీయ-పునరుద్ధరణ"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"సందేశాలను స్వయంచాలకంగా పునరుద్ధరించు"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"రోమింగ్‌లో ఉన్నప్పుడు స్వీయ-పునరుద్ధరణ"</string>
@@ -198,8 +196,8 @@
     <string name="confirm_delete_all_conversations" msgid="9036166685235092757">"అన్ని థ్రెడ్‌లు తొలగించబడతాయి."</string>
     <string name="confirm_delete_message" msgid="9121480656609809591">"సందేశం తొలగించబడుతుంది."</string>
     <string name="confirm_delete_locked_message" msgid="7203411948190100955">"ఈ లాక్ చేయబడిన సందేశాన్ని తొలగించాలా?"</string>
-    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"సిమ్ కార్డులోని అన్ని సందేశాలు తొలగించబడతాయి."</string>
-    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"సిమ్ కార్డులోని ఈ సందేశం తొలగించబడుతుంది."</string>
+    <string name="confirm_delete_all_SIM_messages" msgid="8693652297557966665">"SIM కార్డులోని అన్ని సందేశాలు తొలగించబడతాయి."</string>
+    <string name="confirm_delete_SIM_message" msgid="8535128079045452425">"SIM కార్డులోని ఈ సందేశం తొలగించబడుతుంది."</string>
     <string name="delete_unlocked" msgid="7545321606698162261">"లాక్ చేయబడిన సందేశాలను తొలగించు"</string>
     <string name="delete" msgid="1409973060081564612">"తొలగించు"</string>
     <string name="select_conversations" msgid="7816517565640002844">"సంభాషణలను ఎంచుకోండి"</string>
@@ -232,9 +230,9 @@
     <string name="sim_copy_to_phone_memory" product="tablet" msgid="3721000641648594602">"టాబ్లెట్ మెమరీకి కాపీ చేయి"</string>
     <string name="sim_copy_to_phone_memory" product="default" msgid="5895767417844881971">"ఫోన్ మెమరీకి కాపీ చేయి"</string>
     <string name="sim_delete" msgid="610790510655316922">"తొలగించు"</string>
-    <string name="sim_manage_messages_title" msgid="3989147182100584333">"సిమ్ కార్డులో వచన సందేశాలు"</string>
+    <string name="sim_manage_messages_title" msgid="3989147182100584333">"SIM కార్డులో వచన సందేశాలు"</string>
     <string name="sim_view" msgid="1997173541766393706">"వీక్షించండి"</string>
-    <string name="sim_empty" msgid="2356766833071636297">"సిమ్ కార్డులో సందేశాలు లేవు."</string>
+    <string name="sim_empty" msgid="2356766833071636297">"SIM కార్డులో సందేశాలు లేవు."</string>
     <string name="delivery_header_title" msgid="5361719578869045764">"నివేదిక"</string>
     <string name="status_none" msgid="8253075950774894961">"(ఏదీ కాదు)"</string>
     <string name="status_pending" msgid="2739860824607984892">"పెండింగ్‌లో ఉంది"</string>
@@ -260,7 +258,7 @@
     <string name="notification_multiple_title" msgid="332602028959557541">"కొత్త సందేశాలు"</string>
     <string name="notification_failed_multiple" msgid="6192531993698497229">"<xliff:g id="COUNT">%s</xliff:g> సందేశాలను పంపడం సాధ్యపడలేదు"</string>
     <string name="notification_failed_multiple_title" msgid="1112032024904397126">"సందేశాలు పంపబడలేదు"</string>
-    <string name="sim_full_title" msgid="1809829051697702810">"సిమ్ కార్డు నిండింది"</string>
+    <string name="sim_full_title" msgid="1809829051697702810">"SIM కార్డు నిండింది"</string>
     <string name="sim_full_body" msgid="6241664980790322925">"మరిన్నింటి కోసం స్థలాన్ని ఖాళీ చేయడానికి కొన్ని సందేశాలను తొలగించండి."</string>
     <string name="sms_full_title" msgid="6041287140125011854">"వచన సందేశ మెమరీ నిండింది"</string>
     <string name="sms_full_body" msgid="4885861852397651868">"మెమరీ నిండిన కారణంగా ఇన్‌కమింగ్ సందేశం తిరస్కరించబడింది. కొన్ని పాత సందేశాలను తొలగించండి."</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"మెసేజింగ్ మీ SMS అనువర్తనం కాదు"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> అనేది మీ SMS అనువర్తనం"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"మీరు దీన్ని సెట్టింగ్‌ల్లో మార్చవచ్చు"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"సిమ్‌ను ఎంచుకోండి"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"సిమ్ <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"సిమ్ స్లాట్ <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"రద్దు చేయండి"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"ప్రస్తుతం ఎంచుకున్న సిమ్ లేదు. సిస్టమ్ సెట్టింగ్‌ల్లో మీ డిఫాల్ట్ సిమ్‌ను ఎంచుకోండి."</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 71596c5b..8f8bc3ba 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"เสียง"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"ตั้งค่าจำนวนข้อความที่จะบันทึก"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"ปิดเสียง"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"ถามว่าจะใช้ซิมไหนทุกครั้งที่ส่งข้อความ"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"หลายซิม"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"เรียกอัตโนมัติ"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"เรียกดูข้อความอัตโนมัติ"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"เรียกอัตโนมัติขณะโรมมิ่ง"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"การรับส่งข้อความไม่ใช่แอป SMS ของคุณ"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> คือแอป SMS ของคุณ"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"คุณสามารถเปลี่ยนค่านี้ได้ในการตั้งค่า"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"เลือกซิมการ์ด"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"ซิม <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"ช่องซิม <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"ยกเลิก"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"ไม่มีซิมที่เลือกอยู่ในปัจจุบัน โปรดเลือก SIM เริ่มต้นในการตั้งค่าระบบ"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 113a16dd..9486274b 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Tunog"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Itakda ang bilang ng mga mensaheng ise-save"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Tahimik"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Itanong kung aling SIM ang gagamitin sa tuwing magpapadala ng mensahe"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Multi-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"I-auto-retrieve"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Awtomatikong bawiin ang mga mensahe"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Niro-roam ang auto-retrieve"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Ang Pagmemensahe ay hindi ang iyong SMS app"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"Ang <xliff:g id="APPNAME">%s</xliff:g> ay ang iyong SMS app"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Mababago mo ito sa Mga Setting"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Pumili ng SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM Slot <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Kanselahin"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Wala ang kasalukuyang piniling SIM. Piliin ang iyong default na SIM sa mga setting ng system."</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index d803fd90..7a5fc5f3 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Ses"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Kaydedilecek iletilerin sayısını ayarla"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Sessiz"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"İleti gönderilirken hangi SIM\'in kullanılacağını her zaman sor"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Çoklu SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Otomatik al"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"İletileri otomatik olarak al"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Dolaşımda otomatik al"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Mesajlaşma, SMS uygulamanız değil"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g>, SMS uygulamanızdır"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Bunu Ayarlar\'da değiştirebilirsiniz."</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"SIM kart seçin"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM Yuvası <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"İptal"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Geçerli olarak seçili SIM mevcut değil. Sistem ayarlarında varsayılan SIM\'inizi seçin."</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ba8729e8..d2abdd84 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Звук"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Установ. к-сть повід. для зберіг."</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Без звуку"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Запитувати, яку SIM-карту використовувати, щоразу, коли надсилається повідомлення"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Мульти-SIM-карта"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Авто. отримання"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Автомат. отрим. повідомлення"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Автомат. отрим. роумінгу"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Ви не використовуєте програму Повідомлення для SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> – ваша програма для надсилання SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Це можна змінити в Налаштуваннях"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Вибрати SIM-карту"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM-карта <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Гніздо для SIM-карти <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Скасувати"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Вибрана SIM-карта відсутня. Виберіть SIM-карту за умовчанням у налаштуваннях системи."</string>
 </resources>
diff --git a/res/values-ur-rPK/arrays.xml b/res/values-ur-rPK/arrays.xml
index 1d0e5e69..a4e6b5f2 100644
--- a/res/values-ur-rPK/arrays.xml
+++ b/res/values-ur-rPK/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"بلا عنوان"</item>
-    <item msgid="2214945158821871846">"بلا عنوان"</item>
   </string-array>
 </resources>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml
index 51c54746..fc80ed23 100644
--- a/res/values-ur-rPK/strings.xml
+++ b/res/values-ur-rPK/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"آواز"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"محفوظ کرنے کیلئے پیغامات کی تعداد سیٹ کریں"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"خاموش"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"‏پیغام بھیجتے وقت ہر بار پوچھیں کہ کون سا SIM استعمال کرنا ہے"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"‏متعدد SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"خود کار طور پر بازیافت کریں"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"خود کار طور پر پیغامات کی بازیابی کریں"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"رومنگ کے وقت خود کار بازیافت"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"‏پیغام رسانی آپ کی SMS ایپ نہیں ہے"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"‏<xliff:g id="APPNAME">%s</xliff:g> آپ کی SMS ایپ ہے"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"آپ ترتیبات میں اسے تبدیل کر سکتے ہیں"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"‏SIM منتخب کریں"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"‏SIM کی سلاٹ <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"منسوخ کریں"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"‏موجودہ منتخب کردہ SIM موجود نہیں ہے۔ سسٹم کی ترتیبات میں اپنا ڈیفالٹ SIM منتخب کریں۔"</string>
 </resources>
diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz-rUZ/arrays.xml
index 8ea02582..48d5f2df 100644
--- a/res/values-uz-rUZ/arrays.xml
+++ b/res/values-uz-rUZ/arrays.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
  * Copyright (C) 2008 Esmertec AG.
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -20,6 +20,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string-array name="empty_subject_strings">
     <item msgid="7691141505407124426">"mavzu yo‘q"</item>
-    <item msgid="2214945158821871846">"mavzu yo‘q"</item>
   </string-array>
 </resources>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 6e7bdd29..abc77a1b 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*
  * Copyright (C) 2007-2008 Esmertec AG.
  * Copyright (C) 2007-2008 The Android Open Source Project
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Ovoz"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Saqlash uchun xabarlar sonini o‘rnatish"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Ovozsiz"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Har safar xabar yuborishda qaysi SIM kartadan yuborish kerakligini so‘rash"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Bir nechta SIM karta"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Avto chiqarib olish"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Xabarlarni avtomatik chiqarib olish"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Roumingda avto chiqarib olish"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"\"Xabarlashish\" SMS ilovangiz emas"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> - SMS ilovangiz"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Siz buni \"Sozlamalar\"dan o‘zgartirishingiz mumkin"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"SIM kartani tanlang"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"<xliff:g id="SUBID">%1$d</xliff:g>-SIM"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"<xliff:g id="SUBID">%1$d</xliff:g>-SIM uyasi"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Bekor qilish"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Joriy tanlangan SIM karta mavjud emas. Tizim sozlamalaridan birlamchi SIM kartani tanlang."</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 2c7270b0..6a581ab0 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Âm thanh"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Đặt số tin nhắn sẽ lưu"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Im lặng"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Hỏi xem sử dụng SIM nào mỗi khi gửi tin nhắn"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"Nhiều SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Tự động truy xuất"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Tự động truy xuất tin nhắn"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Tự động truy xuất khi chuyển vùng"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Nhắn tin không phải là ứng dụng SMS của bạn"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"<xliff:g id="APPNAME">%s</xliff:g> là ứng dụng SMS của bạn"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Bạn có thể thay đổi mục này trong Cài đặt"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Chọn SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Khe cắm thẻ SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Hủy"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"Không có SIM vừa chọn. Hãy chọn SIM mặc định của bạn trong cài đặt hệ thống."</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 93dd5bc3..83ffecd2 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"提示音"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"设置要保存的信息数量"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"静音"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"每次发送短信时均要求选择SIM卡"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"多SIM卡"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"自动检索"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"自动检索信息"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"漫游时自动检索"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"“短信”不是您的短信应用"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"“<xliff:g id="APPNAME">%s</xliff:g>”是您的短信应用"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"您可以在“设置”中更改此设置。"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"选择SIM卡"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM卡<xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM卡插槽<xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"取消"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"当前所选SIM卡不存在，请在系统设置中选择默认的SIM卡。"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index f2836095..165cfe82 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"音效"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"設定儲存的訊息數量"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"靜音"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"每次傳送短訊時詢問要使用哪張 SIM 卡"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"多張 SIM 卡"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"自動擷取"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"自動擷取訊息"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"漫遊時自動擷取"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"「短訊」不是您的短訊應用程式"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"「<xliff:g id="APPNAME">%s</xliff:g>」是您的短訊應用程式"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"您可以在 [設定] 中變更這項設定"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"選取 SIM 卡"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM 卡 <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM 卡插槽 <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"取消"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"目前選取的 SIM 卡不存在，請在系統設定中選擇預設的 SIM 卡。"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index e0124f1b..5d567d28 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"音效"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"設定儲存的訊息數量"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"靜音"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"每次傳送簡訊時皆詢問要使用哪張 SIM 卡"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"多張 SIM 卡"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"自動擷取"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"自動擷取簡訊"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"漫遊時自動擷取"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"「簡訊」不是您的簡訊應用程式"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"「<xliff:g id="APPNAME">%s</xliff:g>」是您的簡訊應用程式"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"您可以在 [設定] 中變更這項設定"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"選取 SIM 卡"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"SIM 卡 <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"SIM 卡插槽 <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"取消"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>  "</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"…"</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"目前選取的 SIM 卡不存在，請在系統設定中選擇預設的 SIM 卡。"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index cdeaf9bc..24b626b8 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -182,8 +182,6 @@
     <string name="pref_title_notification_ringtone" msgid="8667533917574559659">"Umsindo"</string>
     <string name="pref_messages_to_save" msgid="3202539743892934926">"Hlela inani lemiyalezo ozoyigcina"</string>
     <string name="silent_ringtone" msgid="7981237991326592780">"Thulile"</string>
-    <string name="pref_summary_sim_ask" msgid="5815190975933015621">"Buza ukuthi iyiphi i-SIM ongayisebenzisa ngaso sonke isikhathi umlayezo uthunyelwa"</string>
-    <string name="pref_title_sim_ask" msgid="4794530561349736162">"I-Multi-SIM"</string>
     <string name="pref_title_mms_auto_retrieval" msgid="4021878285474431355">"Thola ngokuzenzakalekayo"</string>
     <string name="pref_summary_mms_auto_retrieval" msgid="925163257363757048">"Ngokuzenzakalekayo ithola imiyalezo"</string>
     <string name="pref_title_mms_retrieval_during_roaming" msgid="6016227402731817804">"Izulazula ukuthola okuzenzakalekayo"</string>
@@ -357,11 +355,4 @@
     <string name="banner_sms_promo_title_initial" msgid="510014388581481569">"Imilayezo akulona uhlelo lwakho lokusebenza lwe-SMS"</string>
     <string name="banner_sms_promo_title_application" msgid="8123569785369713254">"I-<xliff:g id="APPNAME">%s</xliff:g> inguhlelo lwakho lokusebenza lwe-SMS"</string>
     <string name="banner_sms_promo_message" msgid="3536714414252763826">"Ungashintsha lokhu kokuthi Izilungiselelo"</string>
-    <string name="sub_select_dialog_title" msgid="8210168935409702285">"Khetha i-SIM"</string>
-    <string name="default_sim_name" msgid="903290497566800216">"I-SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="empty_sim_name" msgid="1008631117599170591">"Isilothi se-SIM <xliff:g id="SUBID">%1$d</xliff:g>"</string>
-    <string name="subSelect_negative" msgid="6139403806707801822">"Khansela"</string>
-    <string name="sub_name_container" msgid="4802195955108231738">"   <xliff:g id="SUBNAME">%1$s</xliff:g>"</string>
-    <string name="sub_name_ellipsis" msgid="2475475055178768223">"..."</string>
-    <string name="selected_sim_invalid" msgid="2309319911434202998">"I-SIM yamanje ekhethiwe ayikho. Khetha i-SIM yokuzenzakalelayo yakho kuzilungiselelo zesistimu."</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 8feafdcf..0a1bd94a 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -21,6 +21,5 @@
          no subject string was delivered. -->
     <string-array name="empty_subject_strings">
         <item>no subject</item>
-        <item>nosubject</item>
     </string-array>
 </resources>
diff --git a/res/values/constants.xml b/res/values/constants.xml
deleted file mode 100644
index 8a403b64..00000000
--- a/res/values/constants.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2014 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>
-    <bool name="sim_ask_preference_default_value">false</bool>
-</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c0fe8cca..2c16f3ea 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -114,7 +114,7 @@
     <!-- Menu item in slideshow edit screen for moving the selected slide down in the order -->
     <string name="move_down">Move down</string>
     <!-- Menu item in slideshow edit screen for removing the selected slide from the slideshow -->
-    <string name="remove_slide">Remove slide</string>
+    <string name="remove_slide">Remove slide</string> 
     <!-- Menu item in slideshow edit screen for adding a new slide to the slideshow -->
     <string name="add_slide">Add slide</string>
     <!-- Text displayed below "Add slide" item in slideshow edit screen -->
@@ -370,10 +370,6 @@
     <string name="pref_messages_to_save">Set number of messages to save</string>
     <!-- Settings screen, what to display for Ringtone when the user chooses "silent" [CHAR LIMIT=100]-->
     <string name="silent_ringtone">Silent</string>
-    <!-- Settings item description for multi-sim, whether to ask the user which sim to use when sending -->
-    <string name="pref_summary_sim_ask">Ask which SIM to use every time a message is sent</string>
-    <!-- Settings item for multi-sim, whether to ask the user which sim to use when sending -->
-    <string name="pref_title_sim_ask">Multi-SIM</string>
 
     <!-- The value to use when migrating from old versions for a true vibrate setting -->
     <string translatable="false" name="prefDefault_vibrate_true">always</string>
@@ -805,18 +801,4 @@
     <string name="banner_sms_promo_title_application"><xliff:g id="appName">%s</xliff:g> is your SMS app</string>
     <string name="banner_sms_promo_message">You can change this in Settings</string>
 
-    <!-- For MSim displaying -->
-    <string name="sub_select_dialog_title">Select SIM</string>
-    <string name="default_sim_name">SIM <xliff:g id="subId" example="2">%1$d</xliff:g></string>
-    <string name="empty_sim_name">SIM Slot <xliff:g id="subId" example="2">%1$d</xliff:g></string>
-    <string name="subSelect_negative">Cancel</string>
-
-    <!-- For showing sub name in MessageItem, need add some space to fill background color of sub name -->
-    <string name="sub_name_container">\u0020\u0020\u0020<xliff:g id="subName" example="SUB 01">%1$s</xliff:g>\u0020\u0020</string>
-
-    <!-- If sub name is too long, just use ... to installed some character -->
-    <string name="sub_name_ellipsis">\u2026</string>
-
-    <string name="selected_sim_invalid">Current selected SIM is not present. Choose your default SIM in system settings.</string>
-
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index db474d8d..8eec17fb 100755..100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -24,6 +24,11 @@
         android:title="@string/pref_title_sms_disabled"
         android:summary="@string/pref_summary_sms_disabled"
         android:persistent="false">
+        <intent
+            android:action="android.provider.Telephony.ACTION_CHANGE_DEFAULT"
+            android:targetPackage="com.android.settings">
+            <extra android:name="package" android:value="com.android.mms"/>
+        </intent>
     </Preference>
     <Preference
         android:key="pref_key_sms_enabled"
@@ -35,12 +40,6 @@
             android:targetPackage="com.android.settings">
         </intent>
     </Preference>
-
-    <CheckBoxPreference android:defaultValue="@bool/sim_ask_preference_default_value"
-                      android:key="pref_key_ask_sim"
-                      android:summary="@string/pref_summary_sim_ask"
-                      android:title="@string/pref_title_sim_ask" />
-
     <PreferenceCategory android:title="@string/pref_sms_storage_title"
                       android:key="pref_key_storage_settings">
 <!--
@@ -48,7 +47,7 @@
                       android:title="@string/pref_mms_clear_search_history_title"
                       android:summary="@string/pref_mms_clear_search_history_summary" />
 -->
-    <CheckBoxPreference android:defaultValue="false"
+     <CheckBoxPreference android:defaultValue="false"
                       android:key="pref_key_auto_delete"
                       android:summary="@string/pref_summary_auto_delete"
                       android:title="@string/pref_title_auto_delete" />
@@ -69,11 +68,6 @@
                       android:key="pref_key_sms_delivery_reports"
                       android:summary="@string/pref_summary_sms_delivery_reports"
                       android:title="@string/pref_title_sms_delivery_reports" />
-    <!-- add for MSim-->
-    <Preference android:defaultValue="false"
-                      android:key="pref_key_sms_delivery_reports_msim"
-                      android:summary="@string/pref_summary_sms_delivery_reports"
-                      android:title="@string/pref_title_sms_delivery_reports" />
     <Preference android:key="pref_key_manage_sim_messages"
                       android:summary="@string/pref_summary_manage_sim_messages"
                       android:title="@string/pref_title_manage_sim_messages" />
@@ -88,20 +82,10 @@
                       android:key="pref_key_mms_delivery_reports"
                       android:summary="@string/pref_summary_mms_delivery_reports"
                       android:title="@string/pref_title_mms_delivery_reports" />
-    <!-- add for MSim-->
-    <Preference       android:defaultValue="false"
-                      android:key="pref_key_mms_delivery_reports_msim"
-                      android:summary="@string/pref_summary_mms_delivery_reports"
-                      android:title="@string/pref_title_mms_delivery_reports" />
     <CheckBoxPreference android:defaultValue="false"
                       android:key="pref_key_mms_read_reports"
                       android:summary="@string/pref_summary_mms_read_reports"
                       android:title="@string/pref_title_mms_read_reports" />
-    <!-- add for MSim-->
-    <Preference       android:defaultValue="false"
-                      android:key="pref_key_mms_read_reports_msim"
-                      android:summary="@string/pref_summary_mms_read_reports"
-                      android:title="@string/pref_title_mms_read_reports" />
     <CheckBoxPreference android:defaultValue="true"
                       android:key="pref_key_mms_auto_retrieval"
                       android:title="@string/pref_title_mms_auto_retrieval"
diff --git a/src/com/android/mms/LogTag.java b/src/com/android/mms/LogTag.java
index 99fe3473..23212fe2 100644
--- a/src/com/android/mms/LogTag.java
+++ b/src/com/android/mms/LogTag.java
@@ -90,7 +90,7 @@ public class LogTag {
         Log.e(TAG, logFormat(format, args));
     }
 
-    public static void dumpInternalTables(final Context context, final int subId) {
+    public static void dumpInternalTables(final Context context) {
         if (!ALLOW_DUMP_IN_LOGS) {
             return;
         }
@@ -98,7 +98,7 @@ public class LogTag {
             public void run() {
                 RecipientIdCache.canonicalTableDump();
                 RecipientIdCache.dump();
-                Conversation.dumpThreadsTable(context, subId);
+                Conversation.dumpThreadsTable(context);
                 Conversation.dump();
                 Conversation.dumpSmsTable(context);
                 Contact.dump();
@@ -106,12 +106,11 @@ public class LogTag {
         }).start();
     }
 
-    public static void warnPossibleRecipientMismatch(final String msg, final Activity activity,
-            final int subId) {
+    public static void warnPossibleRecipientMismatch(final String msg, final Activity activity) {
         Log.e(TAG, "WARNING!!!! " + msg, new RuntimeException());
 
         if (SHOW_SEVERE_WARNING_DIALOG) {
-            dumpInternalTables(activity, subId);
+            dumpInternalTables(activity);
             activity.runOnUiThread(new Runnable() {
                 public void run() {
                     new AlertDialog.Builder(activity)
diff --git a/src/com/android/mms/MmsApp.java b/src/com/android/mms/MmsApp.java
index 6510004d..2e792bb2 100644
--- a/src/com/android/mms/MmsApp.java
+++ b/src/com/android/mms/MmsApp.java
@@ -90,6 +90,7 @@ public class MmsApp extends Application {
         mPduLoaderManager = new PduLoaderManager(context);
         mThumbnailManager = new ThumbnailManager(context);
 
+        MmsConfig.init(this);
         Contact.init(this);
         DraftCache.init(this);
         Conversation.init(this);
@@ -180,6 +181,7 @@ public class MmsApp extends Application {
                 // Fallback to Locale if there are issues with CountryDetector
                 return Locale.getDefault().getCountry();
             }
+
             mCountryIso = country.getCountryIso();
         }
         return mCountryIso;
diff --git a/src/com/android/mms/MmsConfig.java b/src/com/android/mms/MmsConfig.java
index 3750d751..e19af7c8 100755
--- a/src/com/android/mms/MmsConfig.java
+++ b/src/com/android/mms/MmsConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2009 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.
@@ -16,125 +16,202 @@
 
 package com.android.mms;
 
+import java.io.IOException;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
 import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.Bundle;
+import android.content.res.XmlResourceParser;
 import android.preference.PreferenceManager;
 import android.provider.Telephony;
-import android.telephony.SmsManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
 import android.text.TextUtils;
-import android.util.Base64;
 import android.util.Log;
 
-import java.io.UnsupportedEncodingException;
-import java.util.HashMap;
+import com.android.internal.telephony.TelephonyProperties;
+import com.android.mms.ui.MessageUtils;
+import com.android.mms.ui.MessagingPreferenceActivity;
 
 public class MmsConfig {
     private static final String TAG = LogTag.TAG;
+    private static final boolean DEBUG = true;
+    private static final boolean LOCAL_LOGV = false;
+
+    private static final String DEFAULT_HTTP_KEY_X_WAP_PROFILE = "x-wap-profile";
+    private static final String DEFAULT_USER_AGENT = "Android-Mms/2.0";
+
+    private static final String MMS_APP_PACKAGE = "com.android.mms";
+
+    private static final String SMS_PROMO_DISMISSED_KEY = "sms_promo_dismissed_key";
+
+    private static final int MAX_IMAGE_HEIGHT = 480;
+    private static final int MAX_IMAGE_WIDTH = 640;
+    private static final int MAX_TEXT_LENGTH = 2000;
 
-    final static HashMap<Integer, Bundle> mConfigValues = new HashMap<Integer, Bundle>();
+    /**
+     * Whether to hide MMS functionality from the user (i.e. SMS only).
+     */
+    private static boolean mTransIdEnabled = false;
+    private static int mMmsEnabled = 1;                         // default to true
+    private static int mMaxMessageSize = 300 * 1024;            // default to 300k max size
+    private static String mUserAgent = DEFAULT_USER_AGENT;
+    private static String mUaProfTagName = DEFAULT_HTTP_KEY_X_WAP_PROFILE;
+    private static String mUaProfUrl = null;
+    private static String mHttpParams = null;
+    private static String mHttpParamsLine1Key = null;
+    private static String mEmailGateway = null;
+    private static int mMaxImageHeight = MAX_IMAGE_HEIGHT;      // default value
+    private static int mMaxImageWidth = MAX_IMAGE_WIDTH;        // default value
+    private static int mRecipientLimit = Integer.MAX_VALUE;     // default value
+    private static int mDefaultSMSMessagesPerThread = 10000;    // default value
+    private static int mDefaultMMSMessagesPerThread = 1000;     // default value
+    private static int mMinMessageCountPerThread = 2;           // default value
+    private static int mMaxMessageCountPerThread = 5000;        // default value
+    private static int mHttpSocketTimeout = 60*1000;            // default to 1 min
+    private static int mMinimumSlideElementDuration = 7;        // default to 7 sec
+    private static boolean mNotifyWapMMSC = false;
+    private static boolean mAllowAttachAudio = true;
+
+    // If mEnableMultipartSMS is true, long sms messages are always sent as multi-part sms
+    // messages, with no checked limit on the number of segments.
+    // If mEnableMultipartSMS is false, then as soon as the user types a message longer
+    // than a single segment (i.e. 140 chars), then the message will turn into and be sent
+    // as an mms message. This feature exists for carriers that don't support multi-part sms's.
+    private static boolean mEnableMultipartSMS = true;
+
+    // If mEnableMultipartSMS is true and mSmsToMmsTextThreshold > 1, then multi-part SMS messages
+    // will be converted into a single mms message. For example, if the mms_config.xml file
+    // specifies <int name="smsToMmsTextThreshold">4</int>, then on the 5th sms segment, the
+    // message will be converted to an mms.
+    private static int mSmsToMmsTextThreshold = -1;
+
+    private static boolean mEnableSlideDuration = true;
+    private static boolean mEnableMMSReadReports = true;        // key: "enableMMSReadReports"
+    private static boolean mEnableSMSDeliveryReports = true;    // key: "enableSMSDeliveryReports"
+    private static boolean mEnableMMSDeliveryReports = true;    // key: "enableMMSDeliveryReports"
+    private static int mMaxTextLength = -1;
 
     // This is the max amount of storage multiplied by mMaxMessageSize that we
     // allow of unsent messages before blocking the user from sending any more
     // MMS's.
     private static int mMaxSizeScaleForPendingMmsAllowed = 4;       // default value
-    private static int mDefaultSMSMessagesPerThread = 200;      // default value
-    private static int mDefaultMMSMessagesPerThread = 20;       // default value
-    private static int mMinMessageCountPerThread = 2;           // default value
-    private static int mMaxMessageCountPerThread = 5000;        // default value
-    private static boolean mEnableSlideDuration = true;
-    private static int mMinimumSlideElementDuration = 7;        // default to 7 sec
 
-    private static String sMmsAppPackage;
+    // Email gateway alias support, including the master switch and different rules
+    private static boolean mAliasEnabled = false;
+    private static int mAliasRuleMinChars = 2;
+    private static int mAliasRuleMaxChars = 48;
 
-    private static final String SMS_PROMO_DISMISSED_KEY = "sms_promo_dismissed_key";
+    private static int mMaxSubjectLength = 40;  // maximum number of characters allowed for mms
+                                                // subject
 
-    /*
-     * Macro names
-     */
-    // The raw phone number from TelephonyManager.getLine1Number
-    public static final String MACRO_LINE1 = "LINE1";
-    // The phone number without country code
-    public static final String MACRO_LINE1NOCOUNTRYCODE = "LINE1NOCOUNTRYCODE";
-    // NAI (Network Access Identifier), used by Sprint for authentication
-    public static final String MACRO_NAI = "NAI";
+    // If mEnableGroupMms is true, a message with multiple recipients, regardless of contents,
+    // will be sent as a single MMS message with multiple "TO" fields set for each recipient.
+    // If mEnableGroupMms is false, the group MMS setting/preference will be hidden in the settings
+    // activity.
+    private static boolean mEnableGroupMms = true;
 
+    public static void init(Context context) {
+        if (LOCAL_LOGV) {
+            Log.v(TAG, "MmsConfig.init()");
+        }
+        // Always put the mnc/mcc in the log so we can tell which mms_config.xml was loaded.
+        Log.v(TAG, "mnc/mcc: " +
+                android.os.SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC));
 
-    public static long getLong(int subId, final String valueName) {
-        Bundle bundle = getBundle(subId);
-        return bundle != null ? bundle.getLong(valueName) : 0L;
+        loadMmsSettings(context);
     }
 
-    public static long getLong(final String valueName) {
-        return getLong(SubscriptionManager.getDefaultSmsSubId(), valueName);
-    }
+    public static boolean isSmsEnabled(Context context) {
+        String defaultSmsApplication = Telephony.Sms.getDefaultSmsPackage(context);
 
-    public static int getInt(int subId, final String valueName) {
-        Bundle bundle = getBundle(subId);
-        return bundle != null ? bundle.getInt(valueName) : 0;
+        if (defaultSmsApplication != null && defaultSmsApplication.equals(MMS_APP_PACKAGE)) {
+            return true;
+        }
+        return false;
     }
 
-    public static int getInt(final String valueName) {
-        return getInt(SubscriptionManager.getDefaultSmsSubId(), valueName);
+    public static boolean isSmsPromoDismissed(Context context) {
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+        return preferences.getBoolean(SMS_PROMO_DISMISSED_KEY, false);
     }
 
-    public static String getString(int subId, final String valueName) {
-        Bundle bundle = getBundle(subId);
-        return bundle != null ? bundle.getString(valueName) : null;
+    public static void setSmsPromoDismissed(Context context) {
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putBoolean(SMS_PROMO_DISMISSED_KEY, true);
+        editor.apply();
     }
 
-    public static String getString(final String valueName) {
-        return getString(SubscriptionManager.getDefaultSmsSubId(), valueName);
+    public static Intent getRequestDefaultSmsAppActivity() {
+        final Intent intent = new Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT);
+        intent.putExtra(Telephony.Sms.Intents.EXTRA_PACKAGE_NAME, MMS_APP_PACKAGE);
+        return intent;
     }
 
-    public static boolean getBoolean(int subId, final String valueName) {
-        Bundle bundle = getBundle(subId);
-        return bundle != null ? bundle.getBoolean(valueName) : false;
+    public static int getSmsToMmsTextThreshold() {
+        return mSmsToMmsTextThreshold;
     }
 
-    public static boolean getBoolean(final String valueName) {
-        return getBoolean(SubscriptionManager.getDefaultSmsSubId(), valueName);
+    public static boolean getMmsEnabled() {
+        return mMmsEnabled == 1 ? true : false;
     }
 
-    private static Bundle getBundle(int subId) {
-        final boolean validSubId = SubscriptionManager.isUsableSubIdValue(subId);
-        if (!validSubId) {
-            subId = SubscriptionManager.getDefaultSmsSubId();
+    public static int getMaxMessageSize() {
+        if (LOCAL_LOGV) {
+            Log.v(TAG, "MmsConfig.getMaxMessageSize(): " + mMaxMessageSize);
         }
+       return mMaxMessageSize;
+    }
 
-        Bundle bundle = mConfigValues.get(subId);
-        if (bundle != null) {
-//            Log.v(TAG, "getBundle CACHED subId: " + subId + " " + bundleToString(bundle));
-            return bundle;
-        }
-        SmsManager smsManager = SmsManager.getSmsManagerForSubscriber(subId);
-        bundle = smsManager.getCarrierConfigValues();
-        if (bundle != null && validSubId) {
-            mConfigValues.put(subId, bundle);
-        }
-//        Log.v(TAG, "getBundle subId: " + subId + " " + bundleToString(bundle));
-        return bundle;
-    }
-
-    private static String bundleToString(final Bundle bundle) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("Bundle: {");
-        if (bundle == null) {
-            sb.append("null");
-        } else {
-            for (String key : bundle.keySet()) {
-                sb.append(" " + key + " -> " + bundle.get(key) + ";");
-            }
-        }
-        sb.append(" }");
-        return sb.toString();
+    /**
+     * This function returns the value of "enabledTransID" present in mms_config file.
+     * In case of single segment wap push message, this "enabledTransID" indicates whether
+     * TransactionID should be appended to URI or not.
+     */
+    public static boolean getTransIdEnabled() {
+        return mTransIdEnabled;
     }
 
+    public static String getUserAgent() {
+        return mUserAgent;
+    }
 
-    public static int getMaxSizeScaleForPendingMmsAllowed() {
-        return mMaxSizeScaleForPendingMmsAllowed;
+    public static String getUaProfTagName() {
+        return mUaProfTagName;
+    }
+
+    public static String getUaProfUrl() {
+        return mUaProfUrl;
+    }
+
+    public static String getHttpParams() {
+        return mHttpParams;
+    }
+
+    public static String getHttpParamsLine1Key() {
+        return mHttpParamsLine1Key;
+    }
+
+    public static String getEmailGateway() {
+        return mEmailGateway;
+    }
+
+    public static int getMaxImageHeight() {
+        return mMaxImageHeight;
+    }
+
+    public static int getMaxImageWidth() {
+        return mMaxImageWidth;
+    }
+
+    public static int getRecipientLimit() {
+        return mRecipientLimit;
+    }
+
+    public static int getMaxTextLimit() {
+        return mMaxTextLength > -1 ? mMaxTextLength : MAX_TEXT_LENGTH;
     }
 
     public static int getDefaultSMSMessagesPerThread() {
@@ -153,103 +230,220 @@ public class MmsConfig {
         return mMaxMessageCountPerThread;
     }
 
-    public static boolean isSmsEnabled() {
-        String defaultSmsApplication =
-                Telephony.Sms.getDefaultSmsPackage(MmsApp.getApplication().getApplicationContext());
+    public static int getHttpSocketTimeout() {
+        return mHttpSocketTimeout;
+    }
 
-        if (defaultSmsApplication != null && defaultSmsApplication.equals(getMmsAppPackageName())) {
-            return true;
-        }
-        return false;
+    public static int getMinimumSlideElementDuration() {
+        return mMinimumSlideElementDuration;
     }
 
-    private static String getMmsAppPackageName() {
-        if (sMmsAppPackage == null) {
-            sMmsAppPackage = MmsApp.getApplication().getApplicationContext().getPackageName();
-        }
-        return sMmsAppPackage;
+    public static boolean getMultipartSmsEnabled() {
+        return mEnableMultipartSMS;
     }
 
-    public static boolean isSmsPromoDismissed() {
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(
-                MmsApp.getApplication().getApplicationContext());
-        return preferences.getBoolean(SMS_PROMO_DISMISSED_KEY, false);
+    public static boolean getSlideDurationEnabled() {
+        return mEnableSlideDuration;
     }
 
-    public static void setSmsPromoDismissed() {
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(
-                MmsApp.getApplication().getApplicationContext());
-        SharedPreferences.Editor editor = preferences.edit();
-        editor.putBoolean(SMS_PROMO_DISMISSED_KEY, true);
-        editor.apply();
+    public static boolean getMMSReadReportsEnabled() {
+        return mEnableMMSReadReports;
     }
 
-    public static boolean getSlideDurationEnabled() {
-        return mEnableSlideDuration;
+    public static boolean getSMSDeliveryReportsEnabled() {
+        return mEnableSMSDeliveryReports;
     }
 
-    public static int getMinimumSlideElementDuration() {
-        return mMinimumSlideElementDuration;
+    public static boolean getMMSDeliveryReportsEnabled() {
+        return mEnableMMSDeliveryReports;
     }
 
-    public static String getHttpParamMacro(String macro, int subId) {
-        if (MACRO_LINE1.equals(macro)) {
-            return getLine1(subId);
-        } else if (MACRO_LINE1NOCOUNTRYCODE.equals(macro)) {
-            return getLine1NoCountryCode(subId);
-        } else if (MACRO_NAI.equals(macro)) {
-            return getNai(subId);
-        }
-        return null;
+    public static boolean getNotifyWapMMSC() {
+        return mNotifyWapMMSC;
     }
 
-    /**
-     * @return the phone number
-     */
-    private static String getLine1(int subId) {
-        final TelephonyManager telephonyManager =
-                (TelephonyManager) MmsApp.getApplication().getApplicationContext().getSystemService(
-                        Context.TELEPHONY_SERVICE);
-        return telephonyManager.getLine1NumberForSubscriber(subId);
+    public static int getMaxSizeScaleForPendingMmsAllowed() {
+        return mMaxSizeScaleForPendingMmsAllowed;
     }
 
-    private static String getLine1NoCountryCode(int subId) {
-        final TelephonyManager telephonyManager =
-                (TelephonyManager) MmsApp.getApplication().getApplicationContext().getSystemService(
-                        Context.TELEPHONY_SERVICE);
-        // TODO - strip country code
-        return telephonyManager.getLine1NumberForSubscriber(subId);
+    public static boolean isAliasEnabled() {
+        return mAliasEnabled;
     }
 
-    /**
-     * @return the NAI (Network Access Identifier) from SystemProperties
-     */
-    private static String getNai(int subId) {
-        final TelephonyManager telephonyManager =
-                (TelephonyManager) MmsApp.getApplication().getApplicationContext().getSystemService(
-                        Context.TELEPHONY_SERVICE);
-        String nai = telephonyManager.getNai(SubscriptionManager.getSlotId(subId));
-        if (Log.isLoggable(TAG, Log.VERBOSE)) {
-            Log.v(TAG, "MmsConfig.getNai: nai=" + nai);
+    public static int getAliasMinChars() {
+        return mAliasRuleMinChars;
+    }
+
+    public static int getAliasMaxChars() {
+        return mAliasRuleMaxChars;
+    }
+
+    public static boolean getAllowAttachAudio() {
+        return mAllowAttachAudio;
+    }
+
+    public static int getMaxSubjectLength() {
+        return mMaxSubjectLength;
+    }
+
+    public static boolean getGroupMmsEnabled() {
+        return mEnableGroupMms;
+    }
+
+    public static final void beginDocument(XmlPullParser parser, String firstElementName) throws XmlPullParserException, IOException
+    {
+        int type;
+        while ((type=parser.next()) != XmlPullParser.START_TAG
+                   && type != XmlPullParser.END_DOCUMENT) {
+            ;
         }
 
-        if (!TextUtils.isEmpty(nai)) {
-            String naiSuffix = getString(subId, SmsManager.MMS_CONFIG_NAI_SUFFIX);
-            if (!TextUtils.isEmpty(naiSuffix)) {
-                nai = nai + naiSuffix;
-            }
-            byte[] encoded = null;
-            try {
-                encoded = Base64.encode(nai.getBytes("UTF-8"), Base64.NO_WRAP);
-            } catch (UnsupportedEncodingException e) {
-                encoded = Base64.encode(nai.getBytes(), Base64.NO_WRAP);
-            }
-            try {
-                nai = new String(encoded, "UTF-8");
-            } catch (UnsupportedEncodingException e) {
-                nai = new String(encoded);
+        if (type != XmlPullParser.START_TAG) {
+            throw new XmlPullParserException("No start tag found");
+        }
+
+        if (!parser.getName().equals(firstElementName)) {
+            throw new XmlPullParserException("Unexpected start tag: found " + parser.getName() +
+                    ", expected " + firstElementName);
+        }
+    }
+
+    public static final void nextElement(XmlPullParser parser) throws XmlPullParserException, IOException
+    {
+        int type;
+        while ((type=parser.next()) != XmlPullParser.START_TAG
+                   && type != XmlPullParser.END_DOCUMENT) {
+            ;
+        }
+    }
+
+    private static void loadMmsSettings(Context context) {
+        XmlResourceParser parser = context.getResources().getXml(R.xml.mms_config);
+
+        try {
+            beginDocument(parser, "mms_config");
+
+            while (true) {
+                nextElement(parser);
+                String tag = parser.getName();
+                if (tag == null) {
+                    break;
+                }
+                String name = parser.getAttributeName(0);
+                String value = parser.getAttributeValue(0);
+                String text = null;
+                if (parser.next() == XmlPullParser.TEXT) {
+                    text = parser.getText();
+                }
+
+                if (DEBUG) {
+                    Log.v(TAG, "tag: " + tag + " value: " + value + " - " +
+                            text);
+                }
+                if ("name".equalsIgnoreCase(name)) {
+                    if ("bool".equals(tag)) {
+                        // bool config tags go here
+                        if ("enabledMMS".equalsIgnoreCase(value)) {
+                            mMmsEnabled = "true".equalsIgnoreCase(text) ? 1 : 0;
+                        } else if ("enabledTransID".equalsIgnoreCase(value)) {
+                            mTransIdEnabled = "true".equalsIgnoreCase(text);
+                        } else if ("enabledNotifyWapMMSC".equalsIgnoreCase(value)) {
+                            mNotifyWapMMSC = "true".equalsIgnoreCase(text);
+                        } else if ("aliasEnabled".equalsIgnoreCase(value)) {
+                            mAliasEnabled = "true".equalsIgnoreCase(text);
+                        } else if ("allowAttachAudio".equalsIgnoreCase(value)) {
+                            mAllowAttachAudio = "true".equalsIgnoreCase(text);
+                        } else if ("enableMultipartSMS".equalsIgnoreCase(value)) {
+                            mEnableMultipartSMS = "true".equalsIgnoreCase(text);
+                        } else if ("enableSlideDuration".equalsIgnoreCase(value)) {
+                            mEnableSlideDuration = "true".equalsIgnoreCase(text);
+                        } else if ("enableMMSReadReports".equalsIgnoreCase(value)) {
+                            mEnableMMSReadReports = "true".equalsIgnoreCase(text);
+                        } else if ("enableSMSDeliveryReports".equalsIgnoreCase(value)) {
+                            mEnableSMSDeliveryReports = "true".equalsIgnoreCase(text);
+                        } else if ("enableMMSDeliveryReports".equalsIgnoreCase(value)) {
+                            mEnableMMSDeliveryReports = "true".equalsIgnoreCase(text);
+                        } else if ("enableGroupMms".equalsIgnoreCase(value)) {
+                            mEnableGroupMms = "true".equalsIgnoreCase(text);
+                        }
+                    } else if ("int".equals(tag)) {
+                        // int config tags go here
+                        if ("maxMessageSize".equalsIgnoreCase(value)) {
+                            mMaxMessageSize = Integer.parseInt(text);
+                        } else if ("maxImageHeight".equalsIgnoreCase(value)) {
+                            mMaxImageHeight = Integer.parseInt(text);
+                        } else if ("maxImageWidth".equalsIgnoreCase(value)) {
+                            mMaxImageWidth = Integer.parseInt(text);
+                        } else if ("defaultSMSMessagesPerThread".equalsIgnoreCase(value)) {
+                            mDefaultSMSMessagesPerThread = Integer.parseInt(text);
+                        } else if ("defaultMMSMessagesPerThread".equalsIgnoreCase(value)) {
+                            mDefaultMMSMessagesPerThread = Integer.parseInt(text);
+                        } else if ("minMessageCountPerThread".equalsIgnoreCase(value)) {
+                            mMinMessageCountPerThread = Integer.parseInt(text);
+                        } else if ("maxMessageCountPerThread".equalsIgnoreCase(value)) {
+                            mMaxMessageCountPerThread = Integer.parseInt(text);
+                        } else if ("recipientLimit".equalsIgnoreCase(value)) {
+                            mRecipientLimit = Integer.parseInt(text);
+                            if (mRecipientLimit < 0) {
+                                mRecipientLimit = Integer.MAX_VALUE;
+                            }
+                        } else if ("httpSocketTimeout".equalsIgnoreCase(value)) {
+                            mHttpSocketTimeout = Integer.parseInt(text);
+                        } else if ("minimumSlideElementDuration".equalsIgnoreCase(value)) {
+                            mMinimumSlideElementDuration = Integer.parseInt(text);
+                        } else if ("maxSizeScaleForPendingMmsAllowed".equalsIgnoreCase(value)) {
+                            mMaxSizeScaleForPendingMmsAllowed = Integer.parseInt(text);
+                        } else if ("aliasMinChars".equalsIgnoreCase(value)) {
+                            mAliasRuleMinChars = Integer.parseInt(text);
+                        } else if ("aliasMaxChars".equalsIgnoreCase(value)) {
+                            mAliasRuleMaxChars = Integer.parseInt(text);
+                        } else if ("smsToMmsTextThreshold".equalsIgnoreCase(value)) {
+                            mSmsToMmsTextThreshold = Integer.parseInt(text);
+                        } else if ("maxMessageTextSize".equalsIgnoreCase(value)) {
+                            mMaxTextLength = Integer.parseInt(text);
+                        } else if ("maxSubjectLength".equalsIgnoreCase(value)) {
+                            mMaxSubjectLength = Integer.parseInt(text);
+                        }
+                    } else if ("string".equals(tag)) {
+                        // string config tags go here
+                        if ("userAgent".equalsIgnoreCase(value)) {
+                            mUserAgent = text;
+                        } else if ("uaProfTagName".equalsIgnoreCase(value)) {
+                            mUaProfTagName = text;
+                        } else if ("uaProfUrl".equalsIgnoreCase(value)) {
+                            mUaProfUrl = text;
+                        } else if ("httpParams".equalsIgnoreCase(value)) {
+                            mHttpParams = text;
+                        } else if ("httpParamsLine1Key".equalsIgnoreCase(value)) {
+                            mHttpParamsLine1Key = text;
+                        } else if ("emailGatewayNumber".equalsIgnoreCase(value)) {
+                            mEmailGateway = text;
+                        }
+                    }
+                }
             }
+        } catch (XmlPullParserException e) {
+            Log.e(TAG, "loadMmsSettings caught ", e);
+        } catch (NumberFormatException e) {
+            Log.e(TAG, "loadMmsSettings caught ", e);
+        } catch (IOException e) {
+            Log.e(TAG, "loadMmsSettings caught ", e);
+        } finally {
+            parser.close();
+        }
+
+        String errorStr = null;
+
+        if (getMmsEnabled() && mUaProfUrl == null) {
+            errorStr = "uaProfUrl";
+        }
+
+        if (errorStr != null) {
+            String err =
+                String.format("MmsConfig.loadMmsSettings mms_config.xml missing %s setting",
+                        errorStr);
+            Log.e(TAG, err);
         }
-        return nai;
     }
+
 }
diff --git a/src/com/android/mms/data/Contact.java b/src/com/android/mms/data/Contact.java
index 02be9c2e..e1aa9062 100644
--- a/src/com/android/mms/data/Contact.java
+++ b/src/com/android/mms/data/Contact.java
@@ -158,16 +158,16 @@ public class Contact {
         Log.d(tag, sb.toString());
     }
 
-    public static Contact get(String number, boolean canBlock, int subId) {
-        return sContactCache.get(number, canBlock, subId);
+    public static Contact get(String number, boolean canBlock) {
+        return sContactCache.get(number, canBlock);
     }
 
-    public static Contact getMe(boolean canBlock, int subId) {
-        return sContactCache.getMe(canBlock, subId);
+    public static Contact getMe(boolean canBlock) {
+        return sContactCache.getMe(canBlock);
     }
 
-    public void removeFromCache(int subId) {
-        sContactCache.remove(this, subId);
+    public void removeFromCache() {
+        sContactCache.remove(this);
     }
 
     public static List<Contact> getByPhoneUris(Parcelable[] uris) {
@@ -224,9 +224,9 @@ public class Contact {
         }
     }
 
-    public synchronized void reload(int subId) {
+    public synchronized void reload() {
         mIsStale = true;
-        sContactCache.get(mNumber, false, subId);
+        sContactCache.get(mNumber, false);
     }
 
     public synchronized String getNumber() {
@@ -360,6 +360,9 @@ public class Contact {
     }
 
     public static void init(final Context context) {
+        if (sContactCache != null) { // Stop previous Runnable
+            sContactCache.mTaskQueue.mWorkerThread.interrupt();
+        }
         sContactCache = new ContactsCache(context);
 
         RecipientIdCache.init(context);
@@ -508,7 +511,7 @@ public class Contact {
                                     try {
                                         mThingsToLoad.wait();
                                     } catch (InterruptedException ex) {
-                                        // nothing to do
+                                        break;  // Exception sent by Contact.init() to stop Runnable
                                     }
                                 }
                                 if (mThingsToLoad.size() > 0) {
@@ -537,15 +540,15 @@ public class Contact {
             mTaskQueue.push(r);
         }
 
-        public Contact getMe(boolean canBlock, int subId) {
-            return get(SELF_ITEM_KEY, true, canBlock, subId);
+        public Contact getMe(boolean canBlock) {
+            return get(SELF_ITEM_KEY, true, canBlock);
         }
 
-        public Contact get(String number, boolean canBlock, int subId) {
-            return get(number, false, canBlock, subId);
+        public Contact get(String number, boolean canBlock) {
+            return get(number, false, canBlock);
         }
 
-        private Contact get(String number, boolean isMe, boolean canBlock, final int subId) {
+        private Contact get(String number, boolean isMe, boolean canBlock) {
             if (Log.isLoggable(LogTag.CONTACT, Log.DEBUG)) {
                 logWithTrace(TAG, "get(%s, %s, %s)", number, isMe, canBlock);
             }
@@ -559,7 +562,7 @@ public class Contact {
 
             // Always return a Contact object, if if we don't have an actual contact
             // in the contacts db.
-            Contact contact = internalGet(number, isMe, subId);
+            Contact contact = internalGet(number, isMe);
             Runnable r = null;
 
             synchronized (contact) {
@@ -587,7 +590,7 @@ public class Contact {
                     r = new Runnable() {
                         @Override
                         public void run() {
-                            updateContact(c, subId);
+                            updateContact(c);
                         }
                     };
 
@@ -723,12 +726,12 @@ public class Contact {
             return false;
         }
 
-        private void updateContact(final Contact c, int subId) {
+        private void updateContact(final Contact c) {
             if (c == null) {
                 return;
             }
 
-            Contact entry = getContactInfo(c, subId);
+            Contact entry = getContactInfo(c);
             synchronized (c) {
                 if (contactChanged(c, entry)) {
                     if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
@@ -783,12 +786,12 @@ public class Contact {
         /**
          * Returns the caller info in Contact.
          */
-        private Contact getContactInfo(Contact c, int subId) {
+        private Contact getContactInfo(Contact c) {
             if (c.mIsMe) {
                 return getContactInfoForSelf();
             } else if (Mms.isEmailAddress(c.mNumber)) {
                 return getContactInfoForEmailAddress(c.mNumber);
-            } else if (isAlphaNumber(c.mNumber, subId)) {
+            } else if (isAlphaNumber(c.mNumber)) {
                 // first try to look it up in the email field
                 Contact contact = getContactInfoForEmailAddress(c.mNumber);
                 if (contact.existsInDatabase()) {
@@ -817,7 +820,7 @@ public class Contact {
         //    "#4#5#6#"  -> true   [it is considered to be the address "#4#5#6#"]
         //    "AB12"     -> true   [2 digits, it is considered to be the address "AB12"]
         //    "12"       -> true   [2 digits, it is considered to be the address "12"]
-        private boolean isAlphaNumber(String number, int subId) {
+        private boolean isAlphaNumber(String number) {
             // TODO: PhoneNumberUtils.isWellFormedSmsAddress() only check if the number is a valid
             // GSM SMS address. If the address contains a dialable char, it considers it a well
             // formed SMS addr. CDMA doesn't work that way and has a different parser for SMS
@@ -826,7 +829,7 @@ public class Contact {
                 // The example "T-Mobile" will exit here because there are no numbers.
                 return true;        // we're not an sms address, consider it an alpha number
             }
-            if (MessageUtils.isAlias(number, subId)) {
+            if (MessageUtils.isAlias(number)) {
                 return true;
             }
             number = PhoneNumberUtils.extractNetworkPortion(number);
@@ -1102,12 +1105,12 @@ public class Contact {
         static final int STATIC_KEY_BUFFER_MAXIMUM_LENGTH = 5;
         static CharBuffer sStaticKeyBuffer = CharBuffer.allocate(STATIC_KEY_BUFFER_MAXIMUM_LENGTH);
 
-        private Contact internalGet(String numberOrEmail, boolean isMe, int subId) {
+        private Contact internalGet(String numberOrEmail, boolean isMe) {
             synchronized (ContactsCache.this) {
                 // See if we can find "number" in the hashtable.
                 // If so, just return the result.
                 final boolean isNotRegularPhoneNumber = isMe || Mms.isEmailAddress(numberOrEmail) ||
-                        MessageUtils.isAlias(numberOrEmail, subId);
+                        MessageUtils.isAlias(numberOrEmail);
                 final String key = isNotRegularPhoneNumber ?
                         numberOrEmail : key(numberOrEmail, sStaticKeyBuffer);
 
@@ -1154,12 +1157,12 @@ public class Contact {
         }
 
         // Remove a contact from the ContactsCache based on the number or email address
-        private void remove(Contact contact, int subId) {
+        private void remove(Contact contact) {
             synchronized (ContactsCache.this) {
                 String number = contact.getNumber();
                 final boolean isNotRegularPhoneNumber = contact.isMe() ||
                                     Mms.isEmailAddress(number) ||
-                                    MessageUtils.isAlias(number, subId);
+                                    MessageUtils.isAlias(number);
                 final String key = isNotRegularPhoneNumber ?
                         number : key(number, sStaticKeyBuffer);
                 ArrayList<Contact> candidates = mContactsHash.get(key);
diff --git a/src/com/android/mms/data/ContactList.java b/src/com/android/mms/data/ContactList.java
index 964c397b..01c2598d 100644
--- a/src/com/android/mms/data/ContactList.java
+++ b/src/com/android/mms/data/ContactList.java
@@ -14,11 +14,11 @@ import com.android.mms.ui.MessageUtils;
 public class ContactList extends ArrayList<Contact>  {
     private static final long serialVersionUID = 1L;
 
-    public static ContactList getByNumbers(Iterable<String> numbers, boolean canBlock, int subId) {
+    public static ContactList getByNumbers(Iterable<String> numbers, boolean canBlock) {
         ContactList list = new ContactList();
         for (String number : numbers) {
             if (!TextUtils.isEmpty(number)) {
-                list.add(Contact.get(number, canBlock, subId));
+                list.add(Contact.get(number, canBlock));
             }
         }
         return list;
@@ -26,12 +26,11 @@ public class ContactList extends ArrayList<Contact>  {
 
     public static ContactList getByNumbers(String semiSepNumbers,
                                            boolean canBlock,
-                                           boolean replaceNumber,
-                                           int subId) {
+                                           boolean replaceNumber) {
         ContactList list = new ContactList();
         for (String number : semiSepNumbers.split(";")) {
             if (!TextUtils.isEmpty(number)) {
-                Contact contact = Contact.get(number, canBlock, subId);
+                Contact contact = Contact.get(number, canBlock);
                 if (replaceNumber) {
                     contact.setNumber(number);
                 }
@@ -47,15 +46,14 @@ public class ContactList extends ArrayList<Contact>  {
      * for the numbers don't belong to any contact.
      *
      * @param uris phone URI to create the ContactList
-     * @param subId subscription for contact
      */
-    public static ContactList blockingGetByUris(Parcelable[] uris, int subId) {
+    public static ContactList blockingGetByUris(Parcelable[] uris) {
         ContactList list = new ContactList();
         if (uris != null && uris.length > 0) {
             for (Parcelable p : uris) {
                 Uri uri = (Uri) p;
                 if ("tel".equals(uri.getScheme())) {
-                    Contact contact = Contact.get(uri.getSchemeSpecificPart(), true, subId);
+                    Contact contact = Contact.get(uri.getSchemeSpecificPart(), true);
                     list.add(contact);
                 }
             }
@@ -71,11 +69,11 @@ public class ContactList extends ArrayList<Contact>  {
      * Returns a ContactList for the corresponding recipient ids passed in. This method will
      * create the contact if it doesn't exist, and would inject the recipient id into the contact.
      */
-    public static ContactList getByIds(String spaceSepIds, boolean canBlock, int subId) {
+    public static ContactList getByIds(String spaceSepIds, boolean canBlock) {
         ContactList list = new ContactList();
         for (RecipientIdCache.Entry entry : RecipientIdCache.getAddresses(spaceSepIds)) {
             if (entry != null && !TextUtils.isEmpty(entry.number)) {
-                Contact contact = Contact.get(entry.number, canBlock, subId);
+                Contact contact = Contact.get(entry.number, canBlock);
                 contact.setRecipientId(entry.id);
                 list.add(contact);
             }
@@ -109,8 +107,8 @@ public class ContactList extends ArrayList<Contact>  {
         return TextUtils.join(separator, nans);
     }
 
-    public String serialize(int subId) {
-        return TextUtils.join(";", getNumbers(subId));
+    public String serialize() {
+        return TextUtils.join(";", getNumbers());
     }
 
     public boolean containsEmail() {
@@ -122,11 +120,11 @@ public class ContactList extends ArrayList<Contact>  {
         return false;
     }
 
-    public String[] getNumbers(int subId) {
-        return getNumbers(false /* don't scrub for MMS address */, subId);
+    public String[] getNumbers() {
+        return getNumbers(false /* don't scrub for MMS address */);
     }
 
-    public String[] getNumbers(boolean scrubForMmsAddress, int subId) {
+    public String[] getNumbers(boolean scrubForMmsAddress) {
         List<String> numbers = new ArrayList<String>();
         String number;
         for (Contact c : this) {
@@ -137,7 +135,7 @@ public class ContactList extends ArrayList<Contact>  {
                 // could be null if it's not a valid MMS address. We don't want to send
                 // a message to an invalid number, as the network may do its own stripping,
                 // and end up sending the message to a different number!
-                number = MessageUtils.parseMmsAddress(number, subId);
+                number = MessageUtils.parseMmsAddress(number);
             }
 
             // Don't add duplicate numbers. This can happen if a contact name has a comma.
diff --git a/src/com/android/mms/data/Conversation.java b/src/com/android/mms/data/Conversation.java
index a88f42d0..0ccdd9a2 100755..100644
--- a/src/com/android/mms/data/Conversation.java
+++ b/src/com/android/mms/data/Conversation.java
@@ -24,7 +24,6 @@ import android.provider.Telephony.Sms.Conversations;
 import android.provider.Telephony.Threads;
 import android.provider.Telephony.ThreadsColumns;
 import android.telephony.PhoneNumberUtils;
-import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -164,11 +163,9 @@ public class Conversation {
      * Find the conversation matching the provided recipient set.
      * When called with an empty recipient list, equivalent to {@link #createNew}.
      */
-    public static Conversation get(Context context, ContactList recipients, boolean allowQuery,
-            int subId) {
+    public static Conversation get(Context context, ContactList recipients, boolean allowQuery) {
         if (DEBUG) {
-            Log.v(TAG, "Conversation get by recipients: " +
-                    recipients.serialize(SubscriptionManager.getDefaultSmsSubId()));
+            Log.v(TAG, "Conversation get by recipients: " + recipients.serialize());
         }
         // If there are no recipients in the list, make a new conversation.
         if (recipients.size() < 1) {
@@ -179,7 +176,7 @@ public class Conversation {
         if (conv != null)
             return conv;
 
-        long threadId = getOrCreateThreadId(context, recipients, subId);
+        long threadId = getOrCreateThreadId(context, recipients);
         conv = new Conversation(context, threadId, allowQuery);
         Log.d(TAG, "Conversation.get: created new conversation " + /*conv.toString()*/ "xxxxxxx");
 
@@ -206,7 +203,7 @@ public class Conversation {
      * {@value sms:+12124797990}.
      * When called with a null Uri, equivalent to {@link #createNew}.
      */
-    public static Conversation get(Context context, Uri uri, boolean allowQuery, int subId) {
+    public static Conversation get(Context context, Uri uri, boolean allowQuery) {
         if (DEBUG) {
             Log.v(TAG, "Conversation get by uri: " + uri);
         }
@@ -232,14 +229,14 @@ public class Conversation {
         String recipients = PhoneNumberUtils.replaceUnicodeDigits(getRecipients(uri))
                 .replace(',', ';');
         return get(context, ContactList.getByNumbers(recipients,
-                allowQuery /* don't block */, true /* replace number */, subId), allowQuery, subId);
+                allowQuery /* don't block */, true /* replace number */), allowQuery);
     }
 
     /**
      * Returns true if the recipient in the uri matches the recipient list in this
      * conversation.
      */
-    public boolean sameRecipient(Uri uri, Context context, int subId) {
+    public boolean sameRecipient(Uri uri, Context context) {
         int size = mRecipients.size();
         if (size > 1) {
             return false;
@@ -250,7 +247,7 @@ public class Conversation {
         ContactList incomingRecipient = null;
         if (uri.getPathSegments().size() >= 2) {
             // it's a thread id for a conversation
-            Conversation otherConv = get(context, uri, false, subId);
+            Conversation otherConv = get(context, uri, false);
             if (otherConv == null) {
                 return false;
             }
@@ -258,7 +255,7 @@ public class Conversation {
         } else {
             String recipient = getRecipients(uri);
             incomingRecipient = ContactList.getByNumbers(recipient,
-                    false /* don't block */, false /* don't replace number */, subId);
+                    false /* don't block */, false /* don't replace number */);
         }
         if (DEBUG) Log.v(TAG, "sameRecipient incomingRecipient: " + incomingRecipient +
                 " mRecipients: " + mRecipients);
@@ -317,7 +314,7 @@ public class Conversation {
         }
 
         final Cursor c = SqliteWrapper.query(context, context.getContentResolver(),
-                        Mms.Inbox.CONTENT_URI, new String[] {Mms._ID, Mms.MESSAGE_ID, Mms.SUB_ID},
+                        Mms.Inbox.CONTENT_URI, new String[] {Mms._ID, Mms.MESSAGE_ID},
                         selection, null, null);
 
         try {
@@ -331,7 +328,7 @@ public class Conversation {
                     LogTag.debug("sendReadReport: uri = " + uri);
                 }
                 MmsMessageSender.sendReadRec(context, AddressUtils.getFrom(context, uri),
-                                             c.getString(1), status, c.getInt(2));
+                                             c.getString(1), status);
             }
         } finally {
             if (c != null) {
@@ -466,12 +463,12 @@ public class Conversation {
      *
      * @return The thread ID of this conversation in the database
      */
-    public synchronized long ensureThreadId(int subId) {
+    public synchronized long ensureThreadId() {
         if (DEBUG || DELETEDEBUG) {
             LogTag.debug("ensureThreadId before: " + mThreadId);
         }
         if (mThreadId <= 0) {
-            mThreadId = getOrCreateThreadId(mContext, mRecipients, subId);
+            mThreadId = getOrCreateThreadId(mContext, mRecipients);
         }
         if (DEBUG || DELETEDEBUG) {
             LogTag.debug("ensureThreadId after: " + mThreadId);
@@ -607,11 +604,11 @@ public class Conversation {
         mIsChecked = isChecked;
     }
 
-    private static long getOrCreateThreadId(Context context, ContactList list, int subId) {
+    private static long getOrCreateThreadId(Context context, ContactList list) {
         HashSet<String> recipients = new HashSet<String>();
         Contact cacheContact = null;
         for (Contact c : list) {
-            cacheContact = Contact.get(c.getNumber(), false, subId);
+            cacheContact = Contact.get(c.getNumber(), false);
             if (cacheContact != null) {
                 recipients.add(cacheContact.getNumber());
             } else {
@@ -699,8 +696,7 @@ public class Conversation {
 
     @Override
     public synchronized String toString() {
-        return String.format("[%s] (tid %d)",
-                mRecipients.serialize(SubscriptionManager.getDefaultSmsSubId()), mThreadId);
+        return String.format("[%s] (tid %d)", mRecipients.serialize(), mThreadId);
     }
 
     /**
@@ -928,8 +924,7 @@ public class Conversation {
         // Fill in as much of the conversation as we can before doing the slow stuff of looking
         // up the contacts associated with this conversation.
         String recipientIds = c.getString(RECIPIENT_IDS);
-        ContactList recipients = ContactList.getByIds(recipientIds, allowQuery,
-                SubscriptionManager.getDefaultSmsSubId());
+        ContactList recipients = ContactList.getByIds(recipientIds, allowQuery);
         synchronized (conv) {
             conv.mRecipients = recipients;
         }
@@ -1310,7 +1305,7 @@ public class Conversation {
         Cache.dumpCache();
     }
 
-    public static void dumpThreadsTable(Context context, int subId) {
+    public static void dumpThreadsTable(Context context) {
         LogTag.debug("**** Dump of threads table ****");
         Cursor c = context.getContentResolver().query(sAllThreadsUri,
                 ALL_THREADS_PROJECTION, null, null, "date ASC");
@@ -1327,9 +1322,8 @@ public class Conversation {
                         " " + ThreadsColumns.HAS_ATTACHMENT + " : " + c.getInt(HAS_ATTACHMENT) +
                         " " + ThreadsColumns.RECIPIENT_IDS + " : " + c.getString(RECIPIENT_IDS));
 
-                ContactList recipients = ContactList.getByIds(c.getString(RECIPIENT_IDS), false,
-                        subId);
-                Log.d(TAG, "----recipients: " + recipients.serialize(subId));
+                ContactList recipients = ContactList.getByIds(c.getString(RECIPIENT_IDS), false);
+                Log.d(TAG, "----recipients: " + recipients.serialize());
             }
         } finally {
             c.close();
@@ -1397,10 +1391,10 @@ public class Conversation {
      * @return the verified number or email of the recipient
      */
     public static String verifySingleRecipient(final Context context,
-            final long threadId, final String recipientStr, int subId) {
+            final long threadId, final String recipientStr) {
         if (threadId <= 0) {
             LogTag.error("verifySingleRecipient threadId is ZERO, recipient: " + recipientStr);
-            LogTag.dumpInternalTables(context, subId);
+            LogTag.dumpInternalTables(context);
             return recipientStr;
         }
         Cursor c = context.getContentResolver().query(sAllThreadsUri, ALL_THREADS_PROJECTION,
@@ -1408,7 +1402,7 @@ public class Conversation {
         if (c == null) {
             LogTag.error("verifySingleRecipient threadId: " + threadId +
                     " resulted in NULL cursor , recipient: " + recipientStr);
-            LogTag.dumpInternalTables(context, subId);
+            LogTag.dumpInternalTables(context);
             return recipientStr;
         }
         String address = recipientStr;
@@ -1417,7 +1411,7 @@ public class Conversation {
             if (!c.moveToFirst()) {
                 LogTag.error("verifySingleRecipient threadId: " + threadId +
                         " can't moveToFirst , recipient: " + recipientStr);
-                LogTag.dumpInternalTables(context, subId);
+                LogTag.dumpInternalTables(context);
                 return recipientStr;
             }
             recipientIds = c.getString(RECIPIENT_IDS);
@@ -1440,7 +1434,7 @@ public class Conversation {
             LogTag.error("verifySingleRecipient threadId: " + threadId +
                     " getSingleNumberFromCanonicalAddresses returned empty number for: " +
                     ids[0] + " recipientIds: " + recipientIds);
-            LogTag.dumpInternalTables(context, subId);
+            LogTag.dumpInternalTables(context);
             return recipientStr;
         }
         if (PhoneNumberUtils.compareLoosely(recipientStr, address)) {
@@ -1456,9 +1450,9 @@ public class Conversation {
         if (context instanceof Activity) {
             LogTag.warnPossibleRecipientMismatch("verifySingleRecipient for threadId: " +
                     threadId + " original recipient: " + recipientStr +
-                    " recipient from DB: " + address, (Activity)context, subId);
+                    " recipient from DB: " + address, (Activity)context);
         }
-        LogTag.dumpInternalTables(context, subId);
+        LogTag.dumpInternalTables(context);
         if (Log.isLoggable(LogTag.THREAD_CACHE, Log.VERBOSE)) {
             LogTag.debug("verifySingleRecipient for threadId: " +
                     threadId + " original recipient: " + recipientStr +
diff --git a/src/com/android/mms/data/WorkingMessage.java b/src/com/android/mms/data/WorkingMessage.java
index b7581afd..aaed85a7 100755
--- a/src/com/android/mms/data/WorkingMessage.java
+++ b/src/com/android/mms/data/WorkingMessage.java
@@ -35,12 +35,10 @@ import android.database.sqlite.SqliteWrapper;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.provider.Telephony;
 import android.provider.Telephony.Mms;
 import android.provider.Telephony.MmsSms;
 import android.provider.Telephony.MmsSms.PendingMessages;
 import android.provider.Telephony.Sms;
-import android.telephony.SmsManager;
 import android.telephony.SmsMessage;
 import android.text.TextUtils;
 import android.util.Log;
@@ -70,7 +68,6 @@ import com.android.mms.util.DraftCache;
 import com.android.mms.util.Recycler;
 import com.android.mms.util.ThumbnailManager;
 import com.android.mms.widget.MmsWidgetProvider;
-
 import com.google.android.mms.ContentType;
 import com.google.android.mms.MmsException;
 import com.google.android.mms.pdu.EncodedStringValue;
@@ -147,6 +144,9 @@ public class WorkingMessage {
     private volatile boolean mHasMmsDraft;
     private volatile boolean mHasSmsDraft;
 
+    // Cached value of mms enabled flag
+    private static boolean sMmsEnabled = MmsConfig.getMmsEnabled();
+
     // Our callback interface
     private final MessageStatusListener mStatusListener;
     private List<String> mWorkingRecipients;
@@ -222,7 +222,7 @@ public class WorkingMessage {
      * Create a new WorkingMessage from the specified data URI, which typically
      * contains an MMS message.
      */
-    public static WorkingMessage load(ComposeMessageActivity activity, Uri uri, int subId) {
+    public static WorkingMessage load(ComposeMessageActivity activity, Uri uri) {
         // If the message is not already in the draft box, move it there.
         if (!uri.toString().startsWith(Mms.Draft.CONTENT_URI.toString())) {
             PduPersister persister = PduPersister.getPduPersister(activity);
@@ -238,7 +238,7 @@ public class WorkingMessage {
         }
 
         WorkingMessage msg = new WorkingMessage(activity);
-        if (msg.loadFromUri(uri, subId)) {
+        if (msg.loadFromUri(uri)) {
             msg.mHasMmsDraft = true;
             return msg;
         }
@@ -246,13 +246,13 @@ public class WorkingMessage {
         return null;
     }
 
-    private void correctAttachmentState(boolean showToast, int subId) {
+    private void correctAttachmentState(boolean showToast) {
         int slideCount = mSlideshow.size();
 
         // If we get an empty slideshow, tear down all MMS
         // state and discard the unnecessary message Uri.
         if (slideCount == 0) {
-            removeAttachment(false, subId);
+            removeAttachment(false);
         } else if (slideCount > 1) {
             mAttachmentType = SLIDESHOW;
         } else {
@@ -266,10 +266,10 @@ public class WorkingMessage {
             }
         }
 
-        updateState(HAS_ATTACHMENT, hasAttachment(), showToast, subId);
+        updateState(HAS_ATTACHMENT, hasAttachment(), showToast);
     }
 
-    private boolean loadFromUri(Uri uri, int subId) {
+    private boolean loadFromUri(Uri uri) {
         if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) LogTag.debug("loadFromUri %s", uri);
         try {
             mSlideshow = SlideshowModel.createFromMessageUri(mActivity, uri);
@@ -282,7 +282,7 @@ public class WorkingMessage {
 
         // Make sure all our state is as expected.
         syncTextFromSlideshow();
-        correctAttachmentState(false, subId);
+        correctAttachmentState(false);
 
         return true;
     }
@@ -293,8 +293,7 @@ public class WorkingMessage {
      */
     public static WorkingMessage loadDraft(ComposeMessageActivity activity,
                                            final Conversation conv,
-                                           final Runnable onDraftLoaded,
-                                           final int subId) {
+                                           final Runnable onDraftLoaded) {
         if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) LogTag.debug("loadDraft %s", conv);
 
         final WorkingMessage msg = createEmpty(activity);
@@ -321,7 +320,7 @@ public class WorkingMessage {
                     StringBuilder sb = new StringBuilder();
                     Uri uri = readDraftMmsMessage(msg.mActivity, conv, sb);
                     if (uri != null) {
-                        if (msg.loadFromUri(uri, subId)) {
+                        if (msg.loadFromUri(uri)) {
                             // If there was an MMS message, readDraftMmsMessage
                             // will put the subject in our supplied StringBuilder.
                             subject = sb.toString();
@@ -341,7 +340,7 @@ public class WorkingMessage {
                 if (result.second != null) {
                     msg.mHasMmsDraft = true;
                     if (!TextUtils.isEmpty(result.second)) {
-                        msg.setSubject(result.second, false, subId);
+                        msg.setSubject(result.second, false);
                     }
                 }
                 if (onDraftLoaded != null) {
@@ -375,7 +374,7 @@ public class WorkingMessage {
         return mText != null && TextUtils.getTrimmedLength(mText) > 0;
     }
 
-    public void removeAttachment(boolean notify, int subId) {
+    public void removeAttachment(boolean notify) {
         removeThumbnailsFromCache(mSlideshow);
         mAttachmentType = TEXT;
         mSlideshow = null;
@@ -384,7 +383,7 @@ public class WorkingMessage {
             mMessageUri = null;
         }
         // mark this message as no longer having an attachment
-        updateState(HAS_ATTACHMENT, false, notify, subId);
+        updateState(HAS_ATTACHMENT, false, notify);
         if (notify) {
             // Tell ComposeMessageActivity (or other listener) that the attachment has changed.
             // In the case of ComposeMessageActivity, it will remove its attachment panel because
@@ -426,7 +425,7 @@ public class WorkingMessage {
      * @param append true if we should add the attachment to a new slide
      * @return An error code such as {@link UNKNOWN_ERROR} or {@link OK} if successful
      */
-    public int setAttachment(int type, Uri dataUri, boolean append, int subId) {
+    public int setAttachment(int type, Uri dataUri, boolean append) {
         if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
             LogTag.debug("setAttachment type=%d uri %s", type, dataUri);
         }
@@ -459,8 +458,7 @@ public class WorkingMessage {
         if (result == OK) {
             mAttachmentType = type;
         }
-        // this can remove the slideshow if there are no attachments
-        correctAttachmentState(true, subId);
+        correctAttachmentState(true);   // this can remove the slideshow if there are no attachments
 
         if (mSlideshow != null && type == IMAGE) {
             // Prime the image's cache; helps A LOT when the image is coming from the network
@@ -488,14 +486,13 @@ public class WorkingMessage {
              */
             int smsSegmentCount = params[0];
 
-            if (!MmsConfig.getBoolean(SmsManager.MMS_CONFIG_MULTIPART_SMS_ENABLED)) {
+            if (!MmsConfig.getMultipartSmsEnabled()) {
                 // The provider doesn't support multi-part sms's so as soon as the user types
                 // an sms longer than one segment, we have to turn the message into an mms.
-                setLengthRequiresMms(smsSegmentCount > 1, false, subId);
+                setLengthRequiresMms(smsSegmentCount > 1, false);
             } else {
-                int threshold =
-                        MmsConfig.getInt(SmsManager.MMS_CONFIG_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD);
-                setLengthRequiresMms(threshold > 0 && smsSegmentCount > threshold, false, subId);
+                int threshold = MmsConfig.getSmsToMmsTextThreshold();
+                setLengthRequiresMms(threshold > 0 && smsSegmentCount > threshold, false);
             }
         }
         return result;
@@ -691,9 +688,9 @@ public class WorkingMessage {
      * MMS when the user adds a subject.  An empty subject will be removed
      * before saving to disk or sending, however.
      */
-    public void setSubject(CharSequence s, boolean notify, int subId) {
+    public void setSubject(CharSequence s, boolean notify) {
         mSubject = s;
-        updateState(HAS_SUBJECT, (s != null), notify, subId);
+        updateState(HAS_SUBJECT, (s != null), notify);
     }
 
     /**
@@ -755,9 +752,9 @@ public class WorkingMessage {
     /**
      * Removes the subject if it is empty, possibly converting back to SMS.
      */
-    private void removeSubjectIfEmpty(boolean notify, int subId) {
+    private void removeSubjectIfEmpty(boolean notify) {
         if (!hasSubject()) {
-            setSubject(null, notify, subId);
+            setSubject(null, notify);
         }
     }
 
@@ -765,10 +762,10 @@ public class WorkingMessage {
      * Gets internal message state ready for storage.  Should be called any
      * time the message is about to be sent or written to disk.
      */
-    private void prepareForSave(boolean notify, int subId) {
+    private void prepareForSave(boolean notify) {
         // Make sure our working set of recipients is resolved
         // to first-class Contact objects before we save.
-        syncWorkingRecipients(subId);
+        syncWorkingRecipients();
 
         if (hasMmsContentToSave()) {
             ensureSlideshow();
@@ -779,36 +776,36 @@ public class WorkingMessage {
     /**
      * Resolve the temporary working set of recipients to a ContactList.
      */
-    public void syncWorkingRecipients(int subId) {
+    public void syncWorkingRecipients() {
         if (mWorkingRecipients != null) {
-            ContactList recipients = ContactList.getByNumbers(mWorkingRecipients, false, subId);
+            ContactList recipients = ContactList.getByNumbers(mWorkingRecipients, false);
             mConversation.setRecipients(recipients);    // resets the threadId to zero
-            setHasMultipleRecipients(recipients.size() > 1, true, subId);
+            setHasMultipleRecipients(recipients.size() > 1, true);
             mWorkingRecipients = null;
         }
     }
 
-    public String getWorkingRecipients(int subId) {
+    public String getWorkingRecipients() {
         // this function is used for DEBUG only
         if (mWorkingRecipients == null) {
             return null;
         }
-        ContactList recipients = ContactList.getByNumbers(mWorkingRecipients, false, subId);
-        return recipients.serialize(subId);
+        ContactList recipients = ContactList.getByNumbers(mWorkingRecipients, false);
+        return recipients.serialize();
     }
 
     // Call when we've returned from adding an attachment. We're no longer forcing the message
     // into a Mms message. At this point we either have the goods to make the message a Mms
     // or we don't. No longer fake it.
-    public void removeFakeMmsForDraft(int subId) {
-        updateState(FORCE_MMS, false, false, subId);
+    public void removeFakeMmsForDraft() {
+        updateState(FORCE_MMS, false, false);
     }
 
     /**
      * Force the message to be saved as MMS and return the Uri of the message.
      * Typically used when handing a message off to another activity.
      */
-    public Uri saveAsMms(boolean notify, int subId) {
+    public Uri saveAsMms(boolean notify) {
         if (DEBUG) LogTag.debug("saveAsMms mConversation=%s", mConversation);
 
         // If we have discarded the message, just bail out.
@@ -822,27 +819,27 @@ public class WorkingMessage {
         // the message seem non-empty (and thus not discarded).  This bit
         // is sticky until the last other MMS bit is removed, at which
         // point the message will fall back to SMS.
-        updateState(FORCE_MMS, true, notify, subId);
+        updateState(FORCE_MMS, true, notify);
 
         // Collect our state to be written to disk.
-        prepareForSave(true /* notify */, subId);
+        prepareForSave(true /* notify */);
 
         try {
             // Make sure we are saving to the correct thread ID.
             DraftCache.getInstance().setSavingDraft(true);
             if (!mConversation.getRecipients().isEmpty()) {
-                mConversation.ensureThreadId(subId);
+                mConversation.ensureThreadId();
             }
             mConversation.setDraftState(true);
 
             PduPersister persister = PduPersister.getPduPersister(mActivity);
-            SendReq sendReq = makeSendReq(mConversation, mSubject, subId);
+            SendReq sendReq = makeSendReq(mConversation, mSubject);
 
             // If we don't already have a Uri lying around, make a new one.  If we do
             // have one already, make sure it is synced to disk.
             if (mMessageUri == null) {
                 mMessageUri = createDraftMmsMessage(persister, sendReq, mSlideshow, null,
-                        mActivity, null, subId);
+                        mActivity, null);
             } else {
                 updateDraftMmsMessage(mMessageUri, persister, mSlideshow, sendReq, null);
             }
@@ -857,7 +854,7 @@ public class WorkingMessage {
      * Save this message as a draft in the conversation previously specified
      * to {@link setConversation}.
      */
-    public void saveDraft(final boolean isStopping, int subId) {
+    public void saveDraft(final boolean isStopping) {
         // If we have discarded the message, just bail out.
         if (mDiscarded) {
             LogTag.warn("saveDraft mDiscarded: true mConversation: " + mConversation +
@@ -875,11 +872,11 @@ public class WorkingMessage {
         }
 
         // Get ready to write to disk. But don't notify message status when saving draft
-        prepareForSave(false /* notify */, subId);
+        prepareForSave(false /* notify */);
 
         if (requiresMms()) {
             if (hasMmsContentToSave()) {
-                asyncUpdateDraftMmsMessage(mConversation, isStopping, subId);
+                asyncUpdateDraftMmsMessage(mConversation, isStopping);
                 mHasMmsDraft = true;
             }
         } else {
@@ -892,7 +889,7 @@ public class WorkingMessage {
             // and takes that thread id (because it's the next thread id to be assigned), the
             // new message will be merged with the draft message thread, causing confusion!
             if (!TextUtils.isEmpty(content)) {
-                asyncUpdateDraftSmsMessage(mConversation, content, isStopping, subId);
+                asyncUpdateDraftSmsMessage(mConversation, content, isStopping);
                 mHasSmsDraft = true;
             } else {
                 // When there's no associated text message, we have to handle the case where there
@@ -965,17 +962,17 @@ public class WorkingMessage {
      * has given it a Bundle to reinflate
      * @param bundle The Bundle passed in to onCreate
      */
-    public void readStateFromBundle(Bundle bundle, int subId) {
+    public void readStateFromBundle(Bundle bundle) {
         if (bundle == null) {
             return;
         }
 
         String subject = bundle.getString("subject");
-        setSubject(subject, false, subId);
+        setSubject(subject, false);
 
         Uri uri = (Uri)bundle.getParcelable("msg_uri");
         if (uri != null) {
-            loadFromUri(uri, subId);
+            loadFromUri(uri);
             return;
         } else {
             String body = bundle.getString("sms_body");
@@ -1029,15 +1026,15 @@ public class WorkingMessage {
     /**
      * Set the conversation associated with this message.
      */
-    public void setConversation(Conversation conv, int subId) {
+    public void setConversation(Conversation conv) {
         if (DEBUG) LogTag.debug("setConversation %s -> %s", mConversation, conv);
 
         mConversation = conv;
 
         // Convert to MMS if there are any email addresses in the recipient list.
         ContactList contactList = conv.getRecipients();
-        setHasEmail(contactList.containsEmail(), false, subId);
-        setHasMultipleRecipients(contactList.size() > 1, false, subId);
+        setHasEmail(contactList.containsEmail(), false);
+        setHasMultipleRecipients(contactList.size() > 1, false);
     }
 
     public Conversation getConversation() {
@@ -1048,11 +1045,11 @@ public class WorkingMessage {
      * Hint whether or not this message will be delivered to an
      * an email address.
      */
-    public void setHasEmail(boolean hasEmail, boolean notify, int subId) {
-        if (MmsConfig.getString(SmsManager.MMS_CONFIG_EMAIL_GATEWAY_NUMBER) != null) {
-            updateState(RECIPIENTS_REQUIRE_MMS, false, notify, subId);
+    public void setHasEmail(boolean hasEmail, boolean notify) {
+        if (MmsConfig.getEmailGateway() != null) {
+            updateState(RECIPIENTS_REQUIRE_MMS, false, notify);
         } else {
-            updateState(RECIPIENTS_REQUIRE_MMS, hasEmail, notify, subId);
+            updateState(RECIPIENTS_REQUIRE_MMS, hasEmail, notify);
         }
     }
     /**
@@ -1062,12 +1059,11 @@ public class WorkingMessage {
      * whether the message is sent as an mms, but the other factors (such as, "has a picture
      * attachment") still hold true.
      */
-    public void setHasMultipleRecipients(boolean hasMultipleRecipients, boolean notify,
-            int subId) {
+    public void setHasMultipleRecipients(boolean hasMultipleRecipients, boolean notify) {
         updateState(MULTIPLE_RECIPIENTS,
                 hasMultipleRecipients &&
-                    MessagingPreferenceActivity.getIsGroupMmsEnabled(mActivity, subId),
-                notify, subId);
+                    MessagingPreferenceActivity.getIsGroupMmsEnabled(mActivity),
+                notify);
     }
 
     /**
@@ -1099,8 +1095,8 @@ public class WorkingMessage {
      * @param: mmsRequired is the value for the LENGTH_REQUIRES_MMS bit.
      * @param: notify Whether or not to notify the user.
     */
-    public void setLengthRequiresMms(boolean mmsRequired, boolean notify, int subId) {
-        updateState(LENGTH_REQUIRES_MMS, mmsRequired, notify, subId);
+    public void setLengthRequiresMms(boolean mmsRequired, boolean notify) {
+        updateState(LENGTH_REQUIRES_MMS, mmsRequired, notify);
     }
 
     private static String stateString(int state) {
@@ -1132,8 +1128,8 @@ public class WorkingMessage {
      * @param on If true, set it; if false, clear it
      * @param notify Whether or not to notify the user
      */
-    private void updateState(int state, boolean on, boolean notify, int subId) {
-        if (!MmsConfig.getBoolean(subId, SmsManager.MMS_CONFIG_MMS_ENABLED)) {
+    private void updateState(int state, boolean on, boolean notify) {
+        if (!sMmsEnabled) {
             // If Mms isn't enabled, the rest of the Messaging UI should not be using any
             // feature that would cause us to to turn on any Mms flag and show the
             // "Converting to multimedia..." message.
@@ -1177,26 +1173,26 @@ public class WorkingMessage {
      * @throws ContentRestrictionException if sending an MMS and uaProfUrl is not defined
      * in mms_config.xml.
      */
-    public void send(final String recipientsInUI, final int subId) {
+    public void send(final String recipientsInUI) {
         long origThreadId = mConversation.getThreadId();
 
         if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
             LogTag.debug("send origThreadId: " + origThreadId);
         }
 
-        removeSubjectIfEmpty(true /* notify */, subId);
+        removeSubjectIfEmpty(true /* notify */);
 
         // Get ready to write to disk.
-        prepareForSave(true /* notify */, subId);
+        prepareForSave(true /* notify */);
 
         // We need the recipient list for both SMS and MMS.
         final Conversation conv = mConversation;
         String msgTxt = mText.toString();
 
-        if (requiresMms() || addressContainsEmailToMms(conv, msgTxt, subId)) {
+        if (requiresMms() || addressContainsEmailToMms(conv, msgTxt)) {
             // uaProfUrl setting in mms_config.xml must be present to send an MMS.
             // However, SMS service will still work in the absence of a uaProfUrl address.
-            if (MmsConfig.getString(subId, SmsManager.MMS_CONFIG_UA_PROF_TAG_NAME) == null) {
+            if (MmsConfig.getUaProfUrl() == null) {
                 String err = "WorkingMessage.send MMS sending failure. mms_config.xml is " +
                         "missing uaProfUrl setting.  uaProfUrl is required for MMS service, " +
                         "but can be absent for SMS.";
@@ -1224,14 +1220,14 @@ public class WorkingMessage {
             new Thread(new Runnable() {
                 @Override
                 public void run() {
-                    final SendReq sendReq = makeSendReq(conv, subject, subId);
+                    final SendReq sendReq = makeSendReq(conv, subject);
 
                     // Make sure the text in slide 0 is no longer holding onto a reference to
                     // the text in the message text box.
                     slideshow.prepareForSend();
-                    sendMmsWorker(conv, mmsUri, persister, slideshow, sendReq, textOnly, subId);
+                    sendMmsWorker(conv, mmsUri, persister, slideshow, sendReq, textOnly);
 
-                    updateSendStats(conv, subId);
+                    updateSendStats(conv);
                 }
             }, "WorkingMessage.send MMS").start();
         } else {
@@ -1240,9 +1236,9 @@ public class WorkingMessage {
             new Thread(new Runnable() {
                 @Override
                 public void run() {
-                    preSendSmsWorker(conv, msgText, recipientsInUI, subId);
+                    preSendSmsWorker(conv, msgText, recipientsInUI);
 
-                    updateSendStats(conv, subId);
+                    updateSendStats(conv);
                 }
             }, "WorkingMessage.send SMS").start();
         }
@@ -1255,24 +1251,24 @@ public class WorkingMessage {
     }
 
     // Be sure to only call this on a background thread.
-    private void updateSendStats(final Conversation conv, int subId) {
-        String[] dests = conv.getRecipients().getNumbers(subId);
+    private void updateSendStats(final Conversation conv) {
+        String[] dests = conv.getRecipients().getNumbers();
         final ArrayList<String> phoneNumbers = new ArrayList<String>(Arrays.asList(dests));
 
         DataUsageStatUpdater updater = new DataUsageStatUpdater(mActivity);
         updater.updateWithPhoneNumber(phoneNumbers);
     }
 
-    private boolean addressContainsEmailToMms(Conversation conv, String text, int subId) {
-        if (MmsConfig.getString(SmsManager.MMS_CONFIG_EMAIL_GATEWAY_NUMBER) != null) {
-            String[] dests = conv.getRecipients().getNumbers(subId);
+    private boolean addressContainsEmailToMms(Conversation conv, String text) {
+        if (MmsConfig.getEmailGateway() != null) {
+            String[] dests = conv.getRecipients().getNumbers();
             int length = dests.length;
             for (int i = 0; i < length; i++) {
-                if (Mms.isEmailAddress(dests[i]) || MessageUtils.isAlias(dests[i], subId)) {
+                if (Mms.isEmailAddress(dests[i]) || MessageUtils.isAlias(dests[i])) {
                     String mtext = dests[i] + " " + text;
                     int[] params = SmsMessage.calculateLength(mtext, false);
                     if (params[0] > 1) {
-                        updateState(RECIPIENTS_REQUIRE_MMS, true, true, subId);
+                        updateState(RECIPIENTS_REQUIRE_MMS, true, true);
                         ensureSlideshow();
                         syncTextToSlideshow();
                         return true;
@@ -1285,8 +1281,7 @@ public class WorkingMessage {
 
     // Message sending stuff
 
-    private void preSendSmsWorker(Conversation conv, String msgText, String recipientsInUI,
-            int subId) {
+    private void preSendSmsWorker(Conversation conv, String msgText, String recipientsInUI) {
         // If user tries to send the message, it's a signal the inputted text is what they wanted.
         UserHappinessSignals.userAcceptedImeText(mActivity);
 
@@ -1295,9 +1290,9 @@ public class WorkingMessage {
         long origThreadId = conv.getThreadId();
 
         // Make sure we are still using the correct thread ID for our recipient set.
-        long threadId = conv.ensureThreadId(subId);
+        long threadId = conv.ensureThreadId();
 
-        String semiSepRecipients = conv.getRecipients().serialize(subId);
+        String semiSepRecipients = conv.getRecipients().serialize();
 
         // recipientsInUI can be empty when the user types in a number and hits send
         if (LogTag.SEVERE_WARNING && ((origThreadId != 0 && origThreadId != threadId) ||
@@ -1314,24 +1309,24 @@ public class WorkingMessage {
                     semiSepRecipients + "\"";
 
             // Just interrupt the process of sending message if recipient mismatch
-            LogTag.warnPossibleRecipientMismatch(msg, mActivity, subId);
+            LogTag.warnPossibleRecipientMismatch(msg, mActivity);
         }else {
             // just do a regular send. We're already on a non-ui thread so no need to fire
             // off another thread to do this work.
-            sendSmsWorker(msgText, semiSepRecipients, threadId, subId);
+            sendSmsWorker(msgText, semiSepRecipients, threadId);
 
             // Be paranoid and clean any draft SMS up.
             deleteDraftSmsMessage(threadId);
         }
     }
 
-    private void sendSmsWorker(String msgText, String semiSepRecipients, long threadId, int subId) {
+    private void sendSmsWorker(String msgText, String semiSepRecipients, long threadId) {
         String[] dests = TextUtils.split(semiSepRecipients, ";");
         if (LogTag.VERBOSE || Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
             Log.d(LogTag.TRANSACTION, "sendSmsWorker sending message: recipients=" +
                     semiSepRecipients + ", threadId=" + threadId);
         }
-        MessageSender sender = new SmsMessageSender(mActivity, dests, msgText, threadId, subId);
+        MessageSender sender = new SmsMessageSender(mActivity, dests, msgText, threadId);
         try {
             sender.sendMessage(threadId);
 
@@ -1346,8 +1341,7 @@ public class WorkingMessage {
     }
 
     private void sendMmsWorker(Conversation conv, Uri mmsUri, PduPersister persister,
-            SlideshowModel slideshow,
-            SendReq sendReq, boolean textOnly, int subId) {
+            SlideshowModel slideshow, SendReq sendReq, boolean textOnly) {
         long threadId = 0;
         Cursor cursor = null;
         boolean newMessage = false;
@@ -1358,7 +1352,7 @@ public class WorkingMessage {
 
             // Make sure we are still using the correct thread ID for our
             // recipient set.
-            threadId = conv.ensureThreadId(subId);
+            threadId = conv.ensureThreadId();
 
             if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
                 LogTag.debug("sendMmsWorker: update draft MMS message " + mmsUri +
@@ -1366,14 +1360,12 @@ public class WorkingMessage {
             }
 
             // One last check to verify the address of the recipient.
-            String[] dests = conv.getRecipients().getNumbers(true /* scrub for MMS address */,
-                    subId);
+            String[] dests = conv.getRecipients().getNumbers(true /* scrub for MMS address */);
             if (dests.length == 1) {
                 // verify the single address matches what's in the database. If we get a different
                 // address back, jam the new value back into the SendReq.
                 String newAddress =
-                    Conversation.verifySingleRecipient(mActivity, conv.getThreadId(), dests[0],
-                            subId);
+                    Conversation.verifySingleRecipient(mActivity, conv.getThreadId(), dests[0]);
 
                 if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
                     LogTag.debug("sendMmsWorker: newAddress " + newAddress +
@@ -1398,7 +1390,6 @@ public class WorkingMessage {
                 values.put(Mms.MESSAGE_BOX, Mms.MESSAGE_BOX_OUTBOX);
                 values.put(Mms.THREAD_ID, threadId);
                 values.put(Mms.MESSAGE_TYPE, PduHeaders.MESSAGE_TYPE_SEND_REQ);
-                values.put(Telephony.BaseMmsColumns.SUB_ID, subId);
                 if (textOnly) {
                     values.put(Mms.TEXT_ONLY, 1);
                 }
@@ -1416,7 +1407,7 @@ public class WorkingMessage {
                     Mms.Outbox.CONTENT_URI, MMS_OUTBOX_PROJECTION, null, null, null);
             if (cursor != null) {
                 long maxMessageSize = MmsConfig.getMaxSizeScaleForPendingMmsAllowed() *
-                        MmsConfig.getInt(subId, SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE);
+                MmsConfig.getMaxMessageSize();
                 long totalPendingSize = 0;
                 while (cursor.moveToNext()) {
                     totalPendingSize += cursor.getLong(MMS_MESSAGE_SIZE_INDEX);
@@ -1424,7 +1415,7 @@ public class WorkingMessage {
                 if (totalPendingSize >= maxMessageSize) {
                     unDiscard();    // it wasn't successfully sent. Allow it to be saved as a draft.
                     mStatusListener.onMaxPendingMessagesReached();
-                    markMmsMessageWithError(mmsUri, subId);
+                    markMmsMessageWithError(mmsUri);
                     return;
                 }
             }
@@ -1438,7 +1429,7 @@ public class WorkingMessage {
             if (newMessage) {
                 // Create a new MMS message if one hasn't been made yet.
                 mmsUri = createDraftMmsMessage(persister, sendReq, slideshow, mmsUri,
-                        mActivity, null, subId);
+                        mActivity, null);
             } else {
                 // Otherwise, sync the MMS message in progress to disk.
                 updateDraftMmsMessage(mmsUri, persister, slideshow, sendReq, null);
@@ -1461,12 +1452,12 @@ public class WorkingMessage {
             error = UNKNOWN_ERROR;
         }
         if (error != 0) {
-            markMmsMessageWithError(mmsUri, subId);
+            markMmsMessageWithError(mmsUri);
             mStatusListener.onAttachmentError(error);
             return;
         }
         MessageSender sender = new MmsMessageSender(mActivity, mmsUri,
-                slideshow.getCurrentMessageSize(), subId);
+                slideshow.getCurrentMessageSize());
         try {
             if (!sender.sendMessage(threadId)) {
                 // The message was sent through SMS protocol, we should
@@ -1482,7 +1473,7 @@ public class WorkingMessage {
         MmsWidgetProvider.notifyDatasetChanged(mActivity);
     }
 
-    private void markMmsMessageWithError(Uri mmsUri, int subId) {
+    private void markMmsMessageWithError(Uri mmsUri) {
         try {
             PduPersister p = PduPersister.getPduPersister(mActivity);
             // Move the message into MMS Outbox. A trigger will create an entry in
@@ -1490,20 +1481,12 @@ public class WorkingMessage {
             p.move(mmsUri, Mms.Outbox.CONTENT_URI);
 
             // Now update the pending_msgs table with an error for that new item.
-            ContentValues values = new ContentValues(2);
+            ContentValues values = new ContentValues(1);
             values.put(PendingMessages.ERROR_TYPE, MmsSms.ERR_TYPE_GENERIC_PERMANENT);
-            values.put(PendingMessages.SUB_ID, subId);
             long msgId = ContentUris.parseId(mmsUri);
             SqliteWrapper.update(mActivity, mContentResolver,
                     PendingMessages.CONTENT_URI,
                     values, PendingMessages.MSG_ID + "=" + msgId, null);
-
-            // update subId into pdu table. ComposeMessageActivity need show out the subId of
-            // this message item.
-            // TODO remove updating subId of Mms after refactor
-            ContentValues valuePduTable = new ContentValues(1);
-            valuePduTable.put(Telephony.BaseMmsColumns.SUB_ID, subId);
-            SqliteWrapper.update(mActivity, mContentResolver, mmsUri, valuePduTable, null, null);
         } catch (MmsException e) {
             // Not much we can do here. If the p.move throws an exception, we'll just
             // leave the message in the draft box.
@@ -1564,9 +1547,8 @@ public class WorkingMessage {
      * makeSendReq should always return a non-null SendReq, whether the dest addresses are
      * valid or not.
      */
-    private static SendReq makeSendReq(Conversation conv, CharSequence subject, int subId) {
-        String[] dests = conv.getRecipients().getNumbers(true /* scrub for MMS address */,
-                subId);
+    private static SendReq makeSendReq(Conversation conv, CharSequence subject) {
+        String[] dests = conv.getRecipients().getNumbers(true /* scrub for MMS address */);
 
         SendReq req = new SendReq();
         EncodedStringValue[] encodedNumbers = EncodedStringValue.encodeStrings(dests);
@@ -1585,7 +1567,7 @@ public class WorkingMessage {
 
     private static Uri createDraftMmsMessage(PduPersister persister, SendReq sendReq,
             SlideshowModel slideshow, Uri preUri, Context context,
-            HashMap<Uri, InputStream> preOpenedFiles, int subId) {
+            HashMap<Uri, InputStream> preOpenedFiles) {
         if (slideshow == null) {
             return null;
         }
@@ -1593,17 +1575,19 @@ public class WorkingMessage {
             PduBody pb = slideshow.toPduBody();
             sendReq.setBody(pb);
             Uri res = persister.persist(sendReq, preUri == null ? Mms.Draft.CONTENT_URI : preUri,
-                    true, MessagingPreferenceActivity.getIsGroupMmsEnabled(context, subId),
+                    true, MessagingPreferenceActivity.getIsGroupMmsEnabled(context),
                     preOpenedFiles);
             slideshow.sync(pb);
             return res;
         } catch (MmsException e) {
             return null;
+        } catch (IllegalStateException e) {
+            Log.e(TAG,"failed to create draft mms "+ e);
+            return null;
         }
     }
 
-    private void asyncUpdateDraftMmsMessage(final Conversation conv, final boolean isStopping,
-            final int subId) {
+    private void asyncUpdateDraftMmsMessage(final Conversation conv, final boolean isStopping) {
         if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
             LogTag.debug("asyncUpdateDraftMmsMessage conv=%s mMessageUri=%s", conv, mMessageUri);
         }
@@ -1617,16 +1601,16 @@ public class WorkingMessage {
                     DraftCache.getInstance().setSavingDraft(true);
 
                     final PduPersister persister = PduPersister.getPduPersister(mActivity);
-                    final SendReq sendReq = makeSendReq(conv, mSubject, subId);
+                    final SendReq sendReq = makeSendReq(conv, mSubject);
 
                     if (mMessageUri == null) {
                         mMessageUri = createDraftMmsMessage(persister, sendReq, mSlideshow, null,
-                                mActivity, preOpenedFiles, subId);
+                                mActivity, preOpenedFiles);
                     } else {
                         updateDraftMmsMessage(mMessageUri, persister, mSlideshow, sendReq,
                                 preOpenedFiles);
                     }
-                    ensureThreadIdIfNeeded(conv, isStopping, subId);
+                    ensureThreadIdIfNeeded(conv, isStopping);
                     conv.setDraftState(true);
                     if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
                         LogTag.debug("asyncUpdateDraftMmsMessage conv: " + conv +
@@ -1747,7 +1731,7 @@ public class WorkingMessage {
     }
 
     private void asyncUpdateDraftSmsMessage(final Conversation conv, final String contents,
-            final boolean isStopping, final int subId) {
+            final boolean isStopping) {
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -1759,7 +1743,7 @@ public class WorkingMessage {
                         }
                         return;
                     }
-                    ensureThreadIdIfNeeded(conv, isStopping, subId);
+                    ensureThreadIdIfNeeded(conv, isStopping);
                     conv.setDraftState(true);
                     updateDraftSmsMessage(conv, contents);
                 } finally {
@@ -1832,10 +1816,8 @@ public class WorkingMessage {
      * one.
      * @param conv The conversation we are in.
      * @param isStopping Whether we are saving the draft in CMA'a onStop
-     * @param subId subscription id
      */
-    private void ensureThreadIdIfNeeded(final Conversation conv, final boolean isStopping,
-            int subId) {
+    private void ensureThreadIdIfNeeded(final Conversation conv, final boolean isStopping) {
         if (isStopping && conv.getMessageCount() == 0) {
             // We need to save the drafts in an unorphaned thread id. When the user goes
             // back to ConversationList while we're saving a draft from CMA's.onStop,
@@ -1846,7 +1828,7 @@ public class WorkingMessage {
             conv.clearThreadId();   // force us to get the updated thread id
         }
         if (!conv.getRecipients().isEmpty()) {
-            conv.ensureThreadId(subId);
+            conv.ensureThreadId();
         }
     }
 }
diff --git a/src/com/android/mms/dom/events/EventTargetImpl.java b/src/com/android/mms/dom/events/EventTargetImpl.java
index 3bba0767..6078fed0 100644
--- a/src/com/android/mms/dom/events/EventTargetImpl.java
+++ b/src/com/android/mms/dom/events/EventTargetImpl.java
@@ -17,6 +17,8 @@
 
 package com.android.mms.dom.events;
 
+import com.android.mms.LogTag;
+
 import java.util.ArrayList;
 
 import org.w3c.dom.events.Event;
@@ -26,8 +28,6 @@ import org.w3c.dom.events.EventTarget;
 
 import android.util.Log;
 
-import com.android.mms.LogTag;
-
 public class EventTargetImpl implements EventTarget {
     private static final String TAG = LogTag.TAG;
     private ArrayList<EventListenerEntry> mListenerEntries;
diff --git a/src/com/android/mms/dom/smil/ElementTimeImpl.java b/src/com/android/mms/dom/smil/ElementTimeImpl.java
index fe57b9bd..73004f92 100644
--- a/src/com/android/mms/dom/smil/ElementTimeImpl.java
+++ b/src/com/android/mms/dom/smil/ElementTimeImpl.java
@@ -17,6 +17,8 @@
 
 package com.android.mms.dom.smil;
 
+import com.android.mms.LogTag;
+
 import java.util.ArrayList;
 
 import org.w3c.dom.DOMException;
@@ -27,8 +29,6 @@ import org.w3c.dom.smil.TimeList;
 
 import android.util.Log;
 
-import com.android.mms.LogTag;
-
 public abstract class ElementTimeImpl implements ElementTime {
     private static final String TAG = LogTag.TAG;
 
diff --git a/src/com/android/mms/dom/smil/SmilPlayer.java b/src/com/android/mms/dom/smil/SmilPlayer.java
index 5e7dfcea..fdab7405 100644
--- a/src/com/android/mms/dom/smil/SmilPlayer.java
+++ b/src/com/android/mms/dom/smil/SmilPlayer.java
@@ -17,6 +17,8 @@
 
 package com.android.mms.dom.smil;
 
+import com.android.mms.LogTag;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -34,8 +36,6 @@ import org.w3c.dom.smil.TimeList;
 
 import android.util.Log;
 
-import com.android.mms.LogTag;
-
 /**
  * The SmilPlayer is responsible for playing, stopping, pausing and resuming a SMIL tree.
  * <li>It creates a whole timeline before playing.</li>
@@ -384,8 +384,7 @@ public class SmilPlayer implements Runnable {
         mActiveElements.clear();
         beginSmilDocument();
 
-        int size = mAllEntries.size();
-        for (int i = mCurrentSlide; i < mCurrentElement && i < size; i++) {
+        for (int i = mCurrentSlide; i < mCurrentElement; i++) {
             TimelineEntry entry = mAllEntries.get(i);
             actionEntry(entry);
         }
@@ -398,8 +397,7 @@ public class SmilPlayer implements Runnable {
     }
 
     private synchronized double getOffsetTime(ElementTime element) {
-        int size = mAllEntries.size();
-        for (int i = mCurrentSlide; i < mCurrentElement && i < size; i++) {
+        for (int i = mCurrentSlide; i < mCurrentElement; i++) {
             TimelineEntry entry = mAllEntries.get(i);
             if (element.equals(entry.getElement())) {
                 return entry.getOffsetTime() * 1000;  // in ms
diff --git a/src/com/android/mms/dom/smil/SmilRegionElementImpl.java b/src/com/android/mms/dom/smil/SmilRegionElementImpl.java
index 89a1001a..701bee16 100644
--- a/src/com/android/mms/dom/smil/SmilRegionElementImpl.java
+++ b/src/com/android/mms/dom/smil/SmilRegionElementImpl.java
@@ -17,14 +17,14 @@
 
 package com.android.mms.dom.smil;
 
+import com.android.mms.LogTag;
+
 import org.w3c.dom.DOMException;
 import org.w3c.dom.smil.SMILDocument;
 import org.w3c.dom.smil.SMILRegionElement;
 
 import android.util.Log;
 
-import com.android.mms.LogTag;
-
 public class SmilRegionElementImpl extends SmilElementImpl implements
         SMILRegionElement {
 
diff --git a/src/com/android/mms/exif/ExifData.java b/src/com/android/mms/exif/ExifData.java
index ad799995..d8c5ef43 100644
--- a/src/com/android/mms/exif/ExifData.java
+++ b/src/com/android/mms/exif/ExifData.java
@@ -16,10 +16,10 @@
 
 package com.android.mms.exif;
 
-import android.util.Log;
-
 import com.android.mms.LogTag;
 
+import android.util.Log;
+
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteOrder;
 import java.util.ArrayList;
diff --git a/src/com/android/mms/exif/ExifModifier.java b/src/com/android/mms/exif/ExifModifier.java
index 2f6ce21e..7204805b 100644
--- a/src/com/android/mms/exif/ExifModifier.java
+++ b/src/com/android/mms/exif/ExifModifier.java
@@ -16,10 +16,10 @@
 
 package com.android.mms.exif;
 
-import android.util.Log;
-
 import com.android.mms.LogTag;
 
+import android.util.Log;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
diff --git a/src/com/android/mms/exif/ExifOutputStream.java b/src/com/android/mms/exif/ExifOutputStream.java
index 7ef183b8..669c02bb 100644
--- a/src/com/android/mms/exif/ExifOutputStream.java
+++ b/src/com/android/mms/exif/ExifOutputStream.java
@@ -16,10 +16,10 @@
 
 package com.android.mms.exif;
 
-import android.util.Log;
-
 import com.android.mms.LogTag;
 
+import android.util.Log;
+
 import java.io.BufferedOutputStream;
 import java.io.FilterOutputStream;
 import java.io.IOException;
diff --git a/src/com/android/mms/exif/ExifParser.java b/src/com/android/mms/exif/ExifParser.java
index 4342b3b1..7779a298 100644
--- a/src/com/android/mms/exif/ExifParser.java
+++ b/src/com/android/mms/exif/ExifParser.java
@@ -16,10 +16,10 @@
 
 package com.android.mms.exif;
 
-import android.util.Log;
-
 import com.android.mms.LogTag;
 
+import android.util.Log;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteOrder;
diff --git a/src/com/android/mms/exif/ExifReader.java b/src/com/android/mms/exif/ExifReader.java
index 7f867648..f2045941 100644
--- a/src/com/android/mms/exif/ExifReader.java
+++ b/src/com/android/mms/exif/ExifReader.java
@@ -16,10 +16,10 @@
 
 package com.android.mms.exif;
 
-import android.util.Log;
-
 import com.android.mms.LogTag;
 
+import android.util.Log;
+
 import java.io.IOException;
 import java.io.InputStream;
 
diff --git a/src/com/android/mms/layout/HVGALayoutParameters.java b/src/com/android/mms/layout/HVGALayoutParameters.java
index 4d9092c7..d3b58a41 100644
--- a/src/com/android/mms/layout/HVGALayoutParameters.java
+++ b/src/com/android/mms/layout/HVGALayoutParameters.java
@@ -17,11 +17,11 @@
 
 package com.android.mms.layout;
 
+import com.android.mms.LogTag;
+
 import android.content.Context;
 import android.util.Log;
 
-import com.android.mms.LogTag;
-
 public class HVGALayoutParameters implements LayoutParameters {
     private static final String TAG = LogTag.TAG;
     private static final boolean DEBUG = false;
diff --git a/src/com/android/mms/layout/LayoutManager.java b/src/com/android/mms/layout/LayoutManager.java
index e1eed0b2..999be9b2 100644
--- a/src/com/android/mms/layout/LayoutManager.java
+++ b/src/com/android/mms/layout/LayoutManager.java
@@ -17,12 +17,12 @@
 
 package com.android.mms.layout;
 
+import com.android.mms.LogTag;
+
 import android.content.Context;
 import android.content.res.Configuration;
 import android.util.Log;
 
-import com.android.mms.LogTag;
-
 /**
  * MMS presentation layout management.
  */
diff --git a/src/com/android/mms/model/CarrierContentRestriction.java b/src/com/android/mms/model/CarrierContentRestriction.java
index b17afef0..2d167451 100644
--- a/src/com/android/mms/model/CarrierContentRestriction.java
+++ b/src/com/android/mms/model/CarrierContentRestriction.java
@@ -19,7 +19,6 @@ package com.android.mms.model;
 import java.util.ArrayList;
 
 import android.content.ContentResolver;
-import android.telephony.SmsManager;
 import android.util.Log;
 
 import com.android.mms.ContentRestrictionException;
@@ -28,7 +27,6 @@ import com.android.mms.LogTag;
 import com.android.mms.MmsConfig;
 import com.android.mms.ResolutionException;
 import com.android.mms.UnsupportContentTypeException;
-
 import com.google.android.mms.ContentType;
 
 public class CarrierContentRestriction implements ContentRestriction {
@@ -51,8 +49,7 @@ public class CarrierContentRestriction implements ContentRestriction {
         if (DEBUG) {
             Log.d(LogTag.APP, "CarrierContentRestriction.checkMessageSize messageSize: " +
                         messageSize + " increaseSize: " + increaseSize +
-                        " MmsConfig.getMaxMessageSize: " +
-                        MmsConfig.getInt(SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE));
+                        " MmsConfig.getMaxMessageSize: " + MmsConfig.getMaxMessageSize());
         }
         if ( (messageSize < 0) || (increaseSize < 0) ) {
             throw new ContentRestrictionException("Negative message size"
@@ -60,15 +57,13 @@ public class CarrierContentRestriction implements ContentRestriction {
         }
         int newSize = messageSize + increaseSize;
 
-        if ( (newSize < 0) ||
-                (newSize > MmsConfig.getInt(SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE)) ) {
+        if ( (newSize < 0) || (newSize > MmsConfig.getMaxMessageSize()) ) {
             throw new ExceedMessageSizeException("Exceed message size limitation");
         }
     }
 
     public void checkResolution(int width, int height) throws ContentRestrictionException {
-        if ( (width > MmsConfig.getInt(SmsManager.MMS_CONFIG_MAX_IMAGE_WIDTH) ||
-                (height > MmsConfig.getInt(SmsManager.MMS_CONFIG_MAX_IMAGE_HEIGHT))) ) {
+        if ( (width > MmsConfig.getMaxImageWidth()) || (height > MmsConfig.getMaxImageHeight()) ) {
             throw new ResolutionException("content resolution exceeds restriction.");
         }
     }
diff --git a/src/com/android/mms/model/ImageModel.java b/src/com/android/mms/model/ImageModel.java
index ac713adf..3dcc649c 100644
--- a/src/com/android/mms/model/ImageModel.java
+++ b/src/com/android/mms/model/ImageModel.java
@@ -29,7 +29,6 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
-import android.telephony.SmsManager;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -43,7 +42,6 @@ import com.android.mms.ui.UriImage;
 import com.android.mms.util.ItemLoadedCallback;
 import com.android.mms.util.ItemLoadedFuture;
 import com.android.mms.util.ThumbnailManager;
-
 import com.google.android.mms.MmsException;
 import com.google.android.mms.pdu.PduPart;
 import com.google.android.mms.pdu.PduPersister;
@@ -188,8 +186,8 @@ public class ImageModel extends RegionMediaModel {
     protected void resizeMedia(int byteLimit, long messageId) throws MmsException {
         UriImage image = new UriImage(mContext, getUri());
 
-        int widthLimit = MmsConfig.getInt(SmsManager.MMS_CONFIG_MAX_IMAGE_WIDTH);
-        int heightLimit = MmsConfig.getInt(SmsManager.MMS_CONFIG_MAX_IMAGE_HEIGHT);
+        int widthLimit = MmsConfig.getMaxImageWidth();
+        int heightLimit = MmsConfig.getMaxImageHeight();
         int size = getMediaSize();
         // In mms_config.xml, the max width has always been declared larger than the max height.
         // Swap the width and height limits if necessary so we scale the picture as little as
diff --git a/src/com/android/mms/model/MediaModel.java b/src/com/android/mms/model/MediaModel.java
index b2cb222c..2801c71c 100644
--- a/src/com/android/mms/model/MediaModel.java
+++ b/src/com/android/mms/model/MediaModel.java
@@ -28,9 +28,9 @@ import org.w3c.dom.events.EventListener;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.media.AudioManager;
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
-import android.telephony.SmsManager;
 import android.util.Log;
 
 import com.android.mms.LogTag;
@@ -42,8 +42,6 @@ import com.google.android.mms.MmsException;
 public abstract class MediaModel extends Model implements EventListener {
     protected static final String TAG = LogTag.TAG;
 
-    private final static String MUSIC_SERVICE_ACTION = "com.android.music.musicservicecommand";
-
     protected Context mContext;
     protected int mBegin;
     protected int mDuration;
@@ -243,10 +241,9 @@ public abstract class MediaModel extends Model implements EventListener {
                 // does below, but that turns out to be very slow. We'll deal with a zero size
                 // when we resize the media.
 
-                final int maxMessageSize = MmsConfig.getInt(SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE);
-                if (isVideo() && mSize > maxMessageSize) {
+                if (isVideo() && mSize > MmsConfig.getMaxMessageSize()) {
                     Log.w(TAG, "initMediaSize: Video size: f.getChannel().size(): " + mSize +
-                            " larger than max message size: " + maxMessageSize);
+                            " larger than max message size: " + MmsConfig.getMaxMessageSize());
                 }
             } else {
                 while (-1 != input.read()) {
@@ -300,9 +297,8 @@ public abstract class MediaModel extends Model implements EventListener {
             Log.d(TAG, "pauseMusicPlayer");
         }
 
-        Intent i = new Intent(MUSIC_SERVICE_ACTION);
-        i.putExtra("command", "pause");
-        mContext.sendBroadcast(i);
+        AudioManager am = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
+        am.requestAudioFocus(null, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
     }
 
     /**
diff --git a/src/com/android/mms/model/SlideModel.java b/src/com/android/mms/model/SlideModel.java
index ce39da88..8f70a309 100644
--- a/src/com/android/mms/model/SlideModel.java
+++ b/src/com/android/mms/model/SlideModel.java
@@ -34,7 +34,6 @@ import android.util.Log;
 import com.android.mms.ContentRestrictionException;
 import com.android.mms.LogTag;
 import com.android.mms.dom.smil.SmilParElementImpl;
-
 import com.google.android.mms.ContentType;
 
 public class SlideModel extends Model implements List<MediaModel>, EventListener {
diff --git a/src/com/android/mms/model/SlideshowModel.java b/src/com/android/mms/model/SlideshowModel.java
index dc512046..15259d35 100755
--- a/src/com/android/mms/model/SlideshowModel.java
+++ b/src/com/android/mms/model/SlideshowModel.java
@@ -43,7 +43,6 @@ import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.Context;
 import android.net.Uri;
-import android.telephony.SmsManager;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -53,7 +52,6 @@ import com.android.mms.LogTag;
 import com.android.mms.MmsConfig;
 import com.android.mms.dom.smil.parser.SmilXmlSerializer;
 import com.android.mms.layout.LayoutManager;
-
 import com.google.android.mms.ContentType;
 import com.google.android.mms.MmsException;
 import com.google.android.mms.pdu.GenericPdu;
@@ -62,7 +60,6 @@ import com.google.android.mms.pdu.PduBody;
 import com.google.android.mms.pdu.PduHeaders;
 import com.google.android.mms.pdu.PduPart;
 import com.google.android.mms.pdu.PduPersister;
-
 import com.android.mms.UnsupportContentTypeException;
 
 public class SlideshowModel extends Model
@@ -681,14 +678,13 @@ public class SlideshowModel extends Model
                 }
             }
         }
-        final int maxMessageSize = MmsConfig.getInt(SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE);
         if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
             Log.v(TAG, "finalResize: original message size: " + getCurrentMessageSize() +
-                    " getMaxMessageSize: " + maxMessageSize +
+                    " getMaxMessageSize: " + MmsConfig.getMaxMessageSize() +
                     " fixedSizeTotal: " + fixedSizeTotal);
         }
         if (resizableCnt > 0) {
-            int remainingSize = maxMessageSize - fixedSizeTotal - SLIDESHOW_SLOP;
+            int remainingSize = MmsConfig.getMaxMessageSize() - fixedSizeTotal - SLIDESHOW_SLOP;
             if (remainingSize <= 0) {
                 throw new ExceedMessageSizeException("No room for pictures");
             }
@@ -713,7 +709,7 @@ public class SlideshowModel extends Model
                 Log.v(TAG, "finalResize: new message size: " + totalSize);
             }
 
-            if (totalSize > maxMessageSize) {
+            if (totalSize > MmsConfig.getMaxMessageSize()) {
                 throw new ExceedMessageSizeException("After compressing pictures, message too big");
             }
             setCurrentMessageSize(totalSize);
diff --git a/src/com/android/mms/model/SmilHelper.java b/src/com/android/mms/model/SmilHelper.java
index db687faf..1e63bb40 100644
--- a/src/com/android/mms/model/SmilHelper.java
+++ b/src/com/android/mms/model/SmilHelper.java
@@ -51,7 +51,6 @@ import com.android.mms.MmsApp;
 import com.android.mms.dom.smil.SmilDocumentImpl;
 import com.android.mms.dom.smil.parser.SmilXmlParser;
 import com.android.mms.dom.smil.parser.SmilXmlSerializer;
-
 import com.google.android.mms.ContentType;
 import com.google.android.mms.MmsException;
 import com.google.android.mms.pdu.PduBody;
diff --git a/src/com/android/mms/model/TextModel.java b/src/com/android/mms/model/TextModel.java
index 00239ee1..21ff809c 100644
--- a/src/com/android/mms/model/TextModel.java
+++ b/src/com/android/mms/model/TextModel.java
@@ -27,7 +27,6 @@ import android.util.Log;
 
 import com.android.mms.LogTag;
 import com.android.mms.dom.smil.SmilMediaElementImpl;
-
 import com.google.android.mms.pdu.CharacterSets;
 
 public class TextModel extends RegionMediaModel {
diff --git a/src/com/android/mms/model/VideoModel.java b/src/com/android/mms/model/VideoModel.java
index a71e455d..52b8b3d4 100644..100755
--- a/src/com/android/mms/model/VideoModel.java
+++ b/src/com/android/mms/model/VideoModel.java
@@ -38,6 +38,7 @@ import com.android.mms.dom.smil.SmilMediaElementImpl;
 import com.android.mms.util.ItemLoadedCallback;
 import com.android.mms.util.ItemLoadedFuture;
 import com.android.mms.util.ThumbnailManager;
+import android.provider.Telephony.Mms.Part;
 import com.google.android.mms.ContentType;
 import com.google.android.mms.MmsException;
 
@@ -110,8 +111,13 @@ public class VideoModel extends RegionMediaModel {
                         path = uri.toString();
                     }
                     mSrc = path.substring(path.lastIndexOf('/') + 1);
-                    mContentType = c.getString(c.getColumnIndexOrThrow(
-                            Images.Media.MIME_TYPE));
+                    if (VideoModel.isMmsUri(uri)) {
+                        mContentType = c.getString(c.getColumnIndexOrThrow(
+                                Part.CONTENT_TYPE));
+                    } else {
+                        mContentType = c.getString(c.getColumnIndexOrThrow(
+                                Images.Media.MIME_TYPE));
+                    }
                     if (TextUtils.isEmpty(mContentType)) {
                         throw new MmsException("Type of media is unknown.");
                     }
diff --git a/src/com/android/mms/transaction/DefaultRetryScheme.java b/src/com/android/mms/transaction/DefaultRetryScheme.java
index 8b431593..2b9be2d3 100644
--- a/src/com/android/mms/transaction/DefaultRetryScheme.java
+++ b/src/com/android/mms/transaction/DefaultRetryScheme.java
@@ -17,12 +17,12 @@
 
 package com.android.mms.transaction;
 
+import com.android.mms.LogTag;
+
 import android.content.Context;
 import android.util.Config;
 import android.util.Log;
 
-import com.android.mms.LogTag;
-
 /**
  * Default retry scheme, based on specs.
  */
diff --git a/src/com/android/mms/transaction/HttpUtils.java b/src/com/android/mms/transaction/HttpUtils.java
index 4f601cd5..b6c878c7 100644
--- a/src/com/android/mms/transaction/HttpUtils.java
+++ b/src/com/android/mms/transaction/HttpUtils.java
@@ -23,8 +23,6 @@ import java.net.SocketException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
@@ -40,8 +38,9 @@ import org.apache.http.params.HttpProtocolParams;
 
 import android.content.Context;
 import android.net.http.AndroidHttpClient;
-import android.telephony.SmsManager;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
+import android.util.Config;
 import android.util.Log;
 
 import com.android.mms.LogTag;
@@ -51,6 +50,7 @@ public class HttpUtils {
     private static final String TAG = LogTag.TRANSACTION;
 
     private static final boolean DEBUG = false;
+    private static final boolean LOCAL_LOGV = DEBUG ? Config.LOGD : Config.LOGV;
 
     public static final int HTTP_POST_METHOD = 1;
     public static final int HTTP_GET_METHOD = 2;
@@ -93,7 +93,7 @@ public class HttpUtils {
      */
     protected static byte[] httpConnection(Context context, long token,
             String url, byte[] pdu, int method, boolean isProxySet,
-            String proxyHost, int proxyPort, int subId) throws IOException {
+            String proxyHost, int proxyPort) throws IOException {
         if (url == null) {
             throw new IllegalArgumentException("URL must not be null.");
         }
@@ -121,7 +121,7 @@ public class HttpUtils {
                     hostUrl.getHost(), hostUrl.getPort(),
                     HttpHost.DEFAULT_SCHEME_NAME);
 
-            client = createHttpClient(context, subId);
+            client = createHttpClient(context);
             HttpRequest req = null;
             switch(method) {
                 case HTTP_POST_METHOD:
@@ -155,10 +155,8 @@ public class HttpUtils {
             // Set necessary HTTP headers for MMS transmission.
             req.addHeader(HDR_KEY_ACCEPT, HDR_VALUE_ACCEPT);
             {
-                String xWapProfileTagName =
-                        MmsConfig.getString(subId, SmsManager.MMS_CONFIG_UA_PROF_TAG_NAME);
-                String xWapProfileUrl =
-                        MmsConfig.getString(subId, SmsManager.MMS_CONFIG_UA_PROF_URL);
+                String xWapProfileTagName = MmsConfig.getUaProfTagName();
+                String xWapProfileUrl = MmsConfig.getUaProfUrl();
 
                 if (xWapProfileUrl != null) {
                     if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
@@ -173,19 +171,26 @@ public class HttpUtils {
             // Separate each pair by the first occurrence of ':' to obtain a name and
             // value. Replace the occurrence of the string returned by
             // MmsConfig.getHttpParamsLine1Key() with the users telephone number inside
-            // the value. And replace the occurrence of the string returned by
-            // MmsConfig.getHttpParamsNaiKey() with the users NAI(Network Access Identifier)
-            // inside the value.
-            String extraHttpParams = MmsConfig.getString(subId, SmsManager.MMS_CONFIG_HTTP_PARAMS);
+            // the value.
+            String extraHttpParams = MmsConfig.getHttpParams();
 
             if (extraHttpParams != null) {
-                // Parse the parameter list
+                String line1Number = ((TelephonyManager)context
+                        .getSystemService(Context.TELEPHONY_SERVICE))
+                        .getLine1Number();
+                String line1Key = MmsConfig.getHttpParamsLine1Key();
                 String paramList[] = extraHttpParams.split("\\|");
+
                 for (String paramPair : paramList) {
                     String splitPair[] = paramPair.split(":", 2);
+
                     if (splitPair.length == 2) {
-                        final String name = splitPair[0].trim();
-                        final String value = resolveMacro(splitPair[1].trim(), subId);
+                        String name = splitPair[0].trim();
+                        String value = splitPair[1].trim();
+
+                        if (line1Key != null) {
+                            value = value.replace(line1Key, line1Number);
+                        }
                         if (!TextUtils.isEmpty(name) && !TextUtils.isEmpty(value)) {
                             req.addHeader(name, value);
                         }
@@ -219,8 +224,7 @@ public class HttpUtils {
                     }
                     if (entity.isChunked()) {
                         Log.v(TAG, "httpConnection: transfer encoding is chunked");
-                        int bytesTobeRead =
-                                MmsConfig.getInt(subId, SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE);
+                        int bytesTobeRead = MmsConfig.getMaxMessageSize();
                         byte[] tempBody = new byte[bytesTobeRead];
                         DataInputStream dis = new DataInputStream(entity.getContent());
                         try {
@@ -294,14 +298,14 @@ public class HttpUtils {
         throw e;
     }
 
-    private static AndroidHttpClient createHttpClient(Context context, int subId) {
-        String userAgent = MmsConfig.getString(subId, SmsManager.MMS_CONFIG_USER_AGENT);
+    private static AndroidHttpClient createHttpClient(Context context) {
+        String userAgent = MmsConfig.getUserAgent();
         AndroidHttpClient client = AndroidHttpClient.newInstance(userAgent, context);
         HttpParams params = client.getParams();
         HttpProtocolParams.setContentCharset(params, "UTF-8");
 
         // set the socket timeout
-        int soTimeout = MmsConfig.getInt(SmsManager.MMS_CONFIG_HTTP_SOCKET_TIMEOUT);
+        int soTimeout = MmsConfig.getHttpSocketTimeout();
 
         if (Log.isLoggable(LogTag.TRANSACTION, Log.DEBUG)) {
             Log.d(TAG, "[HttpUtils] createHttpClient w/ socket timeout " + soTimeout + " ms, "
@@ -366,42 +370,4 @@ public class HttpUtils {
             }
         }
     }
-
-    private static final Pattern MACRO_P = Pattern.compile("##(\\S+)##");
-    /**
-     * Resolve the macro in HTTP param value text
-     * For example, "something##LINE1##something" is resolved to "something9139531419something"
-     *
-     * @param value The HTTP param value possibly containing macros
-     * @return The HTTP param with macro resolved to real value
-     */
-    private static String resolveMacro(String value, int subId) {
-        if (TextUtils.isEmpty(value)) {
-            return value;
-        }
-        final Matcher matcher = MACRO_P.matcher(value);
-        int nextStart = 0;
-        StringBuilder replaced = null;
-        while (matcher.find()) {
-            if (replaced == null) {
-                replaced = new StringBuilder();
-            }
-            final int matchedStart = matcher.start();
-            if (matchedStart > nextStart) {
-                replaced.append(value.substring(nextStart, matchedStart));
-            }
-            final String macro = matcher.group(1);
-            final String macroValue = MmsConfig.getHttpParamMacro(macro, subId);
-            if (macroValue != null) {
-                replaced.append(macroValue);
-            } else {
-                Log.w(TAG, "HttpUtils: invalid macro " + macro);
-            }
-            nextStart = matcher.end();
-        }
-        if (replaced != null && nextStart < value.length()) {
-            replaced.append(value.substring(nextStart));
-        }
-        return replaced == null ? value : replaced.toString();
-    }
 }
diff --git a/src/com/android/mms/transaction/MessageStatusService.java b/src/com/android/mms/transaction/MessageStatusService.java
index c7253395..35a500a9 100644
--- a/src/com/android/mms/transaction/MessageStatusService.java
+++ b/src/com/android/mms/transaction/MessageStatusService.java
@@ -52,7 +52,7 @@ public class MessageStatusService extends IntentService {
 
     @Override
     protected void onHandleIntent(Intent intent) {
-        if (!MmsConfig.isSmsEnabled()) {
+        if (!MmsConfig.isSmsEnabled(this)) {
             Log.d(LOG_TAG, "MessageStatusService: is not the default sms app");
             return;
         }
@@ -67,7 +67,7 @@ public class MessageStatusService extends IntentService {
         // Called on a background thread, so it's OK to block.
         if (message != null && message.getStatus() < Sms.STATUS_PENDING) {
             MessagingNotification.blockingUpdateNewMessageIndicator(this,
-                    MessagingNotification.THREAD_NONE, message.isStatusReportMessage(), messageUri);
+                    MessagingNotification.THREAD_NONE, message.isStatusReportMessage());
         }
     }
 
diff --git a/src/com/android/mms/transaction/MessagingNotification.java b/src/com/android/mms/transaction/MessagingNotification.java
index dfa6cc63..d925cf74 100644
--- a/src/com/android/mms/transaction/MessagingNotification.java
+++ b/src/com/android/mms/transaction/MessagingNotification.java
@@ -104,11 +104,11 @@ public class MessagingNotification {
 
     // This must be consistent with the column constants below.
     private static final String[] MMS_STATUS_PROJECTION = new String[] {
-        Mms.THREAD_ID, Mms.DATE, Mms._ID, Mms.SUBJECT, Mms.SUBJECT_CHARSET, Mms.SUB_ID };
+        Mms.THREAD_ID, Mms.DATE, Mms._ID, Mms.SUBJECT, Mms.SUBJECT_CHARSET };
 
     // This must be consistent with the column constants below.
     private static final String[] SMS_STATUS_PROJECTION = new String[] {
-        Sms.THREAD_ID, Sms.DATE, Sms.ADDRESS, Sms.SUBJECT, Sms.BODY, Sms.SUB_ID };
+        Sms.THREAD_ID, Sms.DATE, Sms.ADDRESS, Sms.SUBJECT, Sms.BODY };
 
     // These must be consistent with MMS_STATUS_PROJECTION and
     // SMS_STATUS_PROJECTION.
@@ -119,7 +119,6 @@ public class MessagingNotification {
     private static final int COLUMN_SUBJECT     = 3;
     private static final int COLUMN_SUBJECT_CS  = 4;
     private static final int COLUMN_SMS_BODY    = 4;
-    private static final int COLUMN_SUB_ID      = 5;
 
     private static final String[] SMS_THREAD_ID_PROJECTION = new String[] { Sms.THREAD_ID };
     private static final String[] MMS_THREAD_ID_PROJECTION = new String[] { Mms.THREAD_ID };
@@ -231,7 +230,7 @@ public class MessagingNotification {
         new Thread(new Runnable() {
             @Override
             public void run() {
-                blockingUpdateNewMessageIndicator(context, newMsgThreadId, isStatusMessage, null);
+                blockingUpdateNewMessageIndicator(context, newMsgThreadId, isStatusMessage);
             }
         }, "MessagingNotification.nonBlockingUpdateNewMessageIndicator").start();
     }
@@ -245,15 +244,14 @@ public class MessagingNotification {
      *  no new message, use THREAD_NONE. If we should notify about multiple or unknown thread IDs,
      *  use THREAD_ALL.
      * @param isStatusMessage
-     * @param statusMessageUri Specify uri of statusMessage for showing delivery toast.
      */
     public static void blockingUpdateNewMessageIndicator(Context context, long newMsgThreadId,
-            boolean isStatusMessage, Uri statusMessageUri) {
+            boolean isStatusMessage) {
         if (DEBUG) {
             Contact.logWithTrace(TAG, "blockingUpdateNewMessageIndicator: newMsgThreadId: " +
                     newMsgThreadId);
         }
-        final boolean isDefaultSmsApp = MmsConfig.isSmsEnabled();
+        final boolean isDefaultSmsApp = MmsConfig.isSmsEnabled(context);
         if (!isDefaultSmsApp) {
             cancelNotification(context, NOTIFICATION_ID);
             if (DEBUG || Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
@@ -302,7 +300,7 @@ public class MessagingNotification {
 
         // And deals with delivery reports (which use Toasts). It's safe to call in a worker
         // thread because the toast will eventually get posted to a handler.
-        MmsSmsDeliveryInfo delivery = getSmsNewDeliveryInfo(context, statusMessageUri);
+        MmsSmsDeliveryInfo delivery = getSmsNewDeliveryInfo(context);
         if (delivery != null) {
             delivery.deliver(context, isStatusMessage);
         }
@@ -595,9 +593,8 @@ public class MessagingNotification {
                 Uri msgUri = Mms.CONTENT_URI.buildUpon().appendPath(
                         Long.toString(msgId)).build();
                 String address = AddressUtils.getFrom(context, msgUri);
-                int subId = cursor.getInt(COLUMN_SUB_ID);
 
-                Contact contact = Contact.get(address, false, subId);
+                Contact contact = Contact.get(address, false);
                 if (contact.getSendToVoicemail()) {
                     // don't notify, skip this one
                     continue;
@@ -649,8 +646,7 @@ public class MessagingNotification {
                         timeMillis,
                         attachedPicture,
                         contact,
-                        attachmentType,
-                        subId);
+                        attachmentType);
 
                 notificationSet.add(info);
 
@@ -686,16 +682,9 @@ public class MessagingNotification {
         return (int) (dip * sScreenDensity + 0.5f);
     }
 
-    private static final MmsSmsDeliveryInfo getSmsNewDeliveryInfo(
-            Context context,
-            Uri statusMessageUri) {
-        // Using statusMessageUri can avoid showing wrong number in toast when
-        // multi delivery report coming at the same time
-        if (statusMessageUri == null) {
-            statusMessageUri = Sms.CONTENT_URI;
-        }
+    private static final MmsSmsDeliveryInfo getSmsNewDeliveryInfo(Context context) {
         ContentResolver resolver = context.getContentResolver();
-        Cursor cursor = SqliteWrapper.query(context, resolver, statusMessageUri,
+        Cursor cursor = SqliteWrapper.query(context, resolver, Sms.CONTENT_URI,
                     SMS_STATUS_PROJECTION, NEW_DELIVERY_SM_CONSTRAINT,
                     null, Sms.DATE);
 
@@ -710,9 +699,8 @@ public class MessagingNotification {
 
             String address = cursor.getString(COLUMN_SMS_ADDRESS);
             long timeMillis = 3000;
-            int subId = cursor.getInt(COLUMN_SUB_ID);
 
-            Contact contact = Contact.get(address, false, subId);
+            Contact contact = Contact.get(address, false);
             String name = contact.getNameAndNumber();
 
             return new MmsSmsDeliveryInfo(context.getString(R.string.delivery_toast_body, name),
@@ -737,9 +725,8 @@ public class MessagingNotification {
         try {
             while (cursor.moveToNext()) {
                 String address = cursor.getString(COLUMN_SMS_ADDRESS);
-                int subId = cursor.getInt(COLUMN_SUB_ID);
 
-                Contact contact = Contact.get(address, false, subId);
+                Contact contact = Contact.get(address, false);
                 if (contact.getSendToVoicemail()) {
                     // don't notify, skip this one
                     continue;
@@ -759,7 +746,7 @@ public class MessagingNotification {
                 NotificationInfo info = getNewMessageNotificationInfo(context, true /* isSms */,
                         address, message, null /* subject */,
                         threadId, timeMillis, null /* attachmentBitmap */,
-                        contact, WorkingMessage.TEXT, subId);
+                        contact, WorkingMessage.TEXT);
 
                 notificationSet.add(info);
 
@@ -781,19 +768,18 @@ public class MessagingNotification {
             long timeMillis,
             Bitmap attachmentBitmap,
             Contact contact,
-            int attachmentType,
-            int subId) {
+            int attachmentType) {
         Intent clickIntent = ComposeMessageActivity.createIntent(context, threadId);
         clickIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
                 | Intent.FLAG_ACTIVITY_SINGLE_TOP
                 | Intent.FLAG_ACTIVITY_CLEAR_TOP);
 
         String senderInfo = buildTickerMessage(
-                context, address, null, null, subId).toString();
+                context, address, null, null).toString();
         String senderInfoName = senderInfo.substring(
                 0, senderInfo.length() - 2);
         CharSequence ticker = buildTickerMessage(
-                context, address, subject, message, subId);
+                context, address, subject, message);
 
         return new NotificationInfo(isSms,
                 clickIntent, message, subject, ticker, timeMillis,
@@ -909,7 +895,7 @@ public class MessagingNotification {
                 }
             }
 
-            taskStackBuilder.addNextIntent(new Intent(context, ConversationList.class));
+            taskStackBuilder.addParentStack(ComposeMessageActivity.class);
             taskStackBuilder.addNextIntent(mostRecentNotification.mClickIntent);
         }
         // Always have to set the small icon or the notification is ignored
@@ -1079,8 +1065,8 @@ public class MessagingNotification {
     }
 
     protected static CharSequence buildTickerMessage(
-            Context context, String address, String subject, String body, int subId) {
-        String displayAddress = Contact.get(address, true, subId).getName();
+            Context context, String address, String subject, String body) {
+        String displayAddress = Contact.get(address, true).getName();
 
         StringBuilder buf = new StringBuilder(
                 displayAddress == null
@@ -1177,7 +1163,7 @@ public class MessagingNotification {
                 failedIntent.putExtra("undelivered_flag", true);
             }
             failedIntent.putExtra("thread_id", threadId);
-            taskStackBuilder.addNextIntent(new Intent(context, ConversationList.class));
+            taskStackBuilder.addParentStack(ComposeMessageActivity.class);
         } else {
             failedIntent = new Intent(context, ConversationList.class);
         }
diff --git a/src/com/android/mms/transaction/MmsMessageSender.java b/src/com/android/mms/transaction/MmsMessageSender.java
index c2b2c2f6..8919e3f0 100755..100644
--- a/src/com/android/mms/transaction/MmsMessageSender.java
+++ b/src/com/android/mms/transaction/MmsMessageSender.java
@@ -22,7 +22,6 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.database.Cursor;
 import android.net.Uri;
 import android.preference.PreferenceManager;
 import android.provider.Telephony.Mms;
@@ -50,7 +49,6 @@ public class MmsMessageSender implements MessageSender {
     private final Context mContext;
     private final Uri mMessageUri;
     private final long mMessageSize;
-    private final int mSubId;
 
     // Default preference values
     private static final boolean DEFAULT_DELIVERY_REPORT_MODE  = false;
@@ -59,11 +57,10 @@ public class MmsMessageSender implements MessageSender {
     private static final int     DEFAULT_PRIORITY        = PduHeaders.PRIORITY_NORMAL;
     private static final String  DEFAULT_MESSAGE_CLASS   = PduHeaders.MESSAGE_CLASS_PERSONAL_STR;
 
-    public MmsMessageSender(Context context, Uri location, long messageSize, int subId) {
+    public MmsMessageSender(Context context, Uri location, long messageSize) {
         mContext = context;
         mMessageUri = location;
         mMessageSize = messageSize;
-        mSubId = subId;
 
         if (mMessageUri == null) {
             throw new IllegalArgumentException("Null message URI.");
@@ -99,7 +96,6 @@ public class MmsMessageSender implements MessageSender {
 
         long messageId = ContentUris.parseId(mMessageUri);
 
-        Uri sendUri = null;
         // Move the message into MMS Outbox.
         if (!mMessageUri.toString().startsWith(Mms.Draft.CONTENT_URI.toString())) {
             // If the message is already in the outbox (most likely because we created a "primed"
@@ -119,11 +115,10 @@ public class MmsMessageSender implements MessageSender {
 
             SqliteWrapper.insert(mContext, mContext.getContentResolver(),
                     PendingMessages.CONTENT_URI, values);
-            sendUri = mMessageUri;
         } else {
-            sendUri = p.move(mMessageUri, Mms.Outbox.CONTENT_URI);
+            p.move(mMessageUri, Mms.Outbox.CONTENT_URI);
         }
-        updateSubIdForSend(mContext, sendUri, mSubId);
+
         // Start MMS transaction service
         SendingProgressTokenManager.put(messageId, token);
         mContext.startService(new Intent(mContext, TransactionService.class));
@@ -143,19 +138,17 @@ public class MmsMessageSender implements MessageSender {
         sendReq.setPriority(prefs.getInt(MessagingPreferenceActivity.PRIORITY, DEFAULT_PRIORITY));
 
         // Delivery report.
-        boolean dr = prefs.getBoolean(mSubId + "_" +
-                MessagingPreferenceActivity.MMS_DELIVERY_REPORT_MSIM_MODE,
+        boolean dr = prefs.getBoolean(MessagingPreferenceActivity.MMS_DELIVERY_REPORT_MODE,
                 DEFAULT_DELIVERY_REPORT_MODE);
         sendReq.setDeliveryReport(dr?PduHeaders.VALUE_YES:PduHeaders.VALUE_NO);
 
         // Read report.
-        boolean rr = prefs.getBoolean(mSubId + "_" +
-                MessagingPreferenceActivity.READ_REPORT_MSIM_MODE,
+        boolean rr = prefs.getBoolean(MessagingPreferenceActivity.READ_REPORT_MODE,
                 DEFAULT_READ_REPORT_MODE);
         sendReq.setReadReport(rr?PduHeaders.VALUE_YES:PduHeaders.VALUE_NO);
     }
 
-    public static void sendReadRec(Context context, String to, String messageId, int status, int subId) {
+    public static void sendReadRec(Context context, String to, String messageId, int status) {
         EncodedStringValue[] sender = new EncodedStringValue[1];
         sender[0] = new EncodedStringValue(to);
 
@@ -169,9 +162,8 @@ public class MmsMessageSender implements MessageSender {
 
             readRec.setDate(System.currentTimeMillis() / 1000);
 
-            Uri uri = PduPersister.getPduPersister(context).persist(readRec, Mms.Outbox.CONTENT_URI, true,
-                    MessagingPreferenceActivity.getIsGroupMmsEnabled(context, subId), null);
-            updateSubIdForSend(context, uri, subId);
+            PduPersister.getPduPersister(context).persist(readRec, Mms.Outbox.CONTENT_URI, true,
+                    MessagingPreferenceActivity.getIsGroupMmsEnabled(context), null);
             context.startService(new Intent(context, TransactionService.class));
         } catch (InvalidHeaderValueException e) {
             Log.e(TAG, "Invalide header value", e);
@@ -179,34 +171,4 @@ public class MmsMessageSender implements MessageSender {
             Log.e(TAG, "Persist message failed", e);
         }
     }
-
-    private static void updateSubIdForSend(Context context, Uri sendUri, int subId) {
-        long msgId = ContentUris.parseId(sendUri);
-        //insert sim index in pdu table
-        ContentValues values = new ContentValues(1);
-        values.put(Mms.SUB_ID, subId);
-        SqliteWrapper.update(context, context.getContentResolver(), sendUri, values, null, null);
-        //insert sim index in pending_msgs table
-        Uri.Builder uriBuilder = PendingMessages.CONTENT_URI.buildUpon();
-        uriBuilder.appendQueryParameter("protocol", "mms");
-        uriBuilder.appendQueryParameter("message", String.valueOf(msgId));
-        Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
-                uriBuilder.build(), new String[] { PendingMessages._ID }, null, null, null);
-        if (cursor != null) {
-            try {
-                if (cursor.getCount() == 1 && cursor.moveToFirst()) {
-                    ContentValues valuesforPending = new ContentValues();
-                    valuesforPending.put(PendingMessages.SUB_ID, subId);
-                    long id = cursor.getLong(0);
-                    SqliteWrapper.update(context, context.getContentResolver(),
-                            PendingMessages.CONTENT_URI, valuesforPending, PendingMessages._ID
-                            + "=" + id, null);
-                } else {
-                    Log.e(TAG, "get PendingMessage has error");
-                }
-            } finally {
-                cursor.close();
-            }
-        }
-    }
 }
diff --git a/src/com/android/mms/transaction/MmsSystemEventReceiver.java b/src/com/android/mms/transaction/MmsSystemEventReceiver.java
index 3dd7656e..a3bad47a 100755..100644
--- a/src/com/android/mms/transaction/MmsSystemEventReceiver.java
+++ b/src/com/android/mms/transaction/MmsSystemEventReceiver.java
@@ -28,7 +28,6 @@ import android.util.Log;
 
 import com.android.mms.LogTag;
 import com.android.mms.MmsApp;
-import com.android.mms.util.SubStatusResolver;
 
 /**
  * MmsSystemEventReceiver receives the
@@ -68,7 +67,7 @@ public class MmsSystemEventReceiver extends BroadcastReceiver {
                 mConnMgr = (ConnectivityManager) context
                         .getSystemService(Context.CONNECTIVITY_SERVICE);
             }
-            if (!SubStatusResolver.isMobileDataEnabledOnAnySub(context)) {
+            if (!mConnMgr.getMobileDataEnabled()) {
                 if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                     Log.v(TAG, "mobile data turned off, bailing");
                 }
@@ -77,7 +76,6 @@ public class MmsSystemEventReceiver extends BroadcastReceiver {
             NetworkInfo mmsNetworkInfo = mConnMgr
                     .getNetworkInfo(ConnectivityManager.TYPE_MOBILE_MMS);
             if (mmsNetworkInfo == null) {
-                Log.e(TAG, "mmsNetworkInfo is null, bailing");
                 return;
             }
             boolean available = mmsNetworkInfo.isAvailable();
diff --git a/src/com/android/mms/transaction/NotificationTransaction.java b/src/com/android/mms/transaction/NotificationTransaction.java
index d245a482..b643f23e 100644
--- a/src/com/android/mms/transaction/NotificationTransaction.java
+++ b/src/com/android/mms/transaction/NotificationTransaction.java
@@ -31,11 +31,9 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.database.sqlite.SqliteWrapper;
 import android.net.Uri;
-import android.net.ConnectivityManager;
 import android.provider.Telephony.Mms;
 import android.provider.Telephony.Threads;
 import android.provider.Telephony.Mms.Inbox;
-import android.telephony.SmsManager;
 import android.telephony.TelephonyManager;
 import android.util.Log;
 
@@ -45,9 +43,7 @@ import com.android.mms.MmsConfig;
 import com.android.mms.ui.MessagingPreferenceActivity;
 import com.android.mms.util.DownloadManager;
 import com.android.mms.util.Recycler;
-import com.android.mms.util.SubStatusResolver;
 import com.android.mms.widget.MmsWidgetProvider;
-
 import com.google.android.mms.MmsException;
 import com.google.android.mms.pdu.GenericPdu;
 import com.google.android.mms.pdu.NotificationInd;
@@ -84,9 +80,8 @@ public class NotificationTransaction extends Transaction implements Runnable {
 
     public NotificationTransaction(
             Context context, int serviceId,
-            TransactionSettings connectionSettings, String uriString,
-            int subId) {
-        super(context, serviceId, connectionSettings, subId);
+            TransactionSettings connectionSettings, String uriString) {
+        super(context, serviceId, connectionSettings);
 
         mUri = Uri.parse(uriString);
 
@@ -110,16 +105,15 @@ public class NotificationTransaction extends Transaction implements Runnable {
      */
     public NotificationTransaction(
             Context context, int serviceId,
-            TransactionSettings connectionSettings, NotificationInd ind,
-            int subId) {
-        super(context, serviceId, connectionSettings, subId);
+            TransactionSettings connectionSettings, NotificationInd ind) {
+        super(context, serviceId, connectionSettings);
 
         try {
             // Save the pdu. If we can start downloading the real pdu immediately, don't allow
             // persist() to create a thread for the notificationInd because it causes UI jank.
             mUri = PduPersister.getPduPersister(context).persist(
-                        ind, Inbox.CONTENT_URI, !allowAutoDownload(context, subId),
-                        MessagingPreferenceActivity.getIsGroupMmsEnabled(context, subId), null);
+                        ind, Inbox.CONTENT_URI, !allowAutoDownload(),
+                        MessagingPreferenceActivity.getIsGroupMmsEnabled(context), null);
         } catch (MmsException e) {
             Log.e(TAG, "Failed to save NotificationInd in constructor.", e);
             throw new IllegalArgumentException();
@@ -138,18 +132,17 @@ public class NotificationTransaction extends Transaction implements Runnable {
         new Thread(this, "NotificationTransaction").start();
     }
 
-    public static boolean allowAutoDownload(Context context, int subId) {
+    public static boolean allowAutoDownload() {
         DownloadManager downloadManager = DownloadManager.getInstance();
         boolean autoDownload = downloadManager.isAuto();
         boolean dataSuspended = (MmsApp.getApplication().getTelephonyManager().getDataState() ==
                 TelephonyManager.DATA_SUSPENDED);
         return autoDownload && !dataSuspended;
-
     }
 
     public void run() {
         DownloadManager downloadManager = DownloadManager.getInstance();
-        boolean autoDownload = allowAutoDownload(mContext, mSubId);
+        boolean autoDownload = allowAutoDownload();
         try {
             if (LOCAL_LOGV) {
                 Log.v(TAG, "Notification transaction launched: " + this);
@@ -161,12 +154,12 @@ public class NotificationTransaction extends Transaction implements Runnable {
             int status = STATUS_DEFERRED;
             // Don't try to download when data is suspended, as it will fail, so defer download
             if (!autoDownload) {
-                downloadManager.markState(mUri, DownloadManager.STATE_UNSTARTED, mSubId);
+                downloadManager.markState(mUri, DownloadManager.STATE_UNSTARTED);
                 sendNotifyRespInd(status);
                 return;
             }
 
-            downloadManager.markState(mUri, DownloadManager.STATE_DOWNLOADING, mSubId);
+            downloadManager.markState(mUri, DownloadManager.STATE_DOWNLOADING);
 
             if (LOCAL_LOGV) {
                 Log.v(TAG, "Content-Location: " + mContentLocation);
@@ -192,13 +185,11 @@ public class NotificationTransaction extends Transaction implements Runnable {
                     // Save the received PDU (must be a M-RETRIEVE.CONF).
                     PduPersister p = PduPersister.getPduPersister(mContext);
                     Uri uri = p.persist(pdu, Inbox.CONTENT_URI, true,
-                            MessagingPreferenceActivity.getIsGroupMmsEnabled(mContext, mSubId),
-                                null);
+                            MessagingPreferenceActivity.getIsGroupMmsEnabled(mContext), null);
 
                     // Use local time instead of PDU time
-                    ContentValues values = new ContentValues(2);
+                    ContentValues values = new ContentValues(1);
                     values.put(Mms.DATE, System.currentTimeMillis() / 1000L);
-                    values.put(Mms.SUB_ID, mSubId);
                     SqliteWrapper.update(mContext, mContext.getContentResolver(),
                             uri, values, null, null);
 
@@ -264,7 +255,7 @@ public class NotificationTransaction extends Transaction implements Runnable {
                 status);
 
         // Pack M-NotifyResp.ind and send it
-        if(MmsConfig.getBoolean(mSubId, SmsManager.MMS_CONFIG_NOTIFY_WAP_MMSC_ENABLED)) {
+        if(MmsConfig.getNotifyWapMMSC()) {
             sendPdu(new PduComposer(mContext, notifyRespInd).make(), mContentLocation);
         } else {
             sendPdu(new PduComposer(mContext, notifyRespInd).make());
diff --git a/src/com/android/mms/transaction/PushReceiver.java b/src/com/android/mms/transaction/PushReceiver.java
index 2c29d73b..4f6ed728 100644
--- a/src/com/android/mms/transaction/PushReceiver.java
+++ b/src/com/android/mms/transaction/PushReceiver.java
@@ -21,7 +21,6 @@ import static android.provider.Telephony.Sms.Intents.WAP_PUSH_DELIVER_ACTION;
 import static com.google.android.mms.pdu.PduHeaders.MESSAGE_TYPE_DELIVERY_IND;
 import static com.google.android.mms.pdu.PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND;
 import static com.google.android.mms.pdu.PduHeaders.MESSAGE_TYPE_READ_ORIG_IND;
-
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -35,17 +34,11 @@ import android.os.AsyncTask;
 import android.os.PowerManager;
 import android.provider.Telephony.Mms;
 import android.provider.Telephony.Mms.Inbox;
-import android.provider.Telephony.MmsSms.PendingMessages;
-import android.telephony.SmsManager;
-import android.telephony.SubscriptionManager;
 import android.util.Log;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.mms.LogTag;
 import com.android.mms.MmsConfig;
 import com.android.mms.ui.MessagingPreferenceActivity;
-import com.android.mms.util.DownloadManager;
-
 import com.google.android.mms.ContentType;
 import com.google.android.mms.MmsException;
 import com.google.android.mms.pdu.DeliveryInd;
@@ -89,8 +82,6 @@ public class PushReceiver extends BroadcastReceiver {
             ContentResolver cr = mContext.getContentResolver();
             int type = pdu.getMessageType();
             long threadId = -1;
-            final int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
-                    SubscriptionManager.getDefaultSmsSubId());
 
             try {
                 switch (type) {
@@ -104,8 +95,7 @@ public class PushReceiver extends BroadcastReceiver {
                         }
 
                         Uri uri = p.persist(pdu, Inbox.CONTENT_URI, true,
-                                MessagingPreferenceActivity.getIsGroupMmsEnabled(mContext, subId),
-                                    null);
+                                MessagingPreferenceActivity.getIsGroupMmsEnabled(mContext), null);
                         // Update thread ID for ReadOrigInd & DeliveryInd.
                         ContentValues values = new ContentValues(1);
                         values.put(Mms.THREAD_ID, threadId);
@@ -115,8 +105,7 @@ public class PushReceiver extends BroadcastReceiver {
                     case MESSAGE_TYPE_NOTIFICATION_IND: {
                         NotificationInd nInd = (NotificationInd) pdu;
 
-                        if (MmsConfig.getBoolean(subId,
-                                SmsManager.MMS_CONFIG_APPEND_TRANSACTION_ID)) {
+                        if (MmsConfig.getTransIdEnabled()) {
                             byte [] contentLocation = nInd.getContentLocation();
                             if ('=' == contentLocation[contentLocation.length - 1]) {
                                 byte [] transactionId = nInd.getTransactionId();
@@ -134,60 +123,16 @@ public class PushReceiver extends BroadcastReceiver {
                             // Save the pdu. If we can start downloading the real pdu immediately,
                             // don't allow persist() to create a thread for the notificationInd
                             // because it causes UI jank.
-                            if (!SubscriptionManager.isValidSubId(subId)) {
-                                Log.e(TAG, "subId is invalid");
-                                break;
-                            }
                             Uri uri = p.persist(pdu, Inbox.CONTENT_URI,
-                                    !NotificationTransaction.allowAutoDownload(mContext, subId),
-                                    MessagingPreferenceActivity.getIsGroupMmsEnabled(mContext,
-                                            subId), null);
-                            // TODO remove updating subId of Mms after refactor
-                            ContentValues values = new ContentValues();
-                            values.put(Mms.SUB_ID, subId);
-                            SqliteWrapper.update(mContext, cr, uri, values, null, null);
-                            //update sub_id into pending_msg table
-                            long msgId = 0;
-                            Cursor cursor = SqliteWrapper.query(mContext, mContext.getContentResolver(),
-                                    uri, new String[] {Mms._ID}, null, null, null);
-                            if (cursor != null) {
-                                try {
-                                    if (cursor.getCount() == 1 && cursor.moveToFirst()) {
-                                        msgId = cursor.getLong(0);
-                                    }
-                                } finally {
-                                    cursor.close();
-                                }
-                            }
+                                    !NotificationTransaction.allowAutoDownload(),
+                                    MessagingPreferenceActivity.getIsGroupMmsEnabled(mContext),
+                                    null);
 
-                            Uri.Builder uriBuilder = PendingMessages.CONTENT_URI.buildUpon();
-                            uriBuilder.appendQueryParameter("protocol", "mms");
-                            uriBuilder.appendQueryParameter("message", String.valueOf(msgId));
-                            // TODO remove updating subId of PendingMessage after refactor
-                            Cursor pendingCursor = SqliteWrapper.query(mContext, mContext.getContentResolver(),
-                                    uriBuilder.build(), new String[] {PendingMessages._ID}, null, null, null);
-                            if (pendingCursor != null) {
-                                try {
-                                    if (pendingCursor.getCount() == 1 && pendingCursor.moveToFirst()) {
-                                        ContentValues valuesforPending = new ContentValues();
-                                        valuesforPending.put(PendingMessages.SUB_ID, subId);
-                                        long id = pendingCursor.getLong(0);
-                                        SqliteWrapper.update(mContext, mContext.getContentResolver(),
-                                                PendingMessages.CONTENT_URI,
-                                                valuesforPending, PendingMessages._ID + "=" + id, null);
-                                    }
-                                } finally {
-                                    pendingCursor.close();
-                                }
-                            }
-                            DownloadManager.getInstance().markState(uri,
-                                    DownloadManager.STATE_DOWNLOADING, subId);
                             // Start service to finish the notification transaction.
                             Intent svc = new Intent(mContext, TransactionService.class);
                             svc.putExtra(TransactionBundle.URI, uri.toString());
                             svc.putExtra(TransactionBundle.TRANSACTION_TYPE,
                                     Transaction.NOTIFICATION_TRANSACTION);
-                            svc.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
                             mContext.startService(svc);
                         } else if (LOCAL_LOGV) {
                             Log.v(TAG, "Skip downloading duplicate message: "
diff --git a/src/com/android/mms/transaction/ReadRecTransaction.java b/src/com/android/mms/transaction/ReadRecTransaction.java
index 3b72727a..8f87c3d4 100755..100644
--- a/src/com/android/mms/transaction/ReadRecTransaction.java
+++ b/src/com/android/mms/transaction/ReadRecTransaction.java
@@ -26,7 +26,6 @@ import android.util.Log;
 
 import com.android.mms.LogTag;
 import com.android.mms.ui.MessageUtils;
-
 import com.google.android.mms.MmsException;
 import com.google.android.mms.pdu.EncodedStringValue;
 import com.google.android.mms.pdu.PduComposer;
@@ -55,9 +54,8 @@ public class ReadRecTransaction extends Transaction implements Runnable{
     public ReadRecTransaction(Context context,
             int transId,
             TransactionSettings connectionSettings,
-            String uri,
-            int subId) {
-        super(context, transId, connectionSettings, subId);
+            String uri) {
+        super(context, transId, connectionSettings);
         mReadReportURI = Uri.parse(uri);
         mId = uri;
 
@@ -83,7 +81,7 @@ public class ReadRecTransaction extends Transaction implements Runnable{
             ReadRecInd readRecInd = (ReadRecInd) persister.load(mReadReportURI);
 
             // insert the 'from' address per spec
-            String lineNumber = MessageUtils.getLocalNumber(mSubId);
+            String lineNumber = MessageUtils.getLocalNumber();
             readRecInd.setFrom(new EncodedStringValue(lineNumber));
 
             // Pack M-read-rec.ind and send it
diff --git a/src/com/android/mms/transaction/RetrieveTransaction.java b/src/com/android/mms/transaction/RetrieveTransaction.java
index e2753b14..7277d499 100755..100644
--- a/src/com/android/mms/transaction/RetrieveTransaction.java
+++ b/src/com/android/mms/transaction/RetrieveTransaction.java
@@ -26,7 +26,6 @@ import android.database.sqlite.SqliteWrapper;
 import android.net.Uri;
 import android.provider.Telephony.Mms;
 import android.provider.Telephony.Mms.Inbox;
-import android.telephony.SmsManager;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -37,7 +36,6 @@ import com.android.mms.ui.MessagingPreferenceActivity;
 import com.android.mms.util.DownloadManager;
 import com.android.mms.util.Recycler;
 import com.android.mms.widget.MmsWidgetProvider;
-
 import com.google.android.mms.MmsException;
 import com.google.android.mms.pdu.AcknowledgeInd;
 import com.google.android.mms.pdu.EncodedStringValue;
@@ -79,9 +77,9 @@ public class RetrieveTransaction extends Transaction implements Runnable {
     static final int COLUMN_LOCKED                = 1;
 
     public RetrieveTransaction(Context context, int serviceId,
-            TransactionSettings connectionSettings, String uri, int subId)
+            TransactionSettings connectionSettings, String uri)
             throws MmsException {
-        super(context, serviceId, connectionSettings, subId);
+        super(context, serviceId, connectionSettings);
 
         if (uri.startsWith("content://")) {
             mUri = Uri.parse(uri); // The Uri of the M-Notification.ind
@@ -133,7 +131,7 @@ public class RetrieveTransaction extends Transaction implements Runnable {
         try {
             // Change the downloading state of the M-Notification.ind.
             DownloadManager.getInstance().markState(
-                    mUri, DownloadManager.STATE_DOWNLOADING, mSubId);
+                    mUri, DownloadManager.STATE_DOWNLOADING);
 
             // Send GET request to MMSC and retrieve the response data.
             byte[] resp = getPdu(mContentLocation);
@@ -154,12 +152,11 @@ public class RetrieveTransaction extends Transaction implements Runnable {
                 // Store M-Retrieve.conf into Inbox
                 PduPersister persister = PduPersister.getPduPersister(mContext);
                 msgUri = persister.persist(retrieveConf, Inbox.CONTENT_URI, true,
-                        MessagingPreferenceActivity.getIsGroupMmsEnabled(mContext, mSubId), null);
+                        MessagingPreferenceActivity.getIsGroupMmsEnabled(mContext), null);
 
                 // Use local time instead of PDU time
-                ContentValues values = new ContentValues(2);
+                ContentValues values = new ContentValues(1);
                 values.put(Mms.DATE, System.currentTimeMillis() / 1000L);
-                values.put(Mms.SUB_ID, mSubId);
                 SqliteWrapper.update(mContext, mContext.getContentResolver(),
                         msgUri, values, null, null);
 
@@ -280,11 +277,11 @@ public class RetrieveTransaction extends Transaction implements Runnable {
                     PduHeaders.CURRENT_MMS_VERSION, tranId);
 
             // insert the 'from' address per spec
-            String lineNumber = MessageUtils.getLocalNumber(mSubId);
+            String lineNumber = MessageUtils.getLocalNumber();
             acknowledgeInd.setFrom(new EncodedStringValue(lineNumber));
 
             // Pack M-Acknowledge.ind and send it
-            if(MmsConfig.getBoolean(mSubId, SmsManager.MMS_CONFIG_NOTIFY_WAP_MMSC_ENABLED)) {
+            if(MmsConfig.getNotifyWapMMSC()) {
                 sendPdu(new PduComposer(mContext, acknowledgeInd).make(), mContentLocation);
             } else {
                 sendPdu(new PduComposer(mContext, acknowledgeInd).make());
diff --git a/src/com/android/mms/transaction/RetryScheduler.java b/src/com/android/mms/transaction/RetryScheduler.java
index edd16cc0..bbe9ed90 100644
--- a/src/com/android/mms/transaction/RetryScheduler.java
+++ b/src/com/android/mms/transaction/RetryScheduler.java
@@ -120,9 +120,6 @@ public class RetryScheduler implements Observer {
                     int retryIndex = cursor.getInt(cursor.getColumnIndexOrThrow(
                             PendingMessages.RETRY_INDEX)) + 1; // Count this time.
 
-                    int subId = cursor.getInt(cursor.getColumnIndexOrThrow(
-                            PendingMessages.SUB_ID));
-
                     // TODO Should exactly understand what was happened.
                     int errorType = MmsSms.ERR_TYPE_GENERIC;
 
@@ -184,7 +181,7 @@ public class RetryScheduler implements Observer {
                         if (isRetryDownloading) {
                             // Downloading process is transiently failed.
                             DownloadManager.getInstance().markState(
-                                    uri, DownloadManager.STATE_TRANSIENT_FAILURE, subId);
+                                    uri, DownloadManager.STATE_TRANSIENT_FAILURE);
                         }
                     } else {
                         errorType = MmsSms.ERR_TYPE_GENERIC_PERMANENT;
@@ -209,7 +206,7 @@ public class RetryScheduler implements Observer {
                             }
 
                             DownloadManager.getInstance().markState(
-                                    uri, DownloadManager.STATE_PERMANENT_FAILURE, subId);
+                                    uri, DownloadManager.STATE_PERMANENT_FAILURE);
                         } else {
                             // Mark the failed message as unread.
                             ContentValues readValues = new ContentValues(1);
diff --git a/src/com/android/mms/transaction/SendTransaction.java b/src/com/android/mms/transaction/SendTransaction.java
index d4568529..e07a77a4 100755..100644
--- a/src/com/android/mms/transaction/SendTransaction.java
+++ b/src/com/android/mms/transaction/SendTransaction.java
@@ -61,8 +61,8 @@ public class SendTransaction extends Transaction implements Runnable {
     public final Uri mSendReqURI;
 
     public SendTransaction(Context context,
-            int transId, TransactionSettings connectionSettings, String uri, int subId) {
-        super(context, transId, connectionSettings, subId);
+            int transId, TransactionSettings connectionSettings, String uri) {
+        super(context, transId, connectionSettings);
         mSendReqURI = Uri.parse(uri);
         mId = uri;
 
@@ -103,7 +103,7 @@ public class SendTransaction extends Transaction implements Runnable {
                                  mSendReqURI, values, null, null);
 
             // fix bug 2100169: insert the 'from' address per spec
-            String lineNumber = MessageUtils.getLocalNumber(mSubId);
+            String lineNumber = MessageUtils.getLocalNumber();
             if (!TextUtils.isEmpty(lineNumber)) {
                 sendReq.setFrom(new EncodedStringValue(lineNumber));
             }
diff --git a/src/com/android/mms/transaction/SimFullReceiver.java b/src/com/android/mms/transaction/SimFullReceiver.java
index ac46e4da..59ae6e41 100644
--- a/src/com/android/mms/transaction/SimFullReceiver.java
+++ b/src/com/android/mms/transaction/SimFullReceiver.java
@@ -25,109 +25,41 @@ import android.content.Context;
 import android.content.Intent;
 import android.provider.Settings;
 import android.provider.Telephony;
-import android.telephony.SubscriptionManager;
-import android.util.Log;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.mms.R;
 import com.android.mms.ui.ManageSimMessages;
-import com.android.mms.ui.MessagingPreferenceActivity;
-import com.android.mms.ui.SubSelectActivity;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
 
 /**
  * Receive Intent.SIM_FULL_ACTION.  Handle notification that SIM is full.
  */
 public class SimFullReceiver extends BroadcastReceiver {
 
-    private static final String TAG = "SimFullReceiver";
-    // After user view SIM messages of one SIM card, APP should remove this SIM
-    // from SIM-FULL notification
-    public static final String SIM_FULL_VIEWED_ACTION = "com.android.mms.ui.SIM_FULL_VIEWED";
-    // Store SMS full SIM cards in a Set
-    private static TreeSet<Integer> sFullSubIdSet = null;
-
     @Override
     public void onReceive(Context context, Intent intent) {
         if (Settings.Global.getInt(context.getContentResolver(),
-                Settings.Global.DEVICE_PROVISIONED, 0) == 1) {
+            Settings.Global.DEVICE_PROVISIONED, 0) == 1 &&
+            Telephony.Sms.Intents.SIM_FULL_ACTION.equals(intent.getAction())) {
 
             NotificationManager nm = (NotificationManager)
                 context.getSystemService(Context.NOTIFICATION_SERVICE);
-            String action = intent.getAction();
-            int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
-                    SubscriptionManager.INVALID_SUB_ID);
-            if (!SubscriptionManager.isValidSubId(subId)) {
-                Log.e(TAG, "subId is invalid");
-                return;
-            }
-            if (sFullSubIdSet == null) {
-                sFullSubIdSet = new TreeSet<Integer>();
-            }
-            // prepare full Subs list to refresh SIM full notification
-            if (Telephony.Sms.Intents.SIM_FULL_ACTION.equals(action)) {
-                // Receive a new SIM full intent, need store it into list
-                sFullSubIdSet.add(subId);
-            } else if (SIM_FULL_VIEWED_ACTION.equals(action)) {
-                // Already viewed by user, need remove it from list
-                sFullSubIdSet.remove(subId);
-            }
 
-            PendingIntent pendingIntent = null;
-            nm.cancel(ManageSimMessages.SIM_FULL_NOTIFICATION_ID);
-            if (sFullSubIdSet.size() == 0) {
-                // All full subs are viewed by user, no need create notification
-                return;
-            } else if (sFullSubIdSet.size() == 1) {
-                // Only 1 full sub need view. Directly view it in
-                // ManageSimMessages
-                Intent viewSimIntent = new Intent(context, ManageSimMessages.class);
-                viewSimIntent.setAction(Intent.ACTION_VIEW);
-                viewSimIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                viewSimIntent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, sFullSubIdSet.first());
-                pendingIntent = PendingIntent.getActivity(context, 0, viewSimIntent, 0);
-            } else {
-                // More than 1 full subs need view. Need select sub after
-                // click the notification
-                Intent selectSubIntent = new Intent(context, SubSelectActivity.class);
-                selectSubIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                        | Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                selectSubIntent.putExtra(MessagingPreferenceActivity.PREFERENCE_KEY,
-                        MessagingPreferenceActivity.MANAGE_SIM_MESSAGE_MODE);
-                selectSubIntent.putExtra(MessagingPreferenceActivity.PREFERENCE_TITLE_ID,
-                        R.string.pref_summary_manage_sim_messages);
-                int[] fullSubArray = getIntArrayFromSet(sFullSubIdSet);
-                selectSubIntent.putExtra(SubSelectActivity.EXTRA_APPOINTED_SUBS,
-                        fullSubArray);
-                pendingIntent = PendingIntent.getActivity(context, 0, selectSubIntent,
-                        PendingIntent.FLAG_UPDATE_CURRENT);
-            }
+            Intent viewSimIntent = new Intent(context, ManageSimMessages.class);
+            viewSimIntent.setAction(Intent.ACTION_VIEW);
+            viewSimIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            PendingIntent pendingIntent = PendingIntent.getActivity(
+                    context, 0, viewSimIntent, 0);
 
             Notification notification = new Notification();
             notification.icon = R.drawable.stat_sys_no_sim;
             notification.tickerText = context.getString(R.string.sim_full_title);
-            if (Telephony.Sms.Intents.SIM_FULL_ACTION.equals(action)) {
-                notification.defaults = Notification.DEFAULT_ALL;
-            }
+            notification.defaults = Notification.DEFAULT_ALL;
 
             notification.setLatestEventInfo(
                     context, context.getString(R.string.sim_full_title),
                     context.getString(R.string.sim_full_body),
                     pendingIntent);
             nm.notify(ManageSimMessages.SIM_FULL_NOTIFICATION_ID, notification);
-        }
+       }
     }
 
-    private int[] getIntArrayFromSet(Set<Integer> set) {
-        int size = set.size();
-        int[] result = new int[size];
-        Iterator<Integer> interator = set.iterator();
-        for (int i = 0; i < size; i++) {
-            result[i] = interator.next();
-        }
-        return result;
-    }
 }
diff --git a/src/com/android/mms/transaction/SmsMessageSender.java b/src/com/android/mms/transaction/SmsMessageSender.java
index 55387e03..b369b6a9 100755..100644
--- a/src/com/android/mms/transaction/SmsMessageSender.java
+++ b/src/com/android/mms/transaction/SmsMessageSender.java
@@ -40,7 +40,6 @@ public class SmsMessageSender implements MessageSender {
     protected final String mMessageText;
     protected final String mServiceCenter;
     protected final long mThreadId;
-    protected int mSubId;
     protected long mTimestamp;
     private static final String TAG = LogTag.TAG;
 
@@ -55,7 +54,7 @@ public class SmsMessageSender implements MessageSender {
     private static final int COLUMN_REPLY_PATH_PRESENT = 0;
     private static final int COLUMN_SERVICE_CENTER     = 1;
 
-    public SmsMessageSender(Context context, String[] dests, String msgText, long threadId, int subId) {
+    public SmsMessageSender(Context context, String[] dests, String msgText, long threadId) {
         mContext = context;
         mMessageText = msgText;
         if (dests != null) {
@@ -68,7 +67,6 @@ public class SmsMessageSender implements MessageSender {
         }
         mTimestamp = System.currentTimeMillis();
         mThreadId = threadId;
-        mSubId = subId;
         mServiceCenter = getOutgoingServiceCenter(mThreadId);
     }
 
@@ -86,7 +84,7 @@ public class SmsMessageSender implements MessageSender {
 
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
         boolean requestDeliveryReport = prefs.getBoolean(
-                mSubId + "_" + MessagingPreferenceActivity.SMS_DELIVERY_REPORT_MSIM_MODE,
+                MessagingPreferenceActivity.SMS_DELIVERY_REPORT_MODE,
                 DEFAULT_DELIVERY_REPORT_MODE);
 
         for (int i = 0; i < mNumberOfDests; i++) {
@@ -94,8 +92,7 @@ public class SmsMessageSender implements MessageSender {
                 if (LogTag.DEBUG_SEND) {
                     Log.v(TAG, "queueMessage mDests[i]: " + mDests[i] + " mThreadId: " + mThreadId);
                 }
-                Sms.addMessageToUri(mSubId,
-                        mContext.getContentResolver(),
+                Sms.addMessageToUri(mContext.getContentResolver(),
                         Uri.parse("content://sms/queued"), mDests[i],
                         mMessageText, null, mTimestamp,
                         true /* read */,
diff --git a/src/com/android/mms/transaction/SmsReceiverService.java b/src/com/android/mms/transaction/SmsReceiverService.java
index 6e1edf08..04eb597e 100644..100755
--- a/src/com/android/mms/transaction/SmsReceiverService.java
+++ b/src/com/android/mms/transaction/SmsReceiverService.java
@@ -22,8 +22,6 @@ import static android.provider.Telephony.Sms.Intents.SMS_DELIVER_ACTION;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
-import java.util.HashSet;
-import java.util.Iterator;
 
 import android.app.Activity;
 import android.app.Service;
@@ -49,13 +47,11 @@ import android.provider.Telephony.Sms.Outbox;
 import android.telephony.ServiceState;
 import android.telephony.SmsManager;
 import android.telephony.SmsMessage;
-import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
 import com.android.internal.telephony.TelephonyIntents;
-import com.android.internal.telephony.PhoneConstants;
 import com.android.mms.LogTag;
 import com.android.mms.MmsConfig;
 import com.android.mms.R;
@@ -97,7 +93,6 @@ public class SmsReceiverService extends Service {
         Sms.ADDRESS,    //2
         Sms.BODY,       //3
         Sms.STATUS,     //4
-        Sms.SUB_ID,     //5
 
     };
 
@@ -109,12 +104,9 @@ public class SmsReceiverService extends Service {
     private static final int SEND_COLUMN_ADDRESS    = 2;
     private static final int SEND_COLUMN_BODY       = 3;
     private static final int SEND_COLUMN_STATUS     = 4;
-    private static final int SEND_COLUMN_SUB_ID     = 5;
 
     private int mResultCode;
 
-    private static HashSet<Integer> sNoServiceSimSet = new HashSet<Integer>();
-
     @Override
     public void onCreate() {
         // Temporarily removed for this duplicate message track down.
@@ -134,7 +126,7 @@ public class SmsReceiverService extends Service {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        if (!MmsConfig.isSmsEnabled()) {
+        if (!MmsConfig.isSmsEnabled(this)) {
             Log.d(TAG, "SmsReceiverService: is not the default sms app");
             return Service.START_NOT_STICKY;
         }
@@ -205,7 +197,7 @@ public class SmsReceiverService extends Service {
             if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                 Log.v(TAG, "handleMessage serviceId: " + serviceId + " intent: " + intent);
             }
-            if (intent != null && MmsConfig.isSmsEnabled()) {
+            if (intent != null && MmsConfig.isSmsEnabled(getApplicationContext())) {
                 String action = intent.getAction();
 
                 int error = intent.getIntExtra("errorCode", 0);
@@ -237,18 +229,8 @@ public class SmsReceiverService extends Service {
     private void handleServiceStateChanged(Intent intent) {
         // If service just returned, start sending out the queued messages
         ServiceState serviceState = ServiceState.newFromBundle(intent.getExtras());
-        int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
-                SubscriptionManager.INVALID_SUB_ID);
-        if (!SubscriptionManager.isValidSubId(subId)) {
-            Log.e(TAG, "subId in handleServiceStateChanged() is invalid!");
-            return;
-        }
-        if (serviceState.getState() == ServiceState.STATE_IN_SERVICE
-                && sNoServiceSimSet.contains(subId)) {
-            sNoServiceSimSet.remove(subId);
-            if (!mSending) {
-                sendFirstQueuedMessage();
-            }
+        if (serviceState.getState() == ServiceState.STATE_IN_SERVICE) {
+            sendFirstQueuedMessage();
         }
     }
 
@@ -268,12 +250,9 @@ public class SmsReceiverService extends Service {
         boolean success = true;
         // get all the queued messages from the database
         final Uri uri = Uri.parse("content://sms/queued");
-        //Add for avoiding to send message on No Service Sim card
-        String selection = Sms.SUB_ID + " NOT IN " + "(" + getNoServiceSimString() + ")";
-
         ContentResolver resolver = getContentResolver();
         Cursor c = SqliteWrapper.query(this, resolver, uri,
-                        SEND_PROJECTION, selection, null, "date ASC");   // date ASC so we send out in
+                        SEND_PROJECTION, null, null, "date ASC");   // date ASC so we send out in
                                                                     // same order the user tried
                                                                     // to send messages.
         if (c != null) {
@@ -283,14 +262,13 @@ public class SmsReceiverService extends Service {
                     String address = c.getString(SEND_COLUMN_ADDRESS);
                     int threadId = c.getInt(SEND_COLUMN_THREAD_ID);
                     int status = c.getInt(SEND_COLUMN_STATUS);
-                    int subId = c.getInt(SEND_COLUMN_SUB_ID);
 
                     int msgId = c.getInt(SEND_COLUMN_ID);
                     Uri msgUri = ContentUris.withAppendedId(Sms.CONTENT_URI, msgId);
 
                     SmsMessageSender sender = new SmsSingleRecipientSender(this,
                             address, msgText, threadId, status == Sms.STATUS_PENDING,
-                            msgUri, subId);
+                            msgUri);
 
                     if (LogTag.DEBUG_SEND ||
                             LogTag.VERBOSE ||
@@ -339,13 +317,6 @@ public class SmsReceiverService extends Service {
                     " = " + translateResultCode(mResultCode) + " error: " + error);
         }
 
-        int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
-                SubscriptionManager.INVALID_SUB_ID);
-        if (!SubscriptionManager.isValidSubId(subId)) {
-            Log.e(TAG, "subId in handleSmsSent() is invalid!");
-            return;
-        }
-
         if (mResultCode == Activity.RESULT_OK) {
             if (LogTag.DEBUG_SEND || Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                 Log.v(TAG, "handleSmsSent move message to sent folder uri: " + uri);
@@ -367,7 +338,7 @@ public class SmsReceiverService extends Service {
             // We got an error with no service or no radio. Register for state changes so
             // when the status of the connection/radio changes, we can try to send the
             // queued up messages.
-            registerForServiceStateChanges(subId);
+            registerForServiceStateChanges();
             // We couldn't send the message, put in the queue to retry later.
             Sms.moveMessageToFolder(this, uri, Sms.MESSAGE_TYPE_QUEUED, error);
             mToastHandler.post(new Runnable() {
@@ -417,7 +388,7 @@ public class SmsReceiverService extends Service {
             long threadId = MessagingNotification.getSmsThreadId(this, messageUri);
             // Called off of the UI thread so ok to block.
             Log.d(TAG, "handleSmsReceived messageUri: " + messageUri + " threadId: " + threadId);
-            MessagingNotification.blockingUpdateNewMessageIndicator(this, threadId, false, null);
+            MessagingNotification.blockingUpdateNewMessageIndicator(this, threadId, false);
         }
     }
 
@@ -435,7 +406,7 @@ public class SmsReceiverService extends Service {
 
         // Called off of the UI thread so ok to block.
         MessagingNotification.blockingUpdateNewMessageIndicator(
-                this, MessagingNotification.THREAD_ALL, false, null);
+                this, MessagingNotification.THREAD_ALL, false);
     }
 
     /**
@@ -542,19 +513,11 @@ public class SmsReceiverService extends Service {
         ContentResolver resolver = context.getContentResolver();
         String originatingAddress = sms.getOriginatingAddress();
         int protocolIdentifier = sms.getProtocolIdentifier();
-        int subId = sms.getSubId();
-        if (!SubscriptionManager.isValidSubId(subId)) {
-            Log.e(TAG, "subId is invalid in replaceMessage()!");
-            return null;
-        }
-
         String selection =
                 Sms.ADDRESS + " = ? AND " +
-                Sms.PROTOCOL + " = ? AND " +
-                Sms.SUB_ID + " = ?";
+                Sms.PROTOCOL + " = ?";
         String[] selectionArgs = new String[] {
-            originatingAddress, Integer.toString(protocolIdentifier),
-            Long.toString(subId)
+            originatingAddress, Integer.toString(protocolIdentifier)
         };
 
         Cursor cursor = SqliteWrapper.query(context, resolver, Inbox.CONTENT_URI,
@@ -626,9 +589,8 @@ public class SmsReceiverService extends Service {
 //            case 7: address = "#4#5#6#"; break;
 //        }
 
-        int subId = sms.getSubId();
         if (!TextUtils.isEmpty(address)) {
-            Contact cacheContact = Contact.get(address, true, subId);
+            Contact cacheContact = Contact.get(address,true);
             if (cacheContact != null) {
                 address = cacheContact.getNumber();
             }
@@ -637,12 +599,6 @@ public class SmsReceiverService extends Service {
             values.put(Sms.ADDRESS, address);
         }
 
-        if (!SubscriptionManager.isValidSubId(subId)) {
-            Log.e(TAG, "subId in storeMessage() is invalid!");
-            return null;
-        }
-        values.put(Sms.SUB_ID, subId);
-
         if (((threadId == null) || (threadId == 0)) && (address != null)) {
             threadId = Conversation.getOrCreateThreadId(context, address);
             values.put(Sms.THREAD_ID, threadId);
@@ -706,35 +662,26 @@ public class SmsReceiverService extends Service {
     private void displayClassZeroMessage(Context context, SmsMessage sms, String format) {
         // Using NEW_TASK here is necessary because we're calling
         // startActivity from outside an activity.
-        int subId = sms.getSubId();
-        if (!SubscriptionManager.isValidSubId(subId)) {
-            Log.e(TAG, "subId is invalid in displayClassZeroMessage()");
-            return;
-        }
         Intent smsDialogIntent = new Intent(context, ClassZeroActivity.class)
                 .putExtra("pdu", sms.getPdu())
                 .putExtra("format", format)
-                .putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId)
                 .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
                           | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
 
         context.startActivity(smsDialogIntent);
     }
 
-    private void registerForServiceStateChanges(int subId) {
-        if (sNoServiceSimSet.isEmpty()) {
-            Context context = getApplicationContext();
-            unRegisterForServiceStateChanges();
+    private void registerForServiceStateChanges() {
+        Context context = getApplicationContext();
+        unRegisterForServiceStateChanges();
 
-            IntentFilter intentFilter = new IntentFilter();
-            intentFilter.addAction(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);
-            if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE) || LogTag.DEBUG_SEND) {
-                Log.v(TAG, "registerForServiceStateChanges");
-            }
-
-            context.registerReceiver(SmsReceiver.getInstance(), intentFilter);
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);
+        if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE) || LogTag.DEBUG_SEND) {
+            Log.v(TAG, "registerForServiceStateChanges");
         }
-        sNoServiceSimSet.add(subId);
+
+        context.registerReceiver(SmsReceiver.getInstance(), intentFilter);
     }
 
     private void unRegisterForServiceStateChanges() {
@@ -742,27 +689,12 @@ public class SmsReceiverService extends Service {
             Log.v(TAG, "unRegisterForServiceStateChanges");
         }
         try {
-            if (sNoServiceSimSet.isEmpty()) {
-                Context context = getApplicationContext();
-                context.unregisterReceiver(SmsReceiver.getInstance());
-            }
+            Context context = getApplicationContext();
+            context.unregisterReceiver(SmsReceiver.getInstance());
         } catch (IllegalArgumentException e) {
             // Allow un-matched register-unregister calls
         }
     }
-
-    private String getNoServiceSimString() {
-        StringBuilder stringBuilder = new StringBuilder();
-        Iterator<Integer> noServiceIterator = sNoServiceSimSet.iterator();
-        while (noServiceIterator.hasNext()) {
-            if (stringBuilder.length() != 0) {
-                stringBuilder.append(",");
-            }
-            stringBuilder.append(noServiceIterator.next());
-        }
-        String result = stringBuilder.toString();
-        return result;
-    }
 }
 
 
diff --git a/src/com/android/mms/transaction/SmsSingleRecipientSender.java b/src/com/android/mms/transaction/SmsSingleRecipientSender.java
index f2fa4ef3..fc0f9d19 100755..100644
--- a/src/com/android/mms/transaction/SmsSingleRecipientSender.java
+++ b/src/com/android/mms/transaction/SmsSingleRecipientSender.java
@@ -10,26 +10,24 @@ import android.provider.Telephony.Mms;
 import android.provider.Telephony.Sms;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.SmsManager;
-import android.telephony.SubscriptionManager;
 import android.util.Log;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.mms.LogTag;
 import com.android.mms.MmsConfig;
 import com.android.mms.data.Conversation;
 import com.android.mms.ui.MessageUtils;
-
 import com.google.android.mms.MmsException;
 
 public class SmsSingleRecipientSender extends SmsMessageSender {
+
     private final boolean mRequestDeliveryReport;
     private String mDest;
     private Uri mUri;
     private static final String TAG = LogTag.TAG;
 
     public SmsSingleRecipientSender(Context context, String dest, String msgText, long threadId,
-            boolean requestDeliveryReport, Uri uri, int subId) {
-        super(context, null, msgText, threadId, subId);
+            boolean requestDeliveryReport, Uri uri) {
+        super(context, null, msgText, threadId);
         mRequestDeliveryReport = requestDeliveryReport;
         mDest = dest;
         mUri = uri;
@@ -44,20 +42,13 @@ public class SmsSingleRecipientSender extends SmsMessageSender {
             // one.
             throw new MmsException("Null message body or have multiple destinations.");
         }
-        if (!SubscriptionManager.isValidSubId(mSubId)) {
-            // Make last check of the validity of current SIM. It is possible that
-            // it is removed.
-            throw new MmsException("Current selected SIM is not valid");
-        }
-        SmsManager smsManager = SmsManager.getSmsManagerForSubscriber(mSubId);
+        SmsManager smsManager = SmsManager.getDefault();
         ArrayList<String> messages = null;
-        final String emailGateway =
-                MmsConfig.getString(mSubId, SmsManager.MMS_CONFIG_EMAIL_GATEWAY_NUMBER);
-        if ((emailGateway != null) &&
-                (Mms.isEmailAddress(mDest) || MessageUtils.isAlias(mDest, mSubId))) {
+        if ((MmsConfig.getEmailGateway() != null) &&
+                (Mms.isEmailAddress(mDest) || MessageUtils.isAlias(mDest))) {
             String msgText;
             msgText = mDest + " " + mMessageText;
-            mDest = emailGateway;
+            mDest = MmsConfig.getEmailGateway();
             messages = smsManager.divideMessage(msgText);
         } else {
             messages = smsManager.divideMessage(mMessageText);
@@ -65,7 +56,7 @@ public class SmsSingleRecipientSender extends SmsMessageSender {
             // (e.g. "801 555 1212" -> "8015551212")
             // (e.g. "+8211-123-4567" -> "+82111234567")
             mDest = PhoneNumberUtils.stripSeparators(mDest);
-            mDest = Conversation.verifySingleRecipient(mContext, mThreadId, mDest, mSubId);
+            mDest = Conversation.verifySingleRecipient(mContext, mThreadId, mDest);
         }
         int messageCount = messages.size();
 
@@ -98,8 +89,7 @@ public class SmsSingleRecipientSender extends SmsMessageSender {
                                 MessageStatusReceiver.MESSAGE_STATUS_RECEIVED_ACTION,
                                 mUri,
                                 mContext,
-                                MessageStatusReceiver.class)
-                                        .putExtra(PhoneConstants.SUBSCRIPTION_KEY, mSubId),
+                                MessageStatusReceiver.class),
                                 0));
             } else {
                 deliveryIntents.add(null);
@@ -120,12 +110,10 @@ public class SmsSingleRecipientSender extends SmsMessageSender {
             if (LogTag.DEBUG_SEND) {
                 Log.v(TAG, "sendMessage sendIntent: " + intent);
             }
-            intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, mSubId);
             sentIntents.add(PendingIntent.getBroadcast(mContext, requestCode, intent, 0));
         }
         try {
-            smsManager.sendMultipartTextMessage(mDest, mServiceCenter, messages,
-                    sentIntents, deliveryIntents);
+            smsManager.sendMultipartTextMessage(mDest, mServiceCenter, messages, sentIntents, deliveryIntents);
         } catch (Exception ex) {
             Log.e(TAG, "SmsMessageSender.sendMessage: caught", ex);
             throw new MmsException("SmsMessageSender.sendMessage: caught " + ex +
diff --git a/src/com/android/mms/transaction/Transaction.java b/src/com/android/mms/transaction/Transaction.java
index 8588e1e9..10ebd3ee 100755..100644
--- a/src/com/android/mms/transaction/Transaction.java
+++ b/src/com/android/mms/transaction/Transaction.java
@@ -40,7 +40,6 @@ public abstract class Transaction extends Observable {
     protected String mId;
     protected TransactionState mTransactionState;
     protected TransactionSettings mTransactionSettings;
-    protected int mSubId;
 
     /**
      * Identifies push requests.
@@ -60,12 +59,11 @@ public abstract class Transaction extends Observable {
     public static final int READREC_TRANSACTION      = 3;
 
     public Transaction(Context context, int serviceId,
-            TransactionSettings settings, int subId) {
+            TransactionSettings settings) {
         mContext = context;
         mTransactionState = new TransactionState();
         mServiceId = serviceId;
         mTransactionSettings = settings;
-        mSubId = subId;
     }
 
     /**
@@ -102,10 +100,6 @@ public abstract class Transaction extends Observable {
         return mServiceId;
     }
 
-    public int getSubId() {
-        return mSubId;
-    }
-
     public TransactionSettings getConnectionSettings() {
         return mTransactionSettings;
     }
@@ -183,8 +177,7 @@ public abstract class Transaction extends Observable {
                 pdu, HttpUtils.HTTP_POST_METHOD,
                 mTransactionSettings.isProxySet(),
                 mTransactionSettings.getProxyAddress(),
-                mTransactionSettings.getProxyPort(),
-                mSubId);
+                mTransactionSettings.getProxyPort());
     }
 
     /**
@@ -203,8 +196,7 @@ public abstract class Transaction extends Observable {
                 url, null, HttpUtils.HTTP_GET_METHOD,
                 mTransactionSettings.isProxySet(),
                 mTransactionSettings.getProxyAddress(),
-                mTransactionSettings.getProxyPort(),
-                mSubId);
+                mTransactionSettings.getProxyPort());
     }
 
     /**
diff --git a/src/com/android/mms/transaction/TransactionService.java b/src/com/android/mms/transaction/TransactionService.java
index b07d984c..d7c53660 100644
--- a/src/com/android/mms/transaction/TransactionService.java
+++ b/src/com/android/mms/transaction/TransactionService.java
@@ -42,8 +42,6 @@ import android.provider.Telephony.Mms;
 import android.provider.Telephony.MmsSms;
 import android.provider.Telephony.Mms.Sent;
 import android.provider.Telephony.MmsSms.PendingMessages;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@@ -56,7 +54,6 @@ import com.android.mms.R;
 import com.android.mms.ui.ComposeMessageActivity;
 import com.android.mms.util.DownloadManager;
 import com.android.mms.util.RateController;
-import com.android.mms.util.SubStatusResolver;
 
 import com.google.android.mms.pdu.GenericPdu;
 import com.google.android.mms.pdu.NotificationInd;
@@ -152,7 +149,6 @@ public class TransactionService extends Service implements Observer {
     private ConnectivityBroadcastReceiver mReceiver;
 
     private PowerManager.WakeLock mWakeLock;
-    private int mMmsDatasubId = SubscriptionManager.INVALID_SUB_ID;
 
     public Handler mToastHandler = new Handler() {
         @Override
@@ -207,15 +203,15 @@ public class TransactionService extends Service implements Observer {
     }
 
     public void onNewIntent(Intent intent, int serviceId) {
-        if (!MmsConfig.isSmsEnabled()) {
+        if (!MmsConfig.isSmsEnabled(this)) {
             Log.d(TAG, "TransactionService: is not the default sms app");
             stopSelf(serviceId);
             return;
         }
         mConnMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-        if (mConnMgr == null || !SubStatusResolver.isMobileDataEnabledOnAnySub(getApplicationContext())
-                || !MmsConfig.isSmsEnabled()) {
-            endMmsConnectivity(mMmsDatasubId);
+        if (mConnMgr == null || !mConnMgr.getMobileDataEnabled()
+                || !MmsConfig.isSmsEnabled(getApplicationContext())) {
+            endMmsConnectivity();
             stopSelf(serviceId);
             return;
         }
@@ -254,7 +250,6 @@ public class TransactionService extends Service implements Observer {
                     int columnIndexOfMsgId = cursor.getColumnIndexOrThrow(PendingMessages.MSG_ID);
                     int columnIndexOfMsgType = cursor.getColumnIndexOrThrow(
                             PendingMessages.MSG_TYPE);
-                    int columnIndexOfSubIndex = cursor.getColumnIndexOrThrow(PendingMessages.SUB_ID);
 
                     while (cursor.moveToNext()) {
                         int msgType = cursor.getInt(columnIndexOfMsgType);
@@ -292,6 +287,11 @@ public class TransactionService extends Service implements Observer {
                                     if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                                         Log.v(TAG, "onNewIntent: skipping - autodownload off");
                                     }
+                                    // Re-enable "download" button if auto-download is off
+                                    Uri uri = ContentUris.withAppendedId(Mms.CONTENT_URI,
+                                            cursor.getLong(columnIndexOfMsgId));
+                                    downloadManager.markState(uri,
+                                            DownloadManager.STATE_SKIP_RETRYING);
                                     break;
                                 }
                                 // Logic is twisty. If there's no failure or the failure
@@ -318,7 +318,7 @@ public class TransactionService extends Service implements Observer {
                                 if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                                     Log.v(TAG, "onNewIntent: launchTransaction uri=" + uri);
                                 }
-                                launchTransaction(serviceId, args, false, cursor.getInt(columnIndexOfSubIndex));
+                                launchTransaction(serviceId, args, false);
                                 break;
                         }
                     }
@@ -337,16 +337,8 @@ public class TransactionService extends Service implements Observer {
                 Log.v(TAG, "onNewIntent: launch transaction...");
             }
             // For launching NotificationTransaction and test purpose.
-            TransactionBundle args = new TransactionBundle(intent.getIntExtra(
-                    TransactionBundle.TRANSACTION_TYPE, Transaction.READREC_TRANSACTION),
-                    intent.getStringExtra(TransactionBundle.URI));
-            int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
-                    SubscriptionManager.INVALID_SUB_ID);
-            if (!SubscriptionManager.isValidSubId(subId)) {
-                Log.e(TAG, "onNewIntent subId error, " + args.toString());
-            } else {
-                launchTransaction(serviceId, args, noNetwork, subId);
-            }
+            TransactionBundle args = new TransactionBundle(intent.getExtras());
+            launchTransaction(serviceId, args, noNetwork);
         }
     }
 
@@ -380,7 +372,7 @@ public class TransactionService extends Service implements Observer {
         }
     }
 
-    private void launchTransaction(int serviceId, TransactionBundle txnBundle, boolean noNetwork, int subId) {
+    private void launchTransaction(int serviceId, TransactionBundle txnBundle, boolean noNetwork) {
         if (noNetwork) {
             Log.w(TAG, "launchTransaction: no network error!");
             onNetworkUnavailable(serviceId, txnBundle.getTransactionType());
@@ -388,11 +380,6 @@ public class TransactionService extends Service implements Observer {
         }
         Message msg = mServiceHandler.obtainMessage(EVENT_TRANSACTION_REQUEST);
         msg.arg1 = serviceId;
-        if (subId <= Long.MAX_VALUE) {
-            msg.arg2 = (int) subId & 0xFFFFFFFF;
-        } else {
-            Log.e(TAG, "launchTransaction: subId is too large, impossible!!!");
-        }
         msg.obj = txnBundle;
 
         if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
@@ -466,7 +453,7 @@ public class TransactionService extends Service implements Observer {
                     if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                         Log.v(TAG, "update: endMmsConnectivity");
                     }
-                    endMmsConnectivity(transaction.getSubId());
+                    endMmsConnectivity();
                 } else {
                     if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                         Log.v(TAG, "update: mProcessing is not empty");
@@ -497,8 +484,7 @@ public class TransactionService extends Service implements Observer {
                                     this, state.getContentUri());
                             MessagingNotification.blockingUpdateNewMessageIndicator(this,
                                     threadId,
-                                    false,
-                                    null);
+                                    false);
                             MessagingNotification.updateDownloadFailedNotification(this);
                             break;
                         case Transaction.SEND_TRANSACTION:
@@ -554,16 +540,15 @@ public class TransactionService extends Service implements Observer {
         }
     }
 
-    protected int beginMmsConnectivity(int subId) throws IOException {
+    protected int beginMmsConnectivity() throws IOException {
         if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
-            Log.v(TAG, "beginMmsConnectivity, subId = " + subId);
+            Log.v(TAG, "beginMmsConnectivity");
         }
         // Take a wake lock so we don't fall asleep before the message is downloaded.
         createWakeLock();
-        mMmsDatasubId = subId;
 
         int result = mConnMgr.startUsingNetworkFeature(
-                /* TODO subId,*/ ConnectivityManager.TYPE_MOBILE, Phone.FEATURE_ENABLE_MMS);
+                ConnectivityManager.TYPE_MOBILE, Phone.FEATURE_ENABLE_MMS);
 
         if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
             Log.v(TAG, "beginMmsConnectivity: result=" + result);
@@ -579,16 +564,16 @@ public class TransactionService extends Service implements Observer {
         throw new IOException("Cannot establish MMS connectivity");
     }
 
-    protected void endMmsConnectivity(int subId) {
+    protected void endMmsConnectivity() {
         try {
             if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                 Log.v(TAG, "endMmsConnectivity");
             }
+
             // cancel timer for renewal of lease
             mServiceHandler.removeMessages(EVENT_CONTINUE_MMS_CONNECTIVITY);
             if (mConnMgr != null) {
                 mConnMgr.stopUsingNetworkFeature(
-                        /* TODO subId, */
                         ConnectivityManager.TYPE_MOBILE,
                         Phone.FEATURE_ENABLE_MMS);
             }
@@ -664,7 +649,7 @@ public class TransactionService extends Service implements Observer {
                     }
 
                     try {
-                        int result = beginMmsConnectivity(msg.arg2);
+                        int result = beginMmsConnectivity();
                         if (result != PhoneConstants.APN_ALREADY_ACTIVE) {
                             Log.v(TAG, "Extending MMS connectivity returned " + result +
                                     " instead of APN_ALREADY_ACTIVE");
@@ -678,20 +663,18 @@ public class TransactionService extends Service implements Observer {
                     }
 
                     // Restart timer
-                    renewMmsConnectivity(msg.arg2);
+                    renewMmsConnectivity();
                     return;
 
                 case EVENT_TRANSACTION_REQUEST:
                     int serviceId = msg.arg1;
-                    int subId = msg.arg2;
                     try {
                         TransactionBundle args = (TransactionBundle) msg.obj;
                         TransactionSettings transactionSettings;
 
                         if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                             Log.v(TAG, "EVENT_TRANSACTION_REQUEST MmscUrl=" +
-                                    args.getMmscUrl() + " proxy port: " + args.getProxyAddress() +
-                                    " subId = " + subId);
+                                    args.getMmscUrl() + " proxy port: " + args.getProxyAddress());
                         }
 
                         // Set the connection settings for this transaction.
@@ -702,7 +685,7 @@ public class TransactionService extends Service implements Observer {
                                     mmsc, args.getProxyAddress(), args.getProxyPort());
                         } else {
                             transactionSettings = new TransactionSettings(
-                                                    TransactionService.this, null, subId);
+                                                    TransactionService.this, null);
                         }
 
                         int transactionType = args.getTransactionType();
@@ -719,7 +702,7 @@ public class TransactionService extends Service implements Observer {
                                 if (uri != null) {
                                     transaction = new NotificationTransaction(
                                             TransactionService.this, serviceId,
-                                            transactionSettings, uri, subId);
+                                            transactionSettings, uri);
                                 } else {
                                     // Now it's only used for test purpose.
                                     byte[] pushData = args.getPushData();
@@ -730,7 +713,7 @@ public class TransactionService extends Service implements Observer {
                                     if ((ind != null) && (ind.getMessageType() == type)) {
                                         transaction = new NotificationTransaction(
                                                 TransactionService.this, serviceId,
-                                                transactionSettings, (NotificationInd) ind, subId);
+                                                transactionSettings, (NotificationInd) ind);
                                     } else {
                                         Log.e(TAG, "Invalid PUSH data.");
                                         transaction = null;
@@ -741,17 +724,17 @@ public class TransactionService extends Service implements Observer {
                             case Transaction.RETRIEVE_TRANSACTION:
                                 transaction = new RetrieveTransaction(
                                         TransactionService.this, serviceId,
-                                        transactionSettings, args.getUri(), subId);
+                                        transactionSettings, args.getUri());
                                 break;
                             case Transaction.SEND_TRANSACTION:
                                 transaction = new SendTransaction(
                                         TransactionService.this, serviceId,
-                                        transactionSettings, args.getUri(), subId);
+                                        transactionSettings, args.getUri());
                                 break;
                             case Transaction.READREC_TRANSACTION:
                                 transaction = new ReadRecTransaction(
                                         TransactionService.this, serviceId,
-                                        transactionSettings, args.getUri(), subId);
+                                        transactionSettings, args.getUri());
                                 break;
                             default:
                                 Log.w(TAG, "Invalid transaction type: " + serviceId);
@@ -759,7 +742,7 @@ public class TransactionService extends Service implements Observer {
                                 return;
                         }
 
-                        if (!processTransaction(transaction, false)) {
+                        if (!processTransaction(transaction)) {
                             transaction = null;
                             return;
                         }
@@ -791,13 +774,13 @@ public class TransactionService extends Service implements Observer {
                             if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                                 Log.v(TAG, "Transaction was null. Stopping self: " + serviceId);
                             }
-                            endMmsConnectivity(subId);
+                            endMmsConnectivity();
                             stopSelf(serviceId);
                         }
                     }
                     return;
                 case EVENT_HANDLE_NEXT_PENDING_TRANSACTION:
-                    processPendingTransaction(transaction, (TransactionSettings) msg.obj, false);
+                    processPendingTransaction(transaction, (TransactionSettings) msg.obj);
                     return;
                 default:
                     Log.w(TAG, "what=" + msg.what);
@@ -805,33 +788,29 @@ public class TransactionService extends Service implements Observer {
             }
         }
 
-        public void markAllPendingTransactionsAsFailed(int subId) {
+        public void markAllPendingTransactionsAsFailed() {
             synchronized (mProcessing) {
-                ArrayList<Transaction> pendingList = (ArrayList<Transaction>) mPending.clone();
-                for (Transaction transaction : pendingList) {
-                    if (subId == transaction.getSubId()) {
-                        mPending.remove(transaction);
-                        transaction.mTransactionState.setState(TransactionState.FAILED);
-                        if (transaction instanceof SendTransaction) {
-                            Uri uri = ((SendTransaction)transaction).mSendReqURI;
-                            transaction.mTransactionState.setContentUri(uri);
-                            int respStatus = PduHeaders.RESPONSE_STATUS_ERROR_NETWORK_PROBLEM;
-                            ContentValues values = new ContentValues(1);
-                            values.put(Mms.RESPONSE_STATUS, respStatus);
-
-                            SqliteWrapper.update(TransactionService.this,
-                                    TransactionService.this.getContentResolver(),
-                                    uri, values, null, null);
-                        }
-                        transaction.notifyObservers();
+                while (mPending.size() != 0) {
+                    Transaction transaction = mPending.remove(0);
+                    transaction.mTransactionState.setState(TransactionState.FAILED);
+                    if (transaction instanceof SendTransaction) {
+                        Uri uri = ((SendTransaction)transaction).mSendReqURI;
+                        transaction.mTransactionState.setContentUri(uri);
+                        int respStatus = PduHeaders.RESPONSE_STATUS_ERROR_NETWORK_PROBLEM;
+                        ContentValues values = new ContentValues(1);
+                        values.put(Mms.RESPONSE_STATUS, respStatus);
+
+                        SqliteWrapper.update(TransactionService.this,
+                                TransactionService.this.getContentResolver(),
+                                uri, values, null, null);
                     }
+                    transaction.notifyObservers();
                 }
             }
         }
 
         public void processPendingTransaction(Transaction transaction,
-                                               TransactionSettings settings,
-                                               boolean isConnected) {
+                                               TransactionSettings settings) {
 
             if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                 Log.v(TAG, "processPendingTxn: transaction=" + transaction);
@@ -845,15 +824,6 @@ public class TransactionService extends Service implements Observer {
                 numProcessTransaction = mProcessing.size();
             }
 
-            // have multi SIM cards, so must stop connection and reconnect
-            // before send another MMS if subId is different
-            if (numProcessTransaction == 0
-                    && (transaction == null || mMmsDatasubId != transaction.getSubId())) {
-                if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
-                    Log.v(TAG, "processPendingTxn: no more transaction, endMmsConnectivity");
-                }
-                endMmsConnectivity(mMmsDatasubId);
-            }
             if (transaction != null) {
                 if (settings != null) {
                     transaction.setConnectionSettings(settings);
@@ -869,7 +839,7 @@ public class TransactionService extends Service implements Observer {
                         Log.v(TAG, "processPendingTxn: process " + serviceId);
                     }
 
-                    if (processTransaction(transaction, isConnected)) {
+                    if (processTransaction(transaction)) {
                         if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                             Log.v(TAG, "Started deferred processing of transaction  "
                                     + transaction);
@@ -881,6 +851,13 @@ public class TransactionService extends Service implements Observer {
                 } catch (IOException e) {
                     Log.w(TAG, e.getMessage(), e);
                 }
+            } else {
+                if (numProcessTransaction == 0) {
+                    if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
+                        Log.v(TAG, "processPendingTxn: no more transaction, endMmsConnectivity");
+                    }
+                    endMmsConnectivity();
+                }
             }
         }
 
@@ -892,8 +869,7 @@ public class TransactionService extends Service implements Observer {
          * @throws IOException if connectivity for MMS traffic could not be
          * established.
          */
-        private boolean processTransaction(Transaction transaction, boolean isConnected)
-                throws IOException {
+        private boolean processTransaction(Transaction transaction) throws IOException {
             // Check if transaction already processing
             synchronized (mProcessing) {
                 for (Transaction t : mPending) {
@@ -915,26 +891,15 @@ public class TransactionService extends Service implements Observer {
                 }
 
                 /*
-                 * Because there are multiple SIM cards, for send Mms by sequentially,
-                 * we call beginMmsConnectivity one by one
-                 */
-                if (!isConnected && (mProcessing.size() > 0 || mPending.size() > 0)) {
-                    Log.v(TAG, "processTransaction: already have 1 transaction in mProcessing list");
-                    mPending.add(transaction);
-                    return true;
-                }
-
-                /*
                 * Make sure that the network connectivity necessary
                 * for MMS traffic is enabled. If it is not, we need
                 * to defer processing the transaction until
                 * connectivity is established.
                 */
                 if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
-                    Log.v(TAG, "processTransaction: call beginMmsConnectivity..., subId = "
-                            + transaction.getSubId());
+                    Log.v(TAG, "processTransaction: call beginMmsConnectivity...");
                 }
-                int connectivityResult = beginMmsConnectivity(transaction.getSubId());
+                int connectivityResult = beginMmsConnectivity();
                 if (connectivityResult == PhoneConstants.APN_REQUEST_STARTED) {
                     mPending.add(transaction);
                     if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
@@ -943,16 +908,28 @@ public class TransactionService extends Service implements Observer {
                     }
                     return true;
                 }
-
-                if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
-                    Log.v(TAG, "Adding transaction to 'mProcessing' list: " + transaction);
-                }
-                mProcessing.add(transaction);
+                // If there is already a transaction in processing list, because of the previous
+                // beginMmsConnectivity call and there is another transaction just at a time,
+                // when the pdp is connected, there will be a case of adding the new transaction
+                // to the Processing list. But Processing list is never traversed to
+                // resend, resulting in transaction not completed/sent.
+                if (mProcessing.size() > 0) {
+                    if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
+                        Log.v(TAG, "Adding transaction to 'mPending' list: " + transaction);
+                    }
+                    mPending.add(transaction);
+                    return true;
+                } else {
+                    if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
+                        Log.v(TAG, "Adding transaction to 'mProcessing' list: " + transaction);
+                    }
+                    mProcessing.add(transaction);
+               }
             }
 
             // Set a timer to keep renewing our "lease" on the MMS connection
-            sendMessageDelayed(obtainMessage(EVENT_CONTINUE_MMS_CONNECTIVITY, 0,
-                    (int) (transaction.getSubId() & 0xFFFFFFFF)), APN_EXTENSION_WAIT);
+            sendMessageDelayed(obtainMessage(EVENT_CONTINUE_MMS_CONNECTIVITY),
+                               APN_EXTENSION_WAIT);
 
             if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                 Log.v(TAG, "processTransaction: starting transaction " + transaction);
@@ -965,63 +942,28 @@ public class TransactionService extends Service implements Observer {
         }
     }
 
-    private void renewMmsConnectivity(int subId) {
+    private void renewMmsConnectivity() {
         // Set a timer to keep renewing our "lease" on the MMS connection
         mServiceHandler.sendMessageDelayed(
-                mServiceHandler.obtainMessage(EVENT_CONTINUE_MMS_CONNECTIVITY, 0,
-                        (int) subId & 0xFFFFFFFF),
-                        APN_EXTENSION_WAIT);
+                mServiceHandler.obtainMessage(EVENT_CONTINUE_MMS_CONNECTIVITY),
+                           APN_EXTENSION_WAIT);
     }
 
     private class ConnectivityBroadcastReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
-            int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
-                    SubscriptionManager.getDefaultSmsSubId());
             if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
-                Log.w(TAG, "ConnectivityBroadcastReceiver.onReceive() action: " + action +
-                        " subId: " + subId);
-            }
-            if (!action.equals(ConnectivityManager.CONNECTIVITY_ACTION)
-                    || !SubscriptionManager.isValidSubId(subId)) {
-                if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
-                    Log.v(TAG, "onReceive: bailing because of non-valid subId: " + subId);
-                }
-                return;
-            }
-
-            Transaction lastTransaction = null;
-            synchronized (mProcessing) {
-                if (!mProcessing.isEmpty()) {
-                    lastTransaction = mProcessing.get(0);
-                }
-            }
-            if (lastTransaction == null && !mPending.isEmpty()) {
-                lastTransaction = mPending.get(0);
+                Log.w(TAG, "ConnectivityBroadcastReceiver.onReceive() action: " + action);
             }
 
-            if (lastTransaction != null) {
-                if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
-                    Log.v(TAG, "ConnectivityBroadcastReceiver, transaction = " + lastTransaction
-                            + ", subId = " + subId);
-                }
-            }
-
-            if (lastTransaction == null
-                    || (TelephonyManager.getDefault().getSimCount() > 1
-                            && subId != lastTransaction.getSubId())) {
-                if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
-                    Log.v(TAG, "ConnectivityBroadcastReceiver is not for current, subId = "
-                            + subId);
-                }
+            if (!action.equals(ConnectivityManager.CONNECTIVITY_ACTION)) {
                 return;
             }
 
             NetworkInfo mmsNetworkInfo = null;
 
-            if (mConnMgr != null && SubStatusResolver
-                    .isMobileDataEnabledOnAnySub(getApplicationContext())) {
+            if (mConnMgr != null && mConnMgr.getMobileDataEnabled()) {
                 mmsNetworkInfo = mConnMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE_MMS);
             } else {
                 if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
@@ -1053,26 +995,22 @@ public class TransactionService extends Service implements Observer {
                         Log.v(TAG, "   reason is " + Phone.REASON_VOICE_CALL_ENDED +
                                 ", retrying mms connectivity");
                     }
-                    renewMmsConnectivity(subId);
+                    renewMmsConnectivity();
                     return;
                 }
 
                 if (mmsNetworkInfo.isConnected()) {
                     TransactionSettings settings = new TransactionSettings(
-                            TransactionService.this, mmsNetworkInfo.getExtraInfo(), subId);
+                            TransactionService.this, mmsNetworkInfo.getExtraInfo());
                     // If this APN doesn't have an MMSC, mark everything as failed and bail.
                     if (TextUtils.isEmpty(settings.getMmscUrl())) {
                         Log.v(TAG, "   empty MMSC url, bail");
                         mToastHandler.sendEmptyMessage(TOAST_NO_APN);
-                        mServiceHandler.markAllPendingTransactionsAsFailed(subId);
-                        endMmsConnectivity(subId);
+                        mServiceHandler.markAllPendingTransactionsAsFailed();
+                        endMmsConnectivity();
                         return;
                     }
-                    // When a transaction is processing, no need process a new
-                    // transaction from pending list
-                    if (mProcessing.isEmpty()) {
-                        mServiceHandler.processPendingTransaction(null, settings, true);
-                    }
+                    mServiceHandler.processPendingTransaction(null, settings);
                 } else {
                     if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                         Log.v(TAG, "   TYPE_MOBILE_MMS not connected, bail");
@@ -1083,7 +1021,7 @@ public class TransactionService extends Service implements Observer {
                         if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                             Log.v(TAG, "   retrying mms connectivity for it's available");
                         }
-                        renewMmsConnectivity(subId);
+                        renewMmsConnectivity();
                     }
                 }
             }
diff --git a/src/com/android/mms/transaction/TransactionSettings.java b/src/com/android/mms/transaction/TransactionSettings.java
index f5ccef2f..ce6ab7d9 100755..100644
--- a/src/com/android/mms/transaction/TransactionSettings.java
+++ b/src/com/android/mms/transaction/TransactionSettings.java
@@ -24,7 +24,6 @@ import android.net.NetworkUtils;
 import android.provider.Telephony;
 import android.text.TextUtils;
 import android.util.Log;
-import android.net.Uri;
 
 import com.android.internal.telephony.PhoneConstants;
 import com.android.mms.LogTag;
@@ -59,24 +58,20 @@ public class TransactionSettings {
      *
      * @param context The context of the MMS Client
      */
-    public TransactionSettings(Context context, String apnName, long subIndex) {
+    public TransactionSettings(Context context, String apnName) {
         if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
             Log.v(TAG, "TransactionSettings: apnName: " + apnName);
         }
-
-        // FIXME This code is workaround to make MMS work on both subscriptions.
-        // The actual fix may be in frameworks/opt git project.
-        // String selection = Telephony.Carriers.CURRENT + " IS NOT NULL";
-        String selection = "";
+        String selection = Telephony.Carriers.CURRENT + " IS NOT NULL";
         String[] selectionArgs = null;
         if (!TextUtils.isEmpty(apnName)) {
-            selection += Telephony.Carriers.APN + "=?";
+            selection += " AND " + Telephony.Carriers.APN + "=?";
             selectionArgs = new String[]{ apnName.trim() };
         }
 
         Cursor cursor = SqliteWrapper.query(context, context.getContentResolver(),
-                    Uri.withAppendedPath(Telephony.Carriers.CONTENT_URI, "/subId/" + subIndex),
-                    APN_PROJECTION, selection, selectionArgs, null);
+                            Telephony.Carriers.CONTENT_URI,
+                            APN_PROJECTION, selection, selectionArgs, null);
 
         if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
             Log.v(TAG, "TransactionSettings looking for apn: " + selection + " returned: " +
diff --git a/src/com/android/mms/ui/AttachmentTypeSelectorAdapter.java b/src/com/android/mms/ui/AttachmentTypeSelectorAdapter.java
index 48448754..5831d6f9 100644
--- a/src/com/android/mms/ui/AttachmentTypeSelectorAdapter.java
+++ b/src/com/android/mms/ui/AttachmentTypeSelectorAdapter.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import android.content.Context;
-import android.telephony.SmsManager;
 
 import com.android.mms.MmsConfig;
 import com.android.mms.R;
@@ -44,7 +43,7 @@ public class AttachmentTypeSelectorAdapter extends IconListAdapter {
     public AttachmentTypeSelectorAdapter(Context context, int mode) {
         super(context, getData(mode, context));
     }
-
+    
     public int buttonToCommand(int whichButton) {
         AttachmentListItem item = (AttachmentListItem)getItem(whichButton);
         return item.getCommand();
@@ -64,7 +63,7 @@ public class AttachmentTypeSelectorAdapter extends IconListAdapter {
         addItem(data, context.getString(R.string.attach_record_video),
                 R.drawable.ic_attach_capture_video_holo_light, RECORD_VIDEO);
 
-        if (MmsConfig.getBoolean(SmsManager.MMS_CONFIG_ALLOW_ATTACH_AUDIO)) {
+        if (MmsConfig.getAllowAttachAudio()) {
             addItem(data, context.getString(R.string.attach_sound),
                     R.drawable.ic_attach_audio_holo_light, ADD_SOUND);
         }
@@ -85,7 +84,7 @@ public class AttachmentTypeSelectorAdapter extends IconListAdapter {
         AttachmentListItem temp = new AttachmentListItem(title, resource, command);
         data.add(temp);
     }
-
+    
     public static class AttachmentListItem extends IconListAdapter.IconListItem {
         private int mCommand;
 
diff --git a/src/com/android/mms/ui/BackgroundImageSpan.java b/src/com/android/mms/ui/BackgroundImageSpan.java
deleted file mode 100755
index cb390f2c..00000000
--- a/src/com/android/mms/ui/BackgroundImageSpan.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-package com.android.mms.ui;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Bitmap;
-import android.graphics.Paint;
-import android.graphics.Paint.FontMetricsInt;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.Parcel;
-import android.text.ParcelableSpan;
-import android.text.style.ReplacementSpan;
-import android.text.SpannableStringBuilder;
-import android.text.TextPaint;
-import android.util.Log;
-
-/**
- * combine ImageSpan and BackgroundColorSpan,
- * make this a ReplacementSpan as to make do not break the text and NOT effect by the bidi algorithmss
- */
-public class BackgroundImageSpan extends ReplacementSpan implements ParcelableSpan {
-    private static final String TAG = "BackgroundImageSpan";
-    private Bitmap mBitmap;
-    private Drawable mDrawable;
-    private int mWidth = -1;
-
-    /**
-     * new BackgroundImageSpan use resource id and Drawable
-     * @param id the drawable resource id
-     * @param drawable Drawable related to the id
-     * @internal
-     * @hide
-     */
-    public BackgroundImageSpan(Drawable drawable) {
-        mDrawable = drawable;
-    }
-
-    /**
-     * @hide
-     * @internal
-     */
-    public BackgroundImageSpan(Parcel src) {
-        mBitmap = Bitmap.CREATOR.createFromParcel(src);
-    }
-
-    /**
-     * @hide
-     * @internal
-     */
-    public void draw(Canvas canvas, int width,float x,int top, int y, int bottom, Paint paint) {
-        if (mDrawable == null) {//if no backgroundImage just don't do any draw
-            Log.e(TAG, "mDrawable is null draw()");
-            return;
-        }
-        Drawable drawable = mDrawable;
-        canvas.save();
-
-        canvas.translate(x, top); // translate to the left top point
-        mDrawable.setBounds(0, 0, width, (bottom - top));
-        drawable.draw(canvas);
-        canvas.restore();
-    }
-
-    @Override
-    public void updateDrawState(TextPaint tp) {
-    }
-
-    /**
-     * return a special type identifier for this span class
-     * @hide
-     * @internal
-     * @Override
-     */
-    public int getSpanTypeId() {
-        return 0;
-    }
-
-    /**
-     * describe the kinds of special objects contained in this Parcelable's marshalled representation
-     * @hide
-     * @internal
-     * @Override
-     */
-    public int describeContents() {
-        return 0;
-    }
-
-    /**
-     * flatten this object in to a Parcel
-     * @hide
-     * @internal
-     * @Override
-     */
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeParcelable(mBitmap, flags);
-    }
-
-    /**
-     * @hide
-     * @internal
-     */
-    public void convertToDrawable(Context context) {
-        if (mDrawable == null) {
-            mDrawable = new BitmapDrawable(context.getResources(), mBitmap);
-        }
-    }
-
-    /**
-     * convert a style text that contain BackgroundImageSpan, Parcek only pass resource id,
-     * after Parcel, we need to convert resource id to Drawable.
-     * @hide
-     * @internal
-     */
-    public static void convert(CharSequence text , Context context) {
-        if (!(text instanceof SpannableStringBuilder)) {
-            return;
-        }
-        SpannableStringBuilder builder = (SpannableStringBuilder)text;
-        BackgroundImageSpan[] spans = builder.getSpans(0, text.length(), BackgroundImageSpan.class);
-        if (spans == null || spans.length == 0) {
-            return;
-        }
-        for (int i = 0; i < spans.length; i++) {
-            spans[i].convertToDrawable(context);
-        }
-    }
-
-    /**
-     * draw the span
-     * @hide
-     * @internal
-     * @Override
-     */
-    public void draw(Canvas canvas, CharSequence text, int start, int end, float x, int top, int y, int bottom, Paint paint) {
-        // draw image
-        draw(canvas, mWidth,x,top, y, bottom, paint);
-        // draw text
-        // the paint is already updated
-        canvas.drawText(text,start,end, x,y, paint);
-    }
-
-    /**
-     * get size of the span
-     * @hide
-     * @internal
-     * @Override
-     */
-    public int getSize(Paint paint, CharSequence text, int start, int end,
-            FontMetricsInt fm) {
-        float size = paint.measureText(text, start, end);
-        if (fm != null && paint != null) {
-            paint.getFontMetricsInt(fm);
-        }
-        mWidth = (int)size;
-        return mWidth;
-    }
-}
diff --git a/src/com/android/mms/ui/ClassZeroActivity.java b/src/com/android/mms/ui/ClassZeroActivity.java
index 0124ff19..61924aea 100644
--- a/src/com/android/mms/ui/ClassZeroActivity.java
+++ b/src/com/android/mms/ui/ClassZeroActivity.java
@@ -32,20 +32,16 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
-import android.provider.Telephony;
 import android.provider.Telephony.Sms;
 import android.provider.Telephony.Sms.Inbox;
 import android.telephony.SmsMessage;
-import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Window;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.mms.LogTag;
 import com.android.mms.R;
 import com.android.mms.transaction.MessagingNotification;
-import com.android.mms.util.SubStatusResolver;
 
 import java.util.ArrayList;
 
@@ -93,10 +89,7 @@ public class ClassZeroActivity extends Activity {
     private boolean queueMsgFromIntent(Intent msgIntent) {
         byte[] pdu = msgIntent.getByteArrayExtra("pdu");
         String format = msgIntent.getStringExtra("format");
-        int subId = msgIntent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
-                SubscriptionManager.INVALID_SUB_ID);
         SmsMessage rawMessage = SmsMessage.createFromPdu(pdu, format);
-        rawMessage.setSubId(subId);
         String message = rawMessage.getMessageBody();
         if (TextUtils.isEmpty(message)) {
             if (mMessageQueue.size() == 0) {
@@ -124,7 +117,6 @@ public class ClassZeroActivity extends Activity {
         } else {
             messageUri = storeMessage(mMessage);
         }
-
         if (!mRead && messageUri != null) {
             MessagingNotification.nonBlockingUpdateNewMessageIndicator(
                     this,
@@ -168,7 +160,7 @@ public class ClassZeroActivity extends Activity {
         /* This'll be used by the save action */
         mMessage = rawMessage;
 
-        mDialog = new AlertDialog.Builder(this, AlertDialog.THEME_HOLO_LIGHT).setMessage(message)
+        mDialog = new AlertDialog.Builder(this, AlertDialog.THEME_HOLO_DARK).setMessage(message)
                 .setPositiveButton(R.string.save, mSaveListener)
                 .setNegativeButton(android.R.string.cancel, mCancelListener)
                 .setCancelable(false).show();
@@ -251,18 +243,15 @@ public class ClassZeroActivity extends Activity {
 
     private Uri replaceMessage(SmsMessage sms) {
         ContentValues values = extractContentValues(sms);
-        int subId = sms.getSubId();
 
         values.put(Inbox.BODY, sms.getMessageBody());
 
         ContentResolver resolver = getContentResolver();
         String originatingAddress = sms.getOriginatingAddress();
         int protocolIdentifier = sms.getProtocolIdentifier();
-        String selection = Sms.ADDRESS + " = ? AND " + Sms.PROTOCOL + " = ? AND "
-                + Sms.SUB_ID + " = ?";
+        String selection = Sms.ADDRESS + " = ? AND " + Sms.PROTOCOL + " = ?";
         String[] selectionArgs = new String[] { originatingAddress,
-                Integer.toString(protocolIdentifier),
-                Long.toString(subId) };
+                Integer.toString(protocolIdentifier) };
 
         Cursor cursor = SqliteWrapper.query(this, resolver, Inbox.CONTENT_URI,
                 REPLACE_PROJECTION, selection, selectionArgs, null);
@@ -285,18 +274,12 @@ public class ClassZeroActivity extends Activity {
 
     private Uri storeMessage(SmsMessage sms) {
         // Store the message in the content provider.
-        int subId = sms.getSubId();
         ContentValues values = extractContentValues(sms);
+        values.put(Inbox.BODY, sms.getDisplayMessageBody());
         ContentResolver resolver = getContentResolver();
         if (false) {
             Log.d(TAG, "storeMessage " + this.toString());
         }
-        return Telephony.Sms.Inbox.addMessage(subId,
-                resolver,
-                values.getAsString(Inbox.ADDRESS),
-                sms.getDisplayMessageBody(),
-                values.getAsString(Inbox.SUBJECT),
-                values.getAsLong(Inbox.DATE),
-                values.getAsInteger(Inbox.READ) > 0);
+        return SqliteWrapper.insert(this, resolver, Inbox.CONTENT_URI, values);
     }
 }
diff --git a/src/com/android/mms/ui/ComposeMessageActivity.java b/src/com/android/mms/ui/ComposeMessageActivity.java
index d4940dfd..cc5bab96 100644
--- a/src/com/android/mms/ui/ComposeMessageActivity.java
+++ b/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -34,8 +34,10 @@ import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Pattern;
 
 import android.app.ActionBar;
@@ -60,6 +62,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SqliteWrapper;
 import android.drm.DrmStore;
+import android.graphics.drawable.Drawable;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -82,12 +85,7 @@ import android.provider.Settings;
 import android.provider.Telephony.Mms;
 import android.provider.Telephony.Sms;
 import android.telephony.PhoneNumberUtils;
-import android.telephony.SmsManager;
 import android.telephony.SmsMessage;
-import android.telephony.SubscriptionListener;
-import android.telephony.TelephonyManager;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
 import android.text.Editable;
 import android.text.InputFilter;
 import android.text.InputFilter.LengthFilter;
@@ -114,7 +112,9 @@ import android.webkit.MimeTypeMap;
 import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.ListView;
+import android.widget.SimpleAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -165,7 +165,7 @@ import com.google.android.mms.pdu.SendReq;
  */
 public class ComposeMessageActivity extends Activity
         implements View.OnClickListener, TextView.OnEditorActionListener,
-        MessageStatusListener, Contact.UpdateListener  {
+        MessageStatusListener, Contact.UpdateListener {
     public static final int REQUEST_CODE_ATTACH_IMAGE     = 100;
     public static final int REQUEST_CODE_TAKE_PICTURE     = 101;
     public static final int REQUEST_CODE_ATTACH_VIDEO     = 102;
@@ -344,60 +344,6 @@ public class ComposeMessageActivity extends Activity
     public final static String THREAD_ID = "thread_id";
     private final static String RECIPIENTS = "recipients";
 
-    private AlertDialog mSubSelectDialog;
-    private int mSelectedSubId = SubscriptionManager.getDefaultSmsSubId();
-    private List<SubscriptionInfo> mSubListInfo = new ArrayList<SubscriptionInfo>();
-    private SubChooseAdapter mSubAdapter;
-
-    private final SubscriptionListener mSubscriptionListener = new SubscriptionListener() {
-        @Override
-        public void onSubscriptionInfoChanged() {
-            if (mSubSelectDialog != null && mSubSelectDialog.isShowing()) {
-                mSubSelectDialog.dismiss();
-            }
-        }
-    };
-
-
-    private void updateSubInfoList() {
-        mSubListInfo.clear();
-        mSubListInfo.addAll(SubscriptionManager.getActiveSubscriptionInfoList());
-    }
-
-    private void showSubSelectedDialog(boolean overridePref) {
-        final int activeSimCount =
-                MessagingPreferenceActivity.getActiveSimCount();
-        if (activeSimCount == 0) {
-            return;
-        } else {
-            if (activeSimCount > 1 &&
-                    (overridePref || MessagingPreferenceActivity.isMultiSimAskEnabled(this))) {
-                // SUB selection, always ask, show select SIM dialog even only 1 SIM
-                // inserted.
-                updateSubInfoList();
-                AlertDialog.Builder b = new AlertDialog.Builder(this);
-                mSubAdapter = new SubChooseAdapter(this, mSubListInfo);
-                b.setTitle(R.string.sub_select_dialog_title);
-                b.setAdapter(mSubAdapter, new DialogInterface.OnClickListener() {
-                    @SuppressWarnings("unchecked")
-                    public final void onClick(DialogInterface dialog, int which) {
-                        SubscriptionInfo subInfoRecord = mSubListInfo.get(which);
-                        if (subInfoRecord != null) {
-                            mSelectedSubId = subInfoRecord.getSubscriptionId();
-                            confirmSendMessageIfNeeded();
-                        }
-                    }
-                });
-                b.setNegativeButton(R.string.subSelect_negative, new CancelSendingListener());
-                mSubSelectDialog = b.create();
-                mSubSelectDialog.show();
-            } else {
-                mSelectedSubId = SubscriptionManager.getDefaultSmsSubId();
-                confirmSendMessageIfNeeded();
-            }
-        }
-    }
-
     @SuppressWarnings("unused")
     public static void log(String logMsg) {
         Thread current = Thread.currentThread();
@@ -423,7 +369,7 @@ public class ComposeMessageActivity extends Activity
             @Override
             public void run() {
                 // This runnable gets run in a background thread.
-                mTempMmsUri = mWorkingMessage.saveAsMms(false, mSelectedSubId);
+                mTempMmsUri = mWorkingMessage.saveAsMms(false);
             }
         }, new Runnable() {
             @Override
@@ -451,7 +397,7 @@ public class ComposeMessageActivity extends Activity
                 }
                 case AttachmentEditor.MSG_SEND_SLIDESHOW: {
                     if (isPreparedForSending()) {
-                        showSubSelectedDialog(false);
+                        ComposeMessageActivity.this.confirmSendMessageIfNeeded();
                     }
                     break;
                 }
@@ -469,7 +415,7 @@ public class ComposeMessageActivity extends Activity
                     break;
 
                 case AttachmentEditor.MSG_REMOVE_ATTACHMENT:
-                    mWorkingMessage.removeAttachment(true, mSelectedSubId);
+                    mWorkingMessage.removeAttachment(true);
                     break;
 
                 default:
@@ -496,7 +442,7 @@ public class ComposeMessageActivity extends Activity
                 @Override
                 public void run() {
                     // This runnable gets run in a background thread.
-                    mTempMmsUri = mWorkingMessage.saveAsMms(false, mSelectedSubId);
+                    mTempMmsUri = mWorkingMessage.saveAsMms(false);
                 }
             }, new Runnable() {
                 @Override
@@ -575,7 +521,7 @@ public class ComposeMessageActivity extends Activity
             // When the subject editor is empty, press "DEL" to hide the input field.
             if ((keyCode == KeyEvent.KEYCODE_DEL) && (mSubjectTextEditor.length() == 0)) {
                 showSubjectEditor(false);
-                mWorkingMessage.setSubject(null, true, mSelectedSubId);
+                mWorkingMessage.setSubject(null, true);
                 return true;
             }
             return false;
@@ -636,15 +582,13 @@ public class ComposeMessageActivity extends Activity
         int msgCount = params[0];
         int remainingInCurrentMessage = params[2];
 
-        if (!MmsConfig.getBoolean(mSelectedSubId, SmsManager.MMS_CONFIG_MULTIPART_SMS_ENABLED)) {
+        if (!MmsConfig.getMultipartSmsEnabled()) {
             // The provider doesn't support multi-part sms's so as soon as the user types
             // an sms longer than one segment, we have to turn the message into an mms.
-            mWorkingMessage.setLengthRequiresMms(msgCount > 1, true, mSelectedSubId);
+            mWorkingMessage.setLengthRequiresMms(msgCount > 1, true);
         } else {
-            int threshold = MmsConfig.getInt(mSelectedSubId,
-                    SmsManager.MMS_CONFIG_SMS_TO_MMS_TEXT_LENGTH_THRESHOLD);
-            mWorkingMessage.setLengthRequiresMms(threshold > 0 && msgCount > threshold, true,
-                    mSelectedSubId);
+            int threshold = MmsConfig.getSmsToMmsTextThreshold();
+            mWorkingMessage.setLengthRequiresMms(threshold > 0 && msgCount > threshold, true);
         }
 
         // Show the counter only if:
@@ -762,10 +706,10 @@ public class ComposeMessageActivity extends Activity
         }
 
         boolean isMms = mWorkingMessage.requiresMms();
-        if (mRecipientsEditor.hasInvalidRecipient(isMms, mSelectedSubId)) {
-            if (mRecipientsEditor.hasValidRecipient(isMms, mSelectedSubId)) {
+        if (mRecipientsEditor.hasInvalidRecipient(isMms)) {
+            if (mRecipientsEditor.hasValidRecipient(isMms)) {
                 String title = getResourcesString(R.string.has_invalid_recipient,
-                        mRecipientsEditor.formatInvalidNumbers(isMms, mSelectedSubId));
+                        mRecipientsEditor.formatInvalidNumbers(isMms));
                 new AlertDialog.Builder(this)
                     .setTitle(title)
                     .setMessage(R.string.invalid_recipient_message)
@@ -783,9 +727,8 @@ public class ComposeMessageActivity extends Activity
         } else {
             // The recipients editor is still open. Make sure we use what's showing there
             // as the destination.
-            ContactList contacts = mRecipientsEditor.constructContactsFromInput(false,
-                    mSelectedSubId);
-            mDebugRecipients = contacts.serialize(mSelectedSubId);
+            ContactList contacts = mRecipientsEditor.constructContactsFromInput(false);
+            mDebugRecipients = contacts.serialize();
             sendMessage(true);
         }
     }
@@ -828,8 +771,8 @@ public class ComposeMessageActivity extends Activity
             mWorkingMessage.setWorkingRecipients(numbers);
             boolean multiRecipients = numbers != null && numbers.size() > 1;
             mMsgListAdapter.setIsGroupConversation(multiRecipients);
-            mWorkingMessage.setHasMultipleRecipients(multiRecipients, true, mSelectedSubId);
-            mWorkingMessage.setHasEmail(mRecipientsEditor.containsEmail(), true, mSelectedSubId);
+            mWorkingMessage.setHasMultipleRecipients(multiRecipients, true);
+            mWorkingMessage.setHasEmail(mRecipientsEditor.containsEmail(), true);
 
             checkForTooManyRecipients();
 
@@ -841,8 +784,7 @@ public class ComposeMessageActivity extends Activity
                     continue;
 
                 if (c == ',') {
-                    ContactList contacts = mRecipientsEditor.constructContactsFromInput(false,
-                            mSelectedSubId);
+                    ContactList contacts = mRecipientsEditor.constructContactsFromInput(false);
                     updateTitle(contacts);
                 }
 
@@ -855,8 +797,7 @@ public class ComposeMessageActivity extends Activity
     };
 
     private void checkForTooManyRecipients() {
-        final int recipientLimit =
-                MmsConfig.getInt(mSelectedSubId, SmsManager.MMS_CONFIG_RECIPIENT_LIMIT);
+        final int recipientLimit = MmsConfig.getRecipientLimit();
         if (recipientLimit != Integer.MAX_VALUE && recipientLimit > 0) {
             final int recipientCount = recipientCount();
             boolean tooMany = recipientCount > recipientLimit;
@@ -1088,7 +1029,7 @@ public class ComposeMessageActivity extends Activity
     }
 
     private Uri getContactUriForPhoneNumber(String phoneNumber) {
-        Contact contact = Contact.get(phoneNumber, false, mSelectedSubId);
+        Contact contact = Contact.get(phoneNumber, false);
         if (contact.existsInDatabase()) {
             return contact.getUri();
         }
@@ -1244,8 +1185,7 @@ public class ComposeMessageActivity extends Activity
 
     private void editMmsMessageItem(MessageItem msgItem) {
         // Load the selected message in as the working message.
-        WorkingMessage newWorkingMessage = WorkingMessage.load(this, msgItem.mMessageUri,
-                mSelectedSubId);
+        WorkingMessage newWorkingMessage = WorkingMessage.load(this, msgItem.mMessageUri);
         if (newWorkingMessage == null) {
             return;
         }
@@ -1254,14 +1194,14 @@ public class ComposeMessageActivity extends Activity
         mWorkingMessage.discard();
 
         mWorkingMessage = newWorkingMessage;
-        mWorkingMessage.setConversation(mConversation, mSelectedSubId);
+        mWorkingMessage.setConversation(mConversation);
 
         drawTopPanel(false);
 
         // WorkingMessage.load() above only loads the slideshow. Set the
         // subject here because we already know what it is and avoid doing
         // another DB lookup in load() just to get it.
-        mWorkingMessage.setSubject(msgItem.mSubject, false, mSelectedSubId);
+        mWorkingMessage.setSubject(msgItem.mSubject, false);
 
         if (mWorkingMessage.hasSubject()) {
             showSubjectEditor(true);
@@ -1300,8 +1240,7 @@ public class ComposeMessageActivity extends Activity
                         // Copy the parts of the message here.
                         mTempMmsUri = persister.persist(sendReq, Mms.Draft.CONTENT_URI, true,
                                 MessagingPreferenceActivity
-                                    .getIsGroupMmsEnabled(ComposeMessageActivity.this,
-                                            mSelectedSubId), null);
+                                    .getIsGroupMmsEnabled(ComposeMessageActivity.this), null);
                         mTempThreadId = MessagingNotification.getThreadId(
                                 ComposeMessageActivity.this, mTempMmsUri);
                     } catch (MmsException e) {
@@ -1824,7 +1763,7 @@ public class ComposeMessageActivity extends Activity
                 break;
             }
         }
-        mDebugRecipients = list.serialize(mSelectedSubId);
+        mDebugRecipients = list.serialize();
 
         ActionBar actionBar = getActionBar();
         actionBar.setTitle(title);
@@ -1888,7 +1827,7 @@ public class ComposeMessageActivity extends Activity
             public void onFocusChange(View v, boolean hasFocus) {
                 if (!hasFocus) {
                     RecipientsEditor editor = (RecipientsEditor) v;
-                    ContactList contacts = editor.constructContactsFromInput(false, mSelectedSubId);
+                    ContactList contacts = editor.constructContactsFromInput(false);
                     updateTitle(contacts);
                 }
             }
@@ -1925,7 +1864,7 @@ public class ComposeMessageActivity extends Activity
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        mIsSmsEnabled = MmsConfig.isSmsEnabled();
+        mIsSmsEnabled = MmsConfig.isSmsEnabled(this);
         super.onCreate(savedInstanceState);
 
         resetConfiguration(getResources().getConfiguration());
@@ -1944,10 +1883,6 @@ public class ComposeMessageActivity extends Activity
         if (TRACE) {
             android.os.Debug.startMethodTracing("compose");
         }
-        // Register for SubscriptionInfo list changes which is guaranteed
-        // to invoke onSubscriptionInfoChanged the first time.
-        SubscriptionManager.register(getBaseContext(), mSubscriptionListener,
-                SubscriptionListener.LISTEN_SUBSCRIPTION_INFO_LIST_CHANGED);
     }
 
     private void showSubjectEditor(boolean show) {
@@ -1963,8 +1898,7 @@ public class ComposeMessageActivity extends Activity
             }
             mSubjectTextEditor = (EditText)findViewById(R.id.subject);
             mSubjectTextEditor.setFilters(new InputFilter[] {
-                    new LengthFilter(MmsConfig.getInt(mSelectedSubId,
-                            SmsManager.MMS_CONFIG_SUBJECT_MAX_LENGTH))});
+                    new LengthFilter(MmsConfig.getMaxSubjectLength())});
         }
 
         mSubjectTextEditor.setOnKeyListener(show ? mSubjectKeyListener : null);
@@ -1996,7 +1930,7 @@ public class ComposeMessageActivity extends Activity
         if (LogTag.SEVERE_WARNING && originalThreadId != 0 &&
                 originalThreadId == mConversation.getThreadId()) {
             LogTag.warnPossibleRecipientMismatch("ComposeMessageActivity.initialize: " +
-                    " threadId didn't change from: " + originalThreadId, this, mSelectedSubId);
+                    " threadId didn't change from: " + originalThreadId, this);
         }
 
         log("savedInstanceState = " + savedInstanceState +
@@ -2026,7 +1960,7 @@ public class ComposeMessageActivity extends Activity
         }
 
         // Let the working message know what conversation it belongs to
-        mWorkingMessage.setConversation(mConversation, mSelectedSubId);
+        mWorkingMessage.setConversation(mConversation);
 
         // Show the recipients editor if we don't have a valid thread. Hide it otherwise.
         if (mConversation.getThreadId() <= 0) {
@@ -2090,7 +2024,7 @@ public class ComposeMessageActivity extends Activity
                 // We've got a draft. Make sure the working recipients are synched
                 // to the conversation so when we compare conversations later in this function,
                 // the compare will work.
-                mWorkingMessage.syncWorkingRecipients(mSelectedSubId);
+                mWorkingMessage.syncWorkingRecipients();
             }
             // Get the "real" conversation based on the intentUri. The intentUri might specify
             // the conversation by a phone number or by a thread id. We'll typically get a threadId
@@ -2101,7 +2035,7 @@ public class ComposeMessageActivity extends Activity
             // the database and the corresponding entry made in the threads table. The code should
             // use the real conversation as soon as it can rather than finding out the threadId
             // when sending with "ensureThreadId".
-            conversation = Conversation.get(this, intentUri, false, mSelectedSubId);
+            conversation = Conversation.get(this, intentUri, false);
         }
 
         if (LogTag.VERBOSE || Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
@@ -2123,7 +2057,7 @@ public class ComposeMessageActivity extends Activity
             log("onNewIntent: same conversation");
             if (mConversation.getThreadId() == 0) {
                 mConversation = conversation;
-                mWorkingMessage.setConversation(mConversation, mSelectedSubId);
+                mWorkingMessage.setConversation(mConversation);
                 updateThreadIdIfRunning();
                 invalidateOptionsMenu();
             }
@@ -2143,7 +2077,7 @@ public class ComposeMessageActivity extends Activity
             LogTag.warnPossibleRecipientMismatch(
                     "ComposeMessageActivity: mWorkingMessage.mConversation=" +
                     mWorkingMessage.getConversation() + ", mConversation=" +
-                    mConversation + ", MISMATCH!", this, mSelectedSubId);
+                    mConversation + ", MISMATCH!", this);
         }
     }
 
@@ -2181,18 +2115,12 @@ public class ComposeMessageActivity extends Activity
     @Override
     protected void onStart() {
         super.onStart();
-        boolean isSmsEnabled = MmsConfig.isSmsEnabled();
+        boolean isSmsEnabled = MmsConfig.isSmsEnabled(this);
         if (isSmsEnabled != mIsSmsEnabled) {
             mIsSmsEnabled = isSmsEnabled;
             invalidateOptionsMenu();
         }
 
-        if (!mIsSmsEnabled) {
-            if (mSubSelectDialog != null && mSubSelectDialog.isShowing()) {
-                mSubSelectDialog.dismiss();
-            }
-        }
-
         initFocus();
 
         // Register a BroadcastReceiver to listen on HTTP I/O process.
@@ -2238,7 +2166,7 @@ public class ComposeMessageActivity extends Activity
         // Update the fasttrack info in case any of the recipients' contact info changed
         // while we were paused. This can happen, for example, if a user changes or adds
         // an avatar associated with a contact.
-        mWorkingMessage.syncWorkingRecipients(mSelectedSubId);
+        mWorkingMessage.syncWorkingRecipients();
 
         if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
             log("update title, mConversation=" + mConversation.toString());
@@ -2303,7 +2231,7 @@ public class ComposeMessageActivity extends Activity
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
 
-        outState.putString(RECIPIENTS, getRecipients().serialize(mSelectedSubId));
+        outState.putString(RECIPIENTS, getRecipients().serialize());
 
         mWorkingMessage.writeStateToBundle(outState);
 
@@ -2337,8 +2265,7 @@ public class ComposeMessageActivity extends Activity
             @Override
             public void run() {
                 ContactList recipients = isRecipientsEditorVisible() ?
-                        mRecipientsEditor.constructContactsFromInput(false, mSelectedSubId) :
-                            getRecipients();
+                        mRecipientsEditor.constructContactsFromInput(false) : getRecipients();
                 updateTitle(recipients);
             }
         }, 100);
@@ -2427,7 +2354,7 @@ public class ComposeMessageActivity extends Activity
         if (TRACE) {
             android.os.Debug.stopMethodTracing();
         }
-        SubscriptionManager.unregister(getBaseContext(), mSubscriptionListener);
+
         super.onDestroy();
     }
 
@@ -2521,7 +2448,7 @@ public class ComposeMessageActivity extends Activity
             case KeyEvent.KEYCODE_DPAD_CENTER:
             case KeyEvent.KEYCODE_ENTER:
                 if (isPreparedForSending()) {
-                    showSubSelectedDialog(false);
+                    confirmSendMessageIfNeeded();
                     return true;
                 }
                 break;
@@ -2547,8 +2474,7 @@ public class ComposeMessageActivity extends Activity
         }
 
         if (isRecipientsEditorVisible() &&
-                !mRecipientsEditor.hasValidRecipient(mWorkingMessage.requiresMms(),
-                        mSelectedSubId)) {
+                !mRecipientsEditor.hasValidRecipient(mWorkingMessage.requiresMms())) {
             MessageUtils.showDiscardDraftConfirmDialog(this, new DiscardDraftListener());
             return;
         }
@@ -2721,7 +2647,10 @@ public class ComposeMessageActivity extends Activity
             return true;
         }
 
-        if (isRecipientCallable()) {
+        // Don't show the call icon if the device don't support voice calling.
+        boolean voiceCapable =
+                getResources().getBoolean(com.android.internal.R.bool.config_voice_capable);
+        if (isRecipientCallable() && voiceCapable) {
             MenuItem item = menu.add(0, MENU_CALL_RECIPIENT, 0, R.string.menu_call)
                 .setIcon(R.drawable.ic_menu_call)
                 .setTitle(R.string.menu_call);
@@ -2731,8 +2660,7 @@ public class ComposeMessageActivity extends Activity
             }
         }
 
-        if (MmsConfig.getBoolean(mSelectedSubId, SmsManager.MMS_CONFIG_MMS_ENABLED) &&
-                mIsSmsEnabled) {
+        if (MmsConfig.getMmsEnabled() && mIsSmsEnabled) {
             if (!isSubjectEditorVisible()) {
                 menu.add(0, MENU_ADD_SUBJECT, 0, R.string.add_subject).setIcon(
                         R.drawable.ic_menu_edit);
@@ -2803,7 +2731,7 @@ public class ComposeMessageActivity extends Activity
         switch (item.getItemId()) {
             case MENU_ADD_SUBJECT:
                 showSubjectEditor(true);
-                mWorkingMessage.setSubject("", true, mSelectedSubId);
+                mWorkingMessage.setSubject("", true);
                 updateSendButtonState();
                 mSubjectTextEditor.requestFocus();
                 break;
@@ -2817,7 +2745,7 @@ public class ComposeMessageActivity extends Activity
                 break;
             case MENU_SEND:
                 if (isPreparedForSending()) {
-                    showSubSelectedDialog(false);
+                    confirmSendMessageIfNeeded();
                 }
                 break;
             case MENU_SEARCH:
@@ -2869,7 +2797,7 @@ public class ComposeMessageActivity extends Activity
             case MENU_DEBUG_DUMP:
                 mWorkingMessage.dump();
                 Conversation.dump();
-                LogTag.dumpInternalTables(this, mSelectedSubId);
+                LogTag.dumpInternalTables(this);
                 break;
         }
 
@@ -2943,8 +2871,7 @@ public class ComposeMessageActivity extends Activity
 
     public static long computeAttachmentSizeLimit(SlideshowModel slideShow, int currentSlideSize) {
         // Computer attachment size limit. Subtract 1K for some text.
-        long sizeLimit = MmsConfig.getInt(SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE) -
-                SlideshowModel.SLIDESHOW_SLOP;
+        long sizeLimit = MmsConfig.getMaxMessageSize() - SlideshowModel.SLIDESHOW_SLOP;
         if (slideShow != null) {
             sizeLimit -= slideShow.getCurrentMessageSize();
 
@@ -2989,7 +2916,7 @@ public class ComposeMessageActivity extends Activity
         if (mWorkingMessage.isFakeMmsForDraft()) {
             // We no longer have to fake the fact we're an Mms. At this point we are or we aren't,
             // based on attachments and other Mms attrs.
-            mWorkingMessage.removeFakeMmsForDraft(mSelectedSubId);
+            mWorkingMessage.removeFakeMmsForDraft();
         }
 
         if (requestCode == REQUEST_CODE_PICK) {
@@ -3012,9 +2939,9 @@ public class ComposeMessageActivity extends Activity
                         mAddContactIntent.getStringExtra(ContactsContract.Intents.Insert.PHONE);
                 }
                 if (address != null) {
-                    Contact contact = Contact.get(address, false, mSelectedSubId);
+                    Contact contact = Contact.get(address, false);
                     if (contact != null) {
-                        contact.reload(mSelectedSubId);
+                        contact.reload();
                     }
                 }
             }
@@ -3028,11 +2955,10 @@ public class ComposeMessageActivity extends Activity
         switch (requestCode) {
             case REQUEST_CODE_CREATE_SLIDESHOW:
                 if (data != null) {
-                    WorkingMessage newMessage = WorkingMessage.load(this, data.getData(),
-                            mSelectedSubId);
+                    WorkingMessage newMessage = WorkingMessage.load(this, data.getData());
                     if (newMessage != null) {
                         mWorkingMessage = newMessage;
-                        mWorkingMessage.setConversation(mConversation, mSelectedSubId);
+                        mWorkingMessage.setConversation(mConversation);
                         updateThreadIdIfRunning();
                         drawTopPanel(false);
                         updateSendButtonState();
@@ -3066,12 +2992,12 @@ public class ComposeMessageActivity extends Activity
                 // Remove the old captured video's thumbnail from the cache
                 MmsApp.getApplication().getThumbnailManager().removeThumbnail(videoUri);
 
-                addVideoAsync(videoUri, false, mSelectedSubId);      // can handle null videoUri
+                addVideoAsync(videoUri, false);      // can handle null videoUri
                 break;
 
             case REQUEST_CODE_ATTACH_VIDEO:
                 if (data != null) {
-                    addVideoAsync(data.getData(), false, mSelectedSubId);
+                    addVideoAsync(data.getData(), false);
                 }
                 break;
 
@@ -3080,13 +3006,13 @@ public class ComposeMessageActivity extends Activity
                 if (Settings.System.DEFAULT_RINGTONE_URI.equals(uri)) {
                     break;
                 }
-                addAudio(uri, mSelectedSubId);
+                addAudio(uri);
                 break;
             }
 
             case REQUEST_CODE_RECORD_SOUND:
                 if (data != null) {
-                    addAudio(data.getData(), mSelectedSubId);
+                    addAudio(data.getData());
                 }
                 break;
 
@@ -3117,8 +3043,7 @@ public class ComposeMessageActivity extends Activity
 
         final int recipientCount = uris != null ? uris.length : 0;
 
-        final int recipientLimit =
-                MmsConfig.getInt(recipientCount, SmsManager.MMS_CONFIG_RECIPIENT_LIMIT);
+        final int recipientLimit = MmsConfig.getRecipientLimit();
         if (recipientLimit != Integer.MAX_VALUE && recipientCount > recipientLimit) {
             new AlertDialog.Builder(this)
                     .setMessage(getString(R.string.too_many_recipients, recipientCount, recipientLimit))
@@ -3149,7 +3074,7 @@ public class ComposeMessageActivity extends Activity
             public void run() {
                 final ContactList list;
                  try {
-                    list = ContactList.blockingGetByUris(uris, mSelectedSubId);
+                    list = ContactList.blockingGetByUris(uris);
                 } finally {
                     handler.removeCallbacks(showProgress);
                     progressDialog.dismiss();
@@ -3181,15 +3106,14 @@ public class ComposeMessageActivity extends Activity
             PduPersister persister = PduPersister.getPduPersister(context);
             int result;
 
-            Uri messageUri = mWorkingMessage.saveAsMms(true, mSelectedSubId);
+            Uri messageUri = mWorkingMessage.saveAsMms(true);
             if (messageUri == null) {
                 result = WorkingMessage.UNKNOWN_ERROR;
             } else {
                 try {
                     Uri dataUri = persister.persistPart(part,
                             ContentUris.parseId(messageUri), null);
-                    result = mWorkingMessage.setAttachment(WorkingMessage.IMAGE, dataUri, append,
-                            mSelectedSubId);
+                    result = mWorkingMessage.setAttachment(WorkingMessage.IMAGE, dataUri, append);
                     if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
                         log("ResizeImageResultCallback: dataUri=" + dataUri);
                     }
@@ -3255,8 +3179,7 @@ public class ComposeMessageActivity extends Activity
             log("addImage: append=" + append + ", uri=" + uri);
         }
 
-        int result = mWorkingMessage.setAttachment(WorkingMessage.IMAGE, uri, append,
-                mSelectedSubId);
+        int result = mWorkingMessage.setAttachment(WorkingMessage.IMAGE, uri, append);
 
         if (result == WorkingMessage.IMAGE_TOO_LARGE ||
             result == WorkingMessage.MESSAGE_SIZE_EXCEEDED) {
@@ -3270,24 +3193,24 @@ public class ComposeMessageActivity extends Activity
         handleAddAttachmentError(result, R.string.type_picture);
     }
 
-    private void addVideoAsync(final Uri uri, final boolean append, final int subId) {
+    private void addVideoAsync(final Uri uri, final boolean append) {
         getAsyncDialog().runAsync(new Runnable() {
             @Override
             public void run() {
-                addVideo(uri, append, subId);
+                addVideo(uri, append);
             }
         }, null, R.string.adding_attachments_title);
     }
 
-    private void addVideo(Uri uri, boolean append, int subId) {
+    private void addVideo(Uri uri, boolean append) {
         if (uri != null) {
-            int result = mWorkingMessage.setAttachment(WorkingMessage.VIDEO, uri, append, subId);
+            int result = mWorkingMessage.setAttachment(WorkingMessage.VIDEO, uri, append);
             handleAddAttachmentError(result, R.string.type_video);
         }
     }
 
-    private void addAudio(Uri uri, int subId) {
-        int result = mWorkingMessage.setAttachment(WorkingMessage.AUDIO, uri, false, subId);
+    private void addAudio(Uri uri) {
+        int result = mWorkingMessage.setAttachment(WorkingMessage.AUDIO, uri, false);
         handleAddAttachmentError(result, R.string.type_audio);
     }
 
@@ -3314,8 +3237,8 @@ public class ComposeMessageActivity extends Activity
         }
 
         if (uri != null) {
-            mWorkingMessage = WorkingMessage.load(this, uri, mSelectedSubId);
-            mWorkingMessage.setSubject(intent.getStringExtra("subject"), false, mSelectedSubId);
+            mWorkingMessage = WorkingMessage.load(this, uri);
+            mWorkingMessage.setSubject(intent.getStringExtra("subject"), false);
         } else {
             mWorkingMessage.setText(intent.getStringExtra("sms_body"));
         }
@@ -3400,7 +3323,7 @@ public class ComposeMessageActivity extends Activity
                 addImage(uri, append);
             } else if (type.startsWith("video/") ||
                     (wildcard && uri.toString().startsWith(mVideoUri))) {
-                addVideo(uri, append, mSelectedSubId);
+                addVideo(uri, append);
             }
         }
     }
@@ -3464,9 +3387,8 @@ public class ComposeMessageActivity extends Activity
 
     @Override
     public void onClick(View v) {
-        log("onClick");
         if ((v == mSendButtonSms || v == mSendButtonMms) && isPreparedForSending()) {
-            showSubSelectedDialog(false);
+            confirmSendMessageIfNeeded();
         } else if ((v == mRecipientsPicker)) {
             launchMultiplePhonePicker();
         }
@@ -3477,7 +3399,7 @@ public class ComposeMessageActivity extends Activity
         intent.addCategory("android.intent.category.DEFAULT");
         intent.setType(Phone.CONTENT_TYPE);
         // We have to wait for the constructing complete.
-        ContactList contacts = mRecipientsEditor.constructContactsFromInput(true, mSelectedSubId);
+        ContactList contacts = mRecipientsEditor.constructContactsFromInput(true);
         int urisCount = 0;
         Uri[] uris = new Uri[contacts.size()];
         urisCount = 0;
@@ -3499,7 +3421,7 @@ public class ComposeMessageActivity extends Activity
             // otherwise, the default action is to send the message.
             if (!event.isShiftPressed() && event.getAction() == KeyEvent.ACTION_DOWN) {
                 if (isPreparedForSending()) {
-                    showSubSelectedDialog(false);
+                    confirmSendMessageIfNeeded();
                 }
                 return true;
             }
@@ -3507,7 +3429,7 @@ public class ComposeMessageActivity extends Activity
         }
 
         if (isPreparedForSending()) {
-            showSubSelectedDialog(false);
+            confirmSendMessageIfNeeded();
         }
         return true;
     }
@@ -3563,7 +3485,7 @@ public class ComposeMessageActivity extends Activity
 
         @Override
         public void onTextChanged(CharSequence s, int start, int before, int count) {
-            mWorkingMessage.setSubject(s, true, mSelectedSubId);
+            mWorkingMessage.setSubject(s, true);
             updateSendButtonState();
         }
 
@@ -3612,37 +3534,13 @@ public class ComposeMessageActivity extends Activity
         mTextEditor = (EditText) findViewById(R.id.embedded_text_editor);
         mTextEditor.setOnEditorActionListener(this);
         mTextEditor.addTextChangedListener(mTextEditorWatcher);
-        final int maxLengthText = MmsConfig.getInt(mSelectedSubId,
-                SmsManager.MMS_CONFIG_MESSAGE_TEXT_MAX_SIZE);
-        if (maxLengthText > 0) {
-            mTextEditor.setFilters(new InputFilter[] {new LengthFilter(maxLengthText)});
-        }
+        mTextEditor.setFilters(new InputFilter[] {
+                new LengthFilter(MmsConfig.getMaxTextLimit())});
         mTextCounter = (TextView) findViewById(R.id.text_counter);
-
         mSendButtonMms = (TextView) findViewById(R.id.send_button_mms);
         mSendButtonSms = (ImageButton) findViewById(R.id.send_button_sms);
-
-        final int activeSimCount =
-                MessagingPreferenceActivity.getActiveSimCount();
-        if (activeSimCount > 1) {
-            View.OnLongClickListener longClickListener = new View.OnLongClickListener() {
-                public boolean onLongClick(View v) {
-                    // If the user long-presses the send button with multiple sims, allow them to
-                    // pick the sim used to send the message.
-                    log("onLongClick");
-                    if ((v == mSendButtonSms || v == mSendButtonMms) && isPreparedForSending()) {
-                        showSubSelectedDialog(true);
-                        return true;
-                    }
-                    return false;
-                }
-            };
-            mSendButtonMms.setOnLongClickListener(longClickListener);
-            mSendButtonSms.setOnLongClickListener(longClickListener);
-        }
         mSendButtonMms.setOnClickListener(this);
         mSendButtonSms.setOnClickListener(this);
-
         mTopPanel = findViewById(R.id.recipients_subject_linear);
         mTopPanel.setFocusable(false);
         mAttachmentEditor = (AttachmentEditor) findViewById(R.id.attachment_editor);
@@ -3762,12 +3660,11 @@ public class ComposeMessageActivity extends Activity
                         drawBottomPanel();
                         updateSendButtonState();
                     }
-                },
-                mSelectedSubId);
+                });
 
         // WorkingMessage.loadDraft() can return a new WorkingMessage object that doesn't
         // have its conversation set. Make sure it is set.
-        mWorkingMessage.setConversation(mConversation, mSelectedSubId);
+        mWorkingMessage.setConversation(mConversation);
 
         return true;
     }
@@ -3793,7 +3690,7 @@ public class ComposeMessageActivity extends Activity
             return;
         }
 
-        mWorkingMessage.saveDraft(isStopping, mSelectedSubId);
+        mWorkingMessage.saveDraft(isStopping);
 
         if (mToastForDraftSave) {
             Toast.makeText(this, R.string.message_saved_as_draft,
@@ -3805,8 +3702,7 @@ public class ComposeMessageActivity extends Activity
         int recipientCount = recipientCount();
 
         return recipientCount > 0 &&
-                recipientCount <=
-                    MmsConfig.getInt(mSelectedSubId, SmsManager.MMS_CONFIG_RECIPIENT_LIMIT) &&
+                recipientCount <= MmsConfig.getRecipientLimit() &&
                 mIsSmsEnabled &&
                 (mWorkingMessage.hasAttachment() || mWorkingMessage.hasText() ||
                     mWorkingMessage.hasSubject());
@@ -3844,26 +3740,17 @@ public class ComposeMessageActivity extends Activity
             }
         }
 
-        // Remind user if the current selected SIM is removed. The code will continue
-        // and the lower level code will mark the message as failed. User can then
-        // click to retry.
-        if (!SubscriptionManager.isValidSubId(mSelectedSubId)) {
-            Log.e(TAG, "The selected SIM is not valid anymore");
-            Toast.makeText(this, R.string.selected_sim_invalid, Toast.LENGTH_LONG).show();
-        }
-
         if (!mSendingMessage) {
             if (LogTag.SEVERE_WARNING) {
-                String sendingRecipients = mConversation.getRecipients().serialize(mSelectedSubId);
+                String sendingRecipients = mConversation.getRecipients().serialize();
                 if (!sendingRecipients.equals(mDebugRecipients)) {
-                    String workingRecipients = mWorkingMessage.getWorkingRecipients(mSelectedSubId);
+                    String workingRecipients = mWorkingMessage.getWorkingRecipients();
                     if (!mDebugRecipients.equals(workingRecipients)) {
                         LogTag.warnPossibleRecipientMismatch("ComposeMessageActivity.sendMessage" +
                                 " recipients in window: \"" +
                                 mDebugRecipients + "\" differ from recipients from conv: \"" +
                                 sendingRecipients + "\" and working recipients: " +
-                                workingRecipients, this,
-                                mSelectedSubId);
+                                workingRecipients, this);
                     }
                 }
                 sanityCheckConversation();
@@ -3873,7 +3760,7 @@ public class ComposeMessageActivity extends Activity
             // them back once the recipient list has settled.
             removeRecipientsListeners();
 
-            mWorkingMessage.send(mDebugRecipients, mSelectedSubId);
+            mWorkingMessage.send(mDebugRecipients);
 
             mSentMessage = true;
             mSendingMessage = true;
@@ -3913,7 +3800,7 @@ public class ComposeMessageActivity extends Activity
 
         mWorkingMessage.clearConversation(mConversation, false);
         mWorkingMessage = WorkingMessage.createEmpty(this);
-        mWorkingMessage.setConversation(mConversation, mSelectedSubId);
+        mWorkingMessage.setConversation(mConversation);
 
         hideRecipientEditor();
         drawBottomPanel();
@@ -3987,8 +3874,7 @@ public class ComposeMessageActivity extends Activity
             if (LogTag.VERBOSE) log("get mConversation by recipients " + recipients);
             mConversation = Conversation.get(this,
                     ContactList.getByNumbers(recipients,
-                            false /* don't block */, true /* replace number */, mSelectedSubId),
-                            false, mSelectedSubId);
+                            false /* don't block */, true /* replace number */), false);
             addRecipientsListeners();
             mSendDiscreetMode = bundle.getBoolean(KEY_EXIT_ON_SENT, false);
             mForwardMessageMode = bundle.getBoolean(KEY_FORWARDED_MESSAGE, false);
@@ -3996,7 +3882,7 @@ public class ComposeMessageActivity extends Activity
             if (mSendDiscreetMode) {
                 mMsgListView.setVisibility(View.INVISIBLE);
             }
-            mWorkingMessage.readStateFromBundle(bundle, mSelectedSubId);
+            mWorkingMessage.readStateFromBundle(bundle);
 
             return;
         }
@@ -4011,7 +3897,7 @@ public class ComposeMessageActivity extends Activity
             if (intentData != null) {
                 // try to get a conversation based on the data URI passed to our intent.
                 if (LogTag.VERBOSE) log("get mConversation by intentData " + intentData);
-                mConversation = Conversation.get(this, intentData, false, mSelectedSubId);
+                mConversation = Conversation.get(this, intentData, false);
                 mWorkingMessage.setText(getBody(intentData));
             } else {
                 // special intent extra parameter to specify the address
@@ -4019,8 +3905,7 @@ public class ComposeMessageActivity extends Activity
                 if (!TextUtils.isEmpty(address)) {
                     if (LogTag.VERBOSE) log("get mConversation by address " + address);
                     mConversation = Conversation.get(this, ContactList.getByNumbers(address,
-                            false /* don't block */, true /* replace number */, mSelectedSubId),
-                            false, mSelectedSubId);
+                            false /* don't block */, true /* replace number */), false);
                 } else {
                     if (LogTag.VERBOSE) log("create new conversation");
                     mConversation = Conversation.createNew(this);
@@ -4038,7 +3923,7 @@ public class ComposeMessageActivity extends Activity
         if (intent.hasExtra("sms_body")) {
             mWorkingMessage.setText(intent.getStringExtra("sms_body"));
         }
-        mWorkingMessage.setSubject(intent.getStringExtra("subject"), false, mSelectedSubId);
+        mWorkingMessage.setSubject(intent.getStringExtra("subject"), false);
     }
 
     private void initFocus() {
@@ -4287,6 +4172,13 @@ public class ComposeMessageActivity extends Activity
                     return;
 
                 case ConversationList.HAVE_LOCKED_MESSAGES_TOKEN:
+                    if (ComposeMessageActivity.this.isFinishing()) {
+                        Log.w(TAG, "ComposeMessageActivity is finished, do nothing ");
+                        if (cursor != null) {
+                            cursor.close();
+                        }
+                        return ;
+                    }
                     @SuppressWarnings("unchecked")
                     ArrayList<Long> threadIds = (ArrayList<Long>)cookie;
                     ConversationList.confirmDeleteThreadDialog(
@@ -4369,7 +4261,7 @@ public class ComposeMessageActivity extends Activity
                 // when we init all Conversations below.
                 if (recipients != null) {
                     for (Contact contact : recipients) {
-                        contact.removeFromCache(mSelectedSubId);
+                        contact.removeFromCache();
                     }
                 }
 
@@ -4392,8 +4284,7 @@ public class ComposeMessageActivity extends Activity
             @Override
             public void run() {
                 ContactList recipients = isRecipientsEditorVisible() ?
-                        mRecipientsEditor.constructContactsFromInput(false, mSelectedSubId) :
-                            getRecipients();
+                        mRecipientsEditor.constructContactsFromInput(false) : getRecipients();
                 if (Log.isLoggable(LogTag.APP, Log.VERBOSE)) {
                     log("[CMA] onUpdate contact updated: " + updated);
                     log("[CMA] onUpdate recipients: " + recipients);
diff --git a/src/com/android/mms/ui/ConfirmRateLimitActivity.java b/src/com/android/mms/ui/ConfirmRateLimitActivity.java
index 7f419857..92596a87 100644
--- a/src/com/android/mms/ui/ConfirmRateLimitActivity.java
+++ b/src/com/android/mms/ui/ConfirmRateLimitActivity.java
@@ -18,7 +18,6 @@
 package com.android.mms.ui;
 
 import static com.android.mms.util.RateController.RATE_LIMIT_CONFIRMED_ACTION;
-
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
diff --git a/src/com/android/mms/ui/ConversationList.java b/src/com/android/mms/ui/ConversationList.java
index 80d337a4..47739fdd 100644..100755
--- a/src/com/android/mms/ui/ConversationList.java
+++ b/src/com/android/mms/ui/ConversationList.java
@@ -47,7 +47,6 @@ import android.provider.ContactsContract.Contacts;
 import android.provider.Telephony;
 import android.provider.Telephony.Mms;
 import android.provider.Telephony.Threads;
-import android.telephony.SubscriptionManager;
 import android.util.Log;
 import android.view.ActionMode;
 import android.view.ContextMenu;
@@ -82,7 +81,6 @@ import com.android.mms.transaction.SmsRejectedReceiver;
 import com.android.mms.util.DraftCache;
 import com.android.mms.util.Recycler;
 import com.android.mms.widget.MmsWidgetProvider;
-
 import com.google.android.mms.pdu.PduHeaders;
 
 import java.util.ArrayList;
@@ -202,7 +200,7 @@ public class ConversationList extends ListActivity implements DraftCache.OnDraft
     @Override
     protected void onResume() {
         super.onResume();
-        boolean isSmsEnabled = MmsConfig.isSmsEnabled();
+        boolean isSmsEnabled = MmsConfig.isSmsEnabled(this);
         if (isSmsEnabled != mIsSmsEnabled) {
             mIsSmsEnabled = isSmsEnabled;
             invalidateOptionsMenu();
@@ -217,14 +215,13 @@ public class ConversationList extends ListActivity implements DraftCache.OnDraft
         }
 
         // Show or hide the SMS promo banner
-        if (mIsSmsEnabled || MmsConfig.isSmsPromoDismissed()) {
+        if (mIsSmsEnabled || MmsConfig.isSmsPromoDismissed(this)) {
             mSmsPromoBannerView.setVisibility(View.GONE);
         } else {
             initSmsPromoBanner();
             mSmsPromoBannerView.setVisibility(View.VISIBLE);
         }
 
-        startAsyncQuery();
         mListAdapter.setOnContentChangedListener(mContentChangedListener);
     }
 
@@ -336,8 +333,6 @@ public class ConversationList extends ListActivity implements DraftCache.OnDraft
                             startActivity(intent);
                         }
                     }, 2000);
-                /*
-                //this will change the default setting value of delete old message
                 } else {
                     if (DEBUG) Log.v(TAG, "checkForThreadsOverLimit silently turning on recycler");
                     // No threads were over the limit. Turn on the recycler by default.
@@ -349,7 +344,6 @@ public class ConversationList extends ListActivity implements DraftCache.OnDraft
                             editor.apply();
                         }
                     });
-                */
                 }
                 // Remember that we don't have to do the check anymore when starting MMS.
                 runOnUiThread(new Runnable() {
@@ -390,6 +384,8 @@ public class ConversationList extends ListActivity implements DraftCache.OnDraft
 
         mDoOnceAfterFirstQuery = true;
 
+        startAsyncQuery();
+
         // We used to refresh the DraftCache here, but
         // refreshing the DraftCache each time we go to the ConversationList seems overly
         // aggressive. We already update the DraftCache when leaving CMA in onStop() and
@@ -412,8 +408,11 @@ public class ConversationList extends ListActivity implements DraftCache.OnDraft
     protected void onStop() {
         super.onStop();
 
+        stopAsyncQuery();
+
         DraftCache.getInstance().removeOnDraftChangedListener(this);
 
+        unbindListeners(null);
         // Simply setting the choice mode causes the previous choice mode to finish and we exit
         // multi-select mode (if we're in it) and remove all the selections.
         getListView().setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL);
@@ -428,6 +427,20 @@ public class ConversationList extends ListActivity implements DraftCache.OnDraft
         mListAdapter.changeCursor(null);
     }
 
+    private void unbindListeners(final Collection<Long> threadIds) {
+        for (int i = 0; i < getListView().getChildCount(); i++) {
+            View view = getListView().getChildAt(i);
+            if (view instanceof ConversationListItem) {
+                ConversationListItem item = (ConversationListItem)view;
+                if (threadIds == null) {
+                    item.unbind();
+                } else if (threadIds.contains(item.getConversation().getThreadId())) {
+                    item.unbind();
+                }
+            }
+        }
+    }
+
     @Override
     public void onDraftChanged(final long threadId, final boolean hasDraft) {
         // Run notifyDataSetChanged() on the main thread.
@@ -453,6 +466,13 @@ public class ConversationList extends ListActivity implements DraftCache.OnDraft
         }
     }
 
+    private void stopAsyncQuery() {
+        if (mQueryHandler != null) {
+            mQueryHandler.cancelOperation(THREAD_LIST_QUERY_TOKEN);
+            mQueryHandler.cancelOperation(UNREAD_THREADS_QUERY_TOKEN);
+        }
+    }
+
     SearchView.OnQueryTextListener mQueryTextListener = new SearchView.OnQueryTextListener() {
         @Override
         public boolean onQueryTextSubmit(String query) {
@@ -563,7 +583,7 @@ public class ConversationList extends ListActivity implements DraftCache.OnDraft
                 startActivityIfNeeded(intent, -1);
                 break;
             case R.id.action_debug_dump:
-                LogTag.dumpInternalTables(this, SubscriptionManager.getDefaultSmsSubId());
+                LogTag.dumpInternalTables(this);
                 break;
             case R.id.action_cell_broadcasts:
                 Intent cellBroadcastIntent = new Intent(Intent.ACTION_MAIN);
@@ -825,6 +845,9 @@ public class ConversationList extends ListActivity implements DraftCache.OnDraft
                 @Override
                 public void run() {
                     int token = DELETE_CONVERSATION_TOKEN;
+                    if (mContext instanceof ConversationList) {
+                        ((ConversationList)mContext).unbindListeners(mThreadIds);
+                    }
                     if (mThreadIds == null) {
                         Conversation.startDeleteAll(mHandler, token, mDeleteLockedMessages);
                         DraftCache.getInstance().refresh();
@@ -923,6 +946,13 @@ public class ConversationList extends ListActivity implements DraftCache.OnDraft
                 break;
 
             case HAVE_LOCKED_MESSAGES_TOKEN:
+                if (ConversationList.this.isFinishing()) {
+                    Log.w(TAG, "ConversationList is finished, do nothing ");
+                    if (cursor != null) {
+                        cursor.close();
+                    }
+                    return ;
+                }
                 @SuppressWarnings("unchecked")
                 Collection<Long> threadIds = (Collection<Long>)cookie;
                 confirmDeleteThreadDialog(new DeleteThreadListener(threadIds, mQueryHandler,
@@ -959,7 +989,7 @@ public class ConversationList extends ListActivity implements DraftCache.OnDraft
                     if (conv != null) {
                         ContactList recipients = conv.getRecipients();
                         for (Contact contact : recipients) {
-                            contact.removeFromCache(SubscriptionManager.getDefaultSmsSubId());
+                            contact.removeFromCache();
                         }
                     }
                 }
diff --git a/src/com/android/mms/ui/DeliveryReportActivity.java b/src/com/android/mms/ui/DeliveryReportActivity.java
index 18ba1809..6ca75145 100644
--- a/src/com/android/mms/ui/DeliveryReportActivity.java
+++ b/src/com/android/mms/ui/DeliveryReportActivity.java
@@ -33,7 +33,6 @@ import android.os.Bundle;
 import android.provider.Telephony.Mms;
 import android.provider.Telephony.Sms;
 import android.telephony.PhoneNumberUtils;
-import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -43,7 +42,6 @@ import android.widget.ListView;
 
 import com.android.mms.LogTag;
 import com.android.mms.R;
-
 import com.google.android.mms.pdu.PduHeaders;
 
 /**
@@ -71,16 +69,14 @@ public class DeliveryReportActivity extends ListActivity {
     static final String[] MMS_REPORT_STATUS_PROJECTION = new String[] {
         Mms.Addr.ADDRESS,       //0
         "delivery_status",      //1
-        "read_status",          //2
-        Mms.SUB_ID              //3
+        "read_status"           //2
     };
 
     static final String[] SMS_REPORT_STATUS_PROJECTION = new String[] {
         Sms.ADDRESS,            //0
         Sms.STATUS,             //1
         Sms.DATE_SENT,          //2
-        Sms.SUB_ID,             //3
-        Sms.TYPE                //4
+        Sms.TYPE                //3
     };
 
     // These indices must sync up with the projections above.
@@ -90,8 +86,7 @@ public class DeliveryReportActivity extends ListActivity {
     static final int COLUMN_DELIVERY_STATUS     = 1;
     static final int COLUMN_READ_STATUS         = 2;
     static final int COLUMN_DATE_SENT           = 2;
-    static final int COLUMN_SUB_ID              = 3;
-    static final int COLUMN_MESSAGE_TYPE        = 4;
+    static final int COLUMN_MESSAGE_TYPE        = 3;
 
     private long mMessageId;
     private String mMessageType;
@@ -121,8 +116,7 @@ public class DeliveryReportActivity extends ListActivity {
         List<DeliveryReportItem> items = getReportItems();
         if (items == null) {
             items = new ArrayList<DeliveryReportItem>(1);
-            items.add(new DeliveryReportItem("", getString(R.string.status_none), null,
-                    SubscriptionManager.DEFAULT_SUB_ID));
+            items.add(new DeliveryReportItem("", getString(R.string.status_none), null));
             Log.w(LOG_TAG, "cursor == null");
         }
         setListAdapter(new DeliveryReportAdapter(this, items));
@@ -195,7 +189,6 @@ public class DeliveryReportActivity extends ListActivity {
                 // date_sent column (see MessageStatusReceiver).
                 String deliveryDateString = null;
                 long deliveryDate = c.getLong(COLUMN_DATE_SENT);
-                int subId = c.getInt(COLUMN_SUB_ID);
                 int messageType = c.getInt(COLUMN_MESSAGE_TYPE);
                 if (messageType == Sms.MESSAGE_TYPE_SENT && deliveryDate > 0) {
                     deliveryDateString = getString(R.string.delivered_label) +
@@ -207,7 +200,7 @@ public class DeliveryReportActivity extends ListActivity {
                                 getString(R.string.recipient_label) + c.getString(COLUMN_RECIPIENT),
                                 getString(R.string.status_label) +
                                         getSmsStatusText(c.getInt(COLUMN_DELIVERY_STATUS)),
-                                        deliveryDateString, subId));
+                                        deliveryDateString));
             }
             return items;
         } finally {
@@ -290,8 +283,7 @@ public class DeliveryReportActivity extends ListActivity {
             String statusText = getString(R.string.status_label) +
                 getMmsReportStatusText(reportReq, reportStatus);
             items.add(new DeliveryReportItem(getString(R.string.recipient_label) +
-                    reportReq.getRecipient(), statusText, null,
-                    SubscriptionManager.DEFAULT_SUB_ID));
+                    reportReq.getRecipient(), statusText, null));
         }
         return items;
     }
diff --git a/src/com/android/mms/ui/DeliveryReportAdapter.java b/src/com/android/mms/ui/DeliveryReportAdapter.java
index 3ae90dab..ef5fc34a 100644
--- a/src/com/android/mms/ui/DeliveryReportAdapter.java
+++ b/src/com/android/mms/ui/DeliveryReportAdapter.java
@@ -54,7 +54,7 @@ public class DeliveryReportAdapter extends ArrayAdapter<DeliveryReportItem> {
             }
         }
 
-        listItem.bind(item.recipient, item.status, item.deliveryDate, item.subId);
+        listItem.bind(item.recipient, item.status, item.deliveryDate);
 
         return listItem;
     }
diff --git a/src/com/android/mms/ui/DeliveryReportItem.java b/src/com/android/mms/ui/DeliveryReportItem.java
index cb04f489..e288b86d 100644
--- a/src/com/android/mms/ui/DeliveryReportItem.java
+++ b/src/com/android/mms/ui/DeliveryReportItem.java
@@ -25,12 +25,10 @@ public class DeliveryReportItem {
     String recipient;
     String status;
     String deliveryDate;
-    int subId;
 
-    public DeliveryReportItem(String recipient, String status, String deliveryDate, int subId) {
+    public DeliveryReportItem(String recipient, String status, String deliveryDate) {
         this.recipient = recipient;
         this.status = status;
         this.deliveryDate = deliveryDate;
-        this.subId = subId;
     }
 }
diff --git a/src/com/android/mms/ui/DeliveryReportListItem.java b/src/com/android/mms/ui/DeliveryReportListItem.java
index 4eed2306..46a9fd97 100644
--- a/src/com/android/mms/ui/DeliveryReportListItem.java
+++ b/src/com/android/mms/ui/DeliveryReportListItem.java
@@ -56,10 +56,10 @@ public class DeliveryReportListItem extends LinearLayout {
         super(context, attrs);
     }
 
-    public final void bind(String recipient, String status, String deliveryDate, int subId) {
+    public final void bind(String recipient, String status, String deliveryDate) {
         // Recipient
         if (!TextUtils.isEmpty(recipient)) {
-            mRecipientView.setText(Contact.get(recipient, false, subId).getName());
+            mRecipientView.setText(Contact.get(recipient, false).getName());
         } else {
             mRecipientView.setText("");
         }
diff --git a/src/com/android/mms/ui/ManageSimMessages.java b/src/com/android/mms/ui/ManageSimMessages.java
index 38098560..5e808e23 100644
--- a/src/com/android/mms/ui/ManageSimMessages.java
+++ b/src/com/android/mms/ui/ManageSimMessages.java
@@ -21,10 +21,13 @@ import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.AsyncQueryHandler;
+import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteException;
@@ -34,7 +37,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Telephony.Sms;
 import android.telephony.SmsManager;
-import android.telephony.SubscriptionManager;
 import android.util.Log;
 import android.view.ContextMenu;
 import android.view.Menu;
@@ -45,11 +47,11 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.android.internal.telephony.PhoneConstants;
+import com.android.internal.telephony.IccCardConstants;
+import com.android.internal.telephony.TelephonyIntents;
 import com.android.mms.LogTag;
 import com.android.mms.R;
 import com.android.mms.transaction.MessagingNotification;
-import com.android.mms.transaction.SimFullReceiver;
 
 /**
  * Displays a list of the SMS messages stored on the ICC.
@@ -76,10 +78,21 @@ public class ManageSimMessages extends Activity
     private MessageListAdapter mListAdapter = null;
     private AsyncQueryHandler mQueryHandler = null;
 
-    private int mSubId = 0;
-
     public static final int SIM_FULL_NOTIFICATION_ID = 234;
 
+    protected BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+        public void onReceive(Context context, Intent intent) {
+            if (TelephonyIntents.ACTION_SIM_STATE_CHANGED.equals(intent.getAction())) {
+                String stateExtra = intent.getStringExtra(IccCardConstants.INTENT_KEY_ICC_STATE);
+                if (stateExtra != null
+                        && ((IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(stateExtra)
+                        || IccCardConstants.INTENT_VALUE_ICC_UNKNOWN.equals(stateExtra)))) {
+                    updateState(SHOW_EMPTY);
+                }
+            }
+        }
+    };
+
     private final ContentObserver simChangeObserver =
             new ContentObserver(new Handler()) {
         @Override
@@ -102,9 +115,6 @@ public class ManageSimMessages extends Activity
         ActionBar actionBar = getActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
 
-        mSubId = getIntent().getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
-                SubscriptionManager.getDefaultSmsSubId());
-
         init();
     }
 
@@ -116,10 +126,8 @@ public class ManageSimMessages extends Activity
     }
 
     private void init() {
-        Intent intent= new Intent();
-        intent.setAction(SimFullReceiver.SIM_FULL_VIEWED_ACTION);
-        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, mSubId);
-        sendBroadcast(intent);
+        MessagingNotification.cancelNotification(getApplicationContext(),
+                SIM_FULL_NOTIFICATION_ID);
 
         updateState(SHOW_BUSY);
         startQuery();
@@ -168,9 +176,7 @@ public class ManageSimMessages extends Activity
 
     private void startQuery() {
         try {
-            Uri simUri = ICC_URI.buildUpon().appendQueryParameter(PhoneConstants.SUBSCRIPTION_KEY,
-                    String.valueOf(mSubId)).build();
-            mQueryHandler.startQuery(0, null, simUri, null, null, null, null);
+            mQueryHandler.startQuery(0, null, ICC_URI, null, null, null, null);
         } catch (SQLiteException e) {
             SqliteWrapper.checkSQLiteException(this, e);
         }
@@ -238,12 +244,16 @@ public class ManageSimMessages extends Activity
     @Override
     public void onPause() {
         super.onPause();
+        unregisterReceiver(mBroadcastReceiver);
         mContentResolver.unregisterContentObserver(simChangeObserver);
     }
 
     private void registerSimChangeObserver() {
         mContentResolver.registerContentObserver(
                 ICC_URI, true, simChangeObserver);
+        final IntentFilter intentFilter =
+                new IntentFilter(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
+        registerReceiver(mBroadcastReceiver, intentFilter);
     }
 
     private void copyToPhoneMemory(Cursor cursor) {
@@ -254,10 +264,9 @@ public class ManageSimMessages extends Activity
 
         try {
             if (isIncomingMessage(cursor)) {
-                Sms.Inbox.addMessage(mSubId, mContentResolver, address, body, null, date,
-                        true /* read */);
+                Sms.Inbox.addMessage(mContentResolver, address, body, null, date, true /* read */);
             } else {
-                Sms.Sent.addMessage(mSubId, mContentResolver, address, body, null, date);
+                Sms.Sent.addMessage(mContentResolver, address, body, null, date);
             }
         } catch (SQLiteException e) {
             SqliteWrapper.checkSQLiteException(this, e);
@@ -273,9 +282,10 @@ public class ManageSimMessages extends Activity
     }
 
     private void deleteFromSim(Cursor cursor) {
-        String messageIndexString = cursor.getString(cursor.getColumnIndexOrThrow("index_on_icc"));
-        Uri simUri = ICC_URI.buildUpon().appendPath(messageIndexString).appendQueryParameter(
-                PhoneConstants.SUBSCRIPTION_KEY, String.valueOf(mSubId)).build();
+        String messageIndexString =
+                cursor.getString(cursor.getColumnIndexOrThrow("index_on_icc"));
+        Uri simUri = ICC_URI.buildUpon().appendPath(messageIndexString).build();
+
         SqliteWrapper.delete(this, mContentResolver, simUri, null, null);
     }
 
diff --git a/src/com/android/mms/ui/MessageItem.java b/src/com/android/mms/ui/MessageItem.java
index 88dbf997..2e974efc 100755..100644
--- a/src/com/android/mms/ui/MessageItem.java
+++ b/src/com/android/mms/ui/MessageItem.java
@@ -81,12 +81,11 @@ public class MessageItem {
     String mTextContentType; // ContentType of text of MMS.
     Pattern mHighlight; // portion of message to highlight (from search)
 
-    // The only two non-immutable fields.  Not synchronized, as access
-    // will only be from the main GUI thread.  Worst case if accessed
-    // from another thread is they'll return null and be set again from
-    // that thread.
+    // The only non-immutable field.  Not synchronized, as access will
+    // only be from the main GUI thread.  Worst case if accessed from
+    // another thread is it'll return null and be set again from that
+    // thread.
     CharSequence mCachedFormattedMessage;
-    CharSequence mCachedFormattedSubStatus;
 
     // The last message is cached above in mCachedFormattedMessage. In the latest design, we
     // show "Sending..." in place of the timestamp when a message is being sent. mLastSendingState
@@ -108,7 +107,6 @@ public class MessageItem {
     ColumnsMap mColumnsMap;
     private PduLoadedCallback mPduLoadedCallback;
     private ItemLoadedFuture mItemLoadedFuture;
-    int mSubId;
 
     MessageItem(Context context, String type, final Cursor cursor,
             final ColumnsMap columnsMap, Pattern highlight) throws MmsException {
@@ -141,7 +139,6 @@ public class MessageItem {
             // Set contact and message body
             mBoxId = cursor.getInt(columnsMap.mColumnSmsType);
             mAddress = cursor.getString(columnsMap.mColumnSmsAddress);
-            mSubId = cursor.getInt(columnsMap.mColumnSmsSubId);
             if (Sms.isOutgoingFolder(mBoxId)) {
                 String meString = context.getString(
                         R.string.messagelist_sender_self);
@@ -149,7 +146,7 @@ public class MessageItem {
                 mContact = meString;
             } else {
                 // For incoming messages, the ADDRESS field contains the sender.
-                mContact = Contact.get(mAddress, false, mSubId).getName();
+                mContact = Contact.get(mAddress, false).getName();
             }
             mBody = cursor.getString(columnsMap.mColumnSmsBody);
 
@@ -162,7 +159,6 @@ public class MessageItem {
 
             mLocked = cursor.getInt(columnsMap.mColumnSmsLocked) != 0;
             mErrorCode = cursor.getInt(columnsMap.mColumnSmsErrorCode);
-
         } else if ("mms".equals(type)) {
             mMessageUri = ContentUris.withAppendedId(Mms.CONTENT_URI, mMsgId);
             mBoxId = cursor.getInt(columnsMap.mColumnMmsMessageBox);
@@ -187,7 +183,6 @@ public class MessageItem {
             mMmsStatus = cursor.getInt(columnsMap.mColumnMmsStatus);
             mAttachmentType = cursor.getInt(columnsMap.mColumnMmsTextOnly) != 0 ?
                     WorkingMessage.TEXT : ATTACHMENT_TYPE_NOT_LOADED;
-            mSubId = cursor.getInt(columnsMap.mColumnMmsSubId);
 
             // Start an async load of the pdu. If the pdu is already loaded, the callback
             // will get called immediately
@@ -212,8 +207,7 @@ public class MessageItem {
             // notification system uses.
             mAddress = AddressUtils.getFrom(mContext, messageUri);
         }
-        mContact = TextUtils.isEmpty(mAddress) ? "" :
-            Contact.get(mAddress, false, mSubId).getName();
+        mContact = TextUtils.isEmpty(mAddress) ? "" : Contact.get(mAddress, false).getName();
     }
 
     public boolean isMms() {
@@ -281,19 +275,6 @@ public class MessageItem {
         return mCachedFormattedMessage;
     }
 
-    public void setCachedFormattedSubStatus(CharSequence formattedSubStatus) {
-        mCachedFormattedSubStatus = formattedSubStatus;
-    }
-
-    public CharSequence getCachedFormattedSubStatus() {
-        boolean isSending = isSending();
-        if (isSending != mLastSendingState) {
-            mLastSendingState = isSending;
-            mCachedFormattedSubStatus = null;
-        }
-        return mCachedFormattedSubStatus;
-    }
-
     public int getBoxId() {
         return mBoxId;
     }
@@ -310,7 +291,6 @@ public class MessageItem {
     public String toString() {
         return "type: " + mType +
             " box: " + mBoxId +
-            " subId: " + mSubId +
             " uri: " + mMessageUri +
             " address: " + mAddress +
             " contact: " + mContact +
diff --git a/src/com/android/mms/ui/MessageListAdapter.java b/src/com/android/mms/ui/MessageListAdapter.java
index 32ca4a90..d8e14d87 100755..100644
--- a/src/com/android/mms/ui/MessageListAdapter.java
+++ b/src/com/android/mms/ui/MessageListAdapter.java
@@ -29,7 +29,6 @@ import android.provider.Telephony.MmsSms.PendingMessages;
 import android.provider.Telephony.Sms;
 import android.provider.Telephony.Sms.Conversations;
 import android.provider.Telephony.TextBasedSmsColumns;
-import android.text.TextUtils;
 import android.util.Log;
 import android.util.LruCache;
 import android.view.LayoutInflater;
@@ -41,7 +40,6 @@ import android.widget.ListView;
 
 import com.android.mms.LogTag;
 import com.android.mms.R;
-
 import com.google.android.mms.MmsException;
 
 /**
@@ -79,10 +77,7 @@ public class MessageListAdapter extends CursorAdapter {
         PendingMessages.ERROR_TYPE,
         Mms.LOCKED,
         Mms.STATUS,
-        Mms.TEXT_ONLY,
-        // For SubId of MMS or SMS
-        Sms.SUB_ID,
-        Mms.SUB_ID
+        Mms.TEXT_ONLY
     };
 
     // The indexes of the default columns which must be consistent
@@ -112,8 +107,6 @@ public class MessageListAdapter extends CursorAdapter {
     static final int COLUMN_MMS_LOCKED          = 22;
     static final int COLUMN_MMS_STATUS          = 23;
     static final int COLUMN_MMS_TEXT_ONLY       = 24;
-    static final int COLUMN_SMS_SUBID           = 25;
-    static final int COLUMN_MMS_SUBID           = 26;
 
     private static final int CACHE_SIZE         = 50;
 
@@ -314,7 +307,7 @@ public class MessageListAdapter extends CursorAdapter {
                 do {
                     long id = cursor.getLong(mRowIDColumn);
                     String type = cursor.getString(mColumnsMap.mColumnMsgType);
-                    if (id == item.mMsgId && TextUtils.equals(type, item.mType)) {
+                    if (id == item.mMsgId && (type != null && type.equals(item.mType))) {
                         return cursor;
                     }
                 } while (cursor.moveToNext());
@@ -349,9 +342,6 @@ public class MessageListAdapter extends CursorAdapter {
         public int mColumnMmsStatus;
         public int mColumnMmsTextOnly;
 
-        public int mColumnSmsSubId;
-        public int mColumnMmsSubId;
-
         public ColumnsMap() {
             mColumnMsgType            = COLUMN_MSG_TYPE;
             mColumnMsgId              = COLUMN_ID;
@@ -373,8 +363,6 @@ public class MessageListAdapter extends CursorAdapter {
             mColumnMmsLocked          = COLUMN_MMS_LOCKED;
             mColumnMmsStatus          = COLUMN_MMS_STATUS;
             mColumnMmsTextOnly        = COLUMN_MMS_TEXT_ONLY;
-            mColumnSmsSubId           = COLUMN_SMS_SUBID;
-            mColumnMmsSubId           = COLUMN_MMS_SUBID;
         }
 
         public ColumnsMap(Cursor cursor) {
@@ -500,18 +488,6 @@ public class MessageListAdapter extends CursorAdapter {
             } catch (IllegalArgumentException e) {
                 Log.w("colsMap", e.getMessage());
             }
-
-            try {
-                mColumnSmsSubId = cursor.getColumnIndexOrThrow(Mms.SUB_ID);
-            } catch (IllegalArgumentException e) {
-                Log.w(TAG, e.getMessage());
-            }
-
-            try {
-                mColumnMmsSubId = cursor.getColumnIndexOrThrow(Mms.SUB_ID);
-            } catch (IllegalArgumentException e) {
-                Log.w(TAG, e.getMessage());
-            }
         }
     }
 
diff --git a/src/com/android/mms/ui/MessageListItem.java b/src/com/android/mms/ui/MessageListItem.java
index 44c9fc90..46000117 100644
--- a/src/com/android/mms/ui/MessageListItem.java
+++ b/src/com/android/mms/ui/MessageListItem.java
@@ -25,7 +25,6 @@ import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.Paint.FontMetricsInt;
 import android.graphics.Typeface;
@@ -33,15 +32,11 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Message;
-import android.provider.Telephony;
 import android.provider.ContactsContract.Profile;
 import android.provider.Telephony.Sms;
-import android.provider.Telephony.Mms;
 import android.telephony.PhoneNumberUtils;
-import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.Html;
-import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.method.HideReturnsTransformationMethod;
@@ -62,7 +57,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.mms.LogTag;
 import com.android.mms.MmsApp;
 import com.android.mms.R;
@@ -75,9 +69,7 @@ import com.android.mms.transaction.TransactionBundle;
 import com.android.mms.transaction.TransactionService;
 import com.android.mms.util.DownloadManager;
 import com.android.mms.util.ItemLoadedCallback;
-import com.android.mms.util.SubStatusResolver;
 import com.android.mms.util.ThumbnailManager.ImageLoaded;
-
 import com.google.android.mms.ContentType;
 import com.google.android.mms.pdu.PduHeaders;
 
@@ -96,9 +88,6 @@ public class MessageListItem extends LinearLayout implements
     static final int MSG_LIST_PLAY    = 2;
     static final int MSG_LIST_DETAILS = 3;
 
-    private static final int PADDING_LEFT_THR = 3;
-    private static final int PADDING_LEFT_TWE = 13;
-
     private View mMmsView;
     private ImageView mImageView;
     private ImageView mLockedIndicator;
@@ -112,7 +101,6 @@ public class MessageListItem extends LinearLayout implements
     private MessageItem mMessageItem;
     private String mDefaultCountryIso;
     private TextView mDateView;
-    private TextView mExpiresView;
     public View mMessageBlock;
     private QuickContactDivot mAvatar;
     static private Drawable sDefaultContactImage;
@@ -120,7 +108,6 @@ public class MessageListItem extends LinearLayout implements
     private int mPosition;      // for debugging
     private ImageLoadedCallback mImageLoadedCallback;
     private boolean mMultiRecipients;
-    private TextView mSubStatus;
 
     public MessageListItem(Context context) {
         super(context);
@@ -149,8 +136,6 @@ public class MessageListItem extends LinearLayout implements
 
         mBodyTextView = (TextView) findViewById(R.id.text_view);
         mDateView = (TextView) findViewById(R.id.date_view);
-        mExpiresView = (TextView) findViewById(R.id.expires_view);
-        mSubStatus = (TextView) findViewById(R.id.sim_status);
         mLockedIndicator = (ImageView) findViewById(R.id.locked_indicator);
         mDeliveredIndicator = (ImageView) findViewById(R.id.delivered_indicator);
         mDetailsIndicator = (ImageView) findViewById(R.id.details_indicator);
@@ -178,15 +163,9 @@ public class MessageListItem extends LinearLayout implements
 
         switch (msgItem.mMessageType) {
             case PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND:
-                if (mExpiresView != null) {
-                    mExpiresView.setVisibility(View.VISIBLE);
-                }
                 bindNotifInd();
                 break;
             default:
-                if (mExpiresView != null) {
-                    mExpiresView.setVisibility(View.GONE);
-                }
                 bindCommonMessage(sameItem);
                 break;
         }
@@ -230,10 +209,7 @@ public class MessageListItem extends LinearLayout implements
                                             mMessageItem.mHighlight,
                                             mMessageItem.mTextContentType));
 
-        mExpiresView.setText(buildTimestampLine(msgSizeText + " " + mMessageItem.mTimestamp));
-
-        mSubStatus.setVisibility(View.VISIBLE);
-        mSubStatus.setText(formatSubStatus(mMessageItem));
+        mDateView.setText(buildTimestampLine(msgSizeText + " " + mMessageItem.mTimestamp));
 
         switch (mMessageItem.getMmsDownloadStatus()) {
             case DownloadManager.STATE_PRE_DOWNLOADING:
@@ -246,6 +222,7 @@ public class MessageListItem extends LinearLayout implements
                 boolean autoDownload = downloadManager.isAuto();
                 boolean dataSuspended = (MmsApp.getApplication().getTelephonyManager()
                         .getDataState() == TelephonyManager.DATA_SUSPENDED);
+
                 // If we're going to automatically start downloading the mms attachment, then
                 // don't bother showing the download button for an instant before the actual
                 // download begins. Instead, show downloading as taking place.
@@ -255,6 +232,7 @@ public class MessageListItem extends LinearLayout implements
                 }
             case DownloadManager.STATE_TRANSIENT_FAILURE:
             case DownloadManager.STATE_PERMANENT_FAILURE:
+            case DownloadManager.STATE_SKIP_RETRYING:
             default:
                 setLongClickable(true);
                 inflateDownloadControls();
@@ -265,16 +243,14 @@ public class MessageListItem extends LinearLayout implements
                     public void onClick(View v) {
                         mDownloadingLabel.setVisibility(View.VISIBLE);
                         mDownloadButton.setVisibility(View.GONE);
-                        int subId = mMessageItem.mSubId;
-                        final Intent intent = new Intent(mContext, TransactionService.class);
+                        Intent intent = new Intent(mContext, TransactionService.class);
                         intent.putExtra(TransactionBundle.URI, mMessageItem.mMessageUri.toString());
                         intent.putExtra(TransactionBundle.TRANSACTION_TYPE,
                                 Transaction.RETRIEVE_TRANSACTION);
-                        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
                         mContext.startService(intent);
+
                         DownloadManager.getInstance().markState(
-                                mMessageItem.mMessageUri, DownloadManager.STATE_PRE_DOWNLOADING,
-                                subId);
+                                    mMessageItem.mMessageUri, DownloadManager.STATE_PRE_DOWNLOADING);
                     }
                 });
                 break;
@@ -306,8 +282,7 @@ public class MessageListItem extends LinearLayout implements
     private void updateAvatarView(String addr, boolean isSelf) {
         Drawable avatarDrawable;
         if (isSelf || !TextUtils.isEmpty(addr)) {
-            Contact contact = isSelf ? Contact.getMe(false, mMessageItem.mSubId) :
-                        Contact.get(addr, false, mMessageItem.mSubId);
+            Contact contact = isSelf ? Contact.getMe(false) : Contact.get(addr, false);
             avatarDrawable = contact.getAvatar(mContext, sDefaultContactImage);
 
             if (isSelf) {
@@ -363,13 +338,6 @@ public class MessageListItem extends LinearLayout implements
                                              mMessageItem.mTextContentType);
             mMessageItem.setCachedFormattedMessage(formattedMessage);
         }
-
-        CharSequence formattedSubStatus = mMessageItem.getCachedFormattedSubStatus();
-        if (formattedSubStatus == null) {
-            formattedSubStatus = formatSubStatus(mMessageItem);
-            mMessageItem.setCachedFormattedSubStatus(formattedSubStatus);
-        }
-
         if (!sameItem || haveLoadedPdu) {
             mBodyTextView.setText(formattedMessage);
         }
@@ -392,13 +360,6 @@ public class MessageListItem extends LinearLayout implements
             mBodyTextView.setText(mPosition + ": " + debugText);
         }
 
-        if (!TextUtils.isEmpty(formattedSubStatus)) {
-            mSubStatus.setVisibility(View.VISIBLE);
-            mSubStatus.setText(formattedSubStatus);
-        } else {
-            mSubStatus.setVisibility(View.GONE);
-        }
-
         // If we're in the process of sending a message (i.e. pending), then we show a "SENDING..."
         // string in place of the timestamp.
         if (!sameItem || haveLoadedPdu) {
@@ -756,10 +717,8 @@ public class MessageListItem extends LinearLayout implements
         if (msgItem.mLocked) {
             mLockedIndicator.setImageResource(R.drawable.ic_lock_message_sms);
             mLockedIndicator.setVisibility(View.VISIBLE);
-            mSubStatus.setPadding(PADDING_LEFT_THR, 0, 0, 0);
         } else {
             mLockedIndicator.setVisibility(View.GONE);
-            mSubStatus.setPadding(PADDING_LEFT_TWE, 0, 0, 0);
         }
 
         // Delivery icon - we can show a failed icon for both sms and mms, but for an actual
@@ -876,17 +835,4 @@ public class MessageListItem extends LinearLayout implements
         // TODO Auto-generated method stub
 
     }
-
-    private CharSequence formatSubStatus(MessageItem msgItem) {
-        SpannableStringBuilder buffer = new SpannableStringBuilder();
-        int subInfoStart = buffer.length();
-        CharSequence subInfo = MessageUtils.getSubInfo(mContext, msgItem.mSubId);
-        if (subInfo.length() > 0) {
-            buffer.append(subInfo);
-        }
-
-        buffer.setSpan(mColorSpan, 0, subInfoStart, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-        return buffer;
-    }
 }
diff --git a/src/com/android/mms/ui/MessageUtils.java b/src/com/android/mms/ui/MessageUtils.java
index 50847de6..94994cc4 100644
--- a/src/com/android/mms/ui/MessageUtils.java
+++ b/src/com/android/mms/ui/MessageUtils.java
@@ -21,7 +21,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -36,8 +35,6 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.database.Cursor;
 import android.database.sqlite.SqliteWrapper;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
 import android.media.CamcorderProfile;
 import android.media.RingtoneManager;
 import android.net.Uri;
@@ -46,16 +43,10 @@ import android.os.Handler;
 import android.provider.MediaStore;
 import android.provider.Telephony.Mms;
 import android.provider.Telephony.Sms;
-import android.telephony.SmsManager;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
 import android.telephony.PhoneNumberUtils;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.text.format.Time;
-import android.text.style.ForegroundColorSpan;
 import android.text.style.URLSpan;
 import android.util.Log;
 import android.widget.Toast;
@@ -93,6 +84,7 @@ public class MessageUtils {
     }
 
     private static final String TAG = LogTag.TAG;
+    private static String sLocalNumber;
     private static String[] sNoSubjectStrings;
 
     // Cache of both groups of space-separated ids to their full
@@ -663,8 +655,8 @@ public class MessageUtils {
                 final PduPart part;
                 try {
                     UriImage image = new UriImage(context, imageUri);
-                    int widthLimit = MmsConfig.getInt(SmsManager.MMS_CONFIG_MAX_IMAGE_WIDTH);
-                    int heightLimit = MmsConfig.getInt(SmsManager.MMS_CONFIG_MAX_IMAGE_HEIGHT);
+                    int widthLimit = MmsConfig.getMaxImageWidth();
+                    int heightLimit = MmsConfig.getMaxImageHeight();
                     // In mms_config.xml, the max width has always been declared larger than the max
                     // height. Swap the width and height limits if necessary so we scale the picture
                     // as little as possible.
@@ -677,8 +669,7 @@ public class MessageUtils {
                     part = image.getResizedImageAsPart(
                         widthLimit,
                         heightLimit,
-                        MmsConfig.getInt(SmsManager.MMS_CONFIG_MAX_MESSAGE_SIZE) -
-                            MESSAGE_OVERHEAD);
+                        MmsConfig.getMaxMessageSize() - MESSAGE_OVERHEAD);
                 } finally {
                     // Cancel pending show of the progress toast if necessary.
                     handler.removeCallbacks(showProgress);
@@ -703,15 +694,14 @@ public class MessageUtils {
                 .show();
     }
 
-    public static String getLocalNumber(int subId) {
-        final boolean validSubId = SubscriptionManager.isUsableSubIdValue(subId);
-        if (!validSubId) {
-            subId = SubscriptionManager.getDefaultSmsSubId();
+    public static String getLocalNumber() {
+        if (null == sLocalNumber) {
+            sLocalNumber = MmsApp.getApplication().getTelephonyManager().getLine1Number();
         }
-        return MmsApp.getApplication().getTelephonyManager().getLine1NumberForSubscriber(subId);
+        return sLocalNumber;
     }
 
-    public static boolean isLocalNumber(String number, int subId) {
+    public static boolean isLocalNumber(String number) {
         if (number == null) {
             return false;
         }
@@ -724,17 +714,7 @@ public class MessageUtils {
             return false;
         }
 
-        return PhoneNumberUtils.compare(number, getLocalNumber(subId));
-    }
-
-    public static boolean simHasNumber() {
-        List<SubscriptionInfo> subList = SubscriptionManager.getActiveSubscriptionInfoList();
-        for (SubscriptionInfo sub : subList) {
-            if (!TextUtils.isEmpty(sub.getNumber())) {
-                return true;
-            }
-        }
-        return false;
+        return PhoneNumberUtils.compare(number, getLocalNumber());
     }
 
     public static void handleReadReport(final Context context,
@@ -766,14 +746,14 @@ public class MessageUtils {
         }
 
         final Cursor c = SqliteWrapper.query(context, context.getContentResolver(),
-                        Mms.Inbox.CONTENT_URI, new String[] {Mms._ID, Mms.MESSAGE_ID, Mms.SUB_ID},
+                        Mms.Inbox.CONTENT_URI, new String[] {Mms._ID, Mms.MESSAGE_ID},
                         selectionBuilder.toString(), selectionArgs, null);
 
         if (c == null) {
             return;
         }
 
-        final Map<String, ReadRecInfo> map = new HashMap<String, ReadRecInfo>();
+        final Map<String, String> map = new HashMap<String, String>();
         try {
             if (c.getCount() == 0) {
                 if (callback != null) {
@@ -784,8 +764,7 @@ public class MessageUtils {
 
             while (c.moveToNext()) {
                 Uri uri = ContentUris.withAppendedId(Mms.CONTENT_URI, c.getLong(0));
-                int subId = c.getInt(2);
-                map.put(c.getString(1), new ReadRecInfo(AddressUtils.getFrom(context, uri), subId));
+                map.put(c.getString(1), AddressUtils.getFrom(context, uri));
             }
         } finally {
             c.close();
@@ -794,10 +773,9 @@ public class MessageUtils {
         OnClickListener positiveListener = new OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                for (final Map.Entry<String, ReadRecInfo> entry : map.entrySet()) {
-                    ReadRecInfo readRecInfo = entry.getValue();
-                    MmsMessageSender.sendReadRec(context, readRecInfo.getAddress(),
-                                                 entry.getKey(), status, readRecInfo.getSubIndex());
+                for (final Map.Entry<String, String> entry : map.entrySet()) {
+                    MmsMessageSender.sendReadRec(context, entry.getValue(),
+                                                 entry.getKey(), status);
                 }
 
                 if (callback != null) {
@@ -961,15 +939,14 @@ public class MessageUtils {
     // An alias (or commonly called "nickname") is:
     // Nickname must begin with a letter.
     // Only letters a-z, numbers 0-9, or . are allowed in Nickname field.
-    public static boolean isAlias(String string, int subId) {
-        if (!MmsConfig.getBoolean(subId, SmsManager.MMS_CONFIG_ALIAS_ENABLED)) {
+    public static boolean isAlias(String string) {
+        if (!MmsConfig.isAliasEnabled()) {
             return false;
         }
 
         int len = string == null ? 0 : string.length();
 
-        if (len < MmsConfig.getInt(subId, SmsManager.MMS_CONFIG_ALIAS_MIN_CHARS) ||
-                len > MmsConfig.getInt(subId, SmsManager.MMS_CONFIG_ALIAS_MAX_CHARS)) {
+        if (len < MmsConfig.getAliasMinChars() || len > MmsConfig.getAliasMaxChars()) {
             return false;
         }
 
@@ -1019,8 +996,8 @@ public class MessageUtils {
     /**
      * Returns true if the address passed in is a valid MMS address.
      */
-    public static boolean isValidMmsAddress(String address, int subId) {
-        String retVal = parseMmsAddress(address, subId);
+    public static boolean isValidMmsAddress(String address) {
+        String retVal = parseMmsAddress(address);
         return (retVal != null);
     }
 
@@ -1030,7 +1007,7 @@ public class MessageUtils {
      * - if the address can be parsed into a valid MMS phone number, return the parsed number.
      * - if the address is a compliant alias address, leave it as is.
      */
-    public static String parseMmsAddress(String address, int subId) {
+    public static String parseMmsAddress(String address) {
         // if it's a valid Email address, use that.
         if (Mms.isEmailAddress(address)) {
             return address;
@@ -1038,12 +1015,12 @@ public class MessageUtils {
 
         // if we are able to parse the address to a MMS compliant phone number, take that.
         String retVal = parsePhoneNumberForMms(address);
-        if (retVal != null) {
+        if (retVal != null && retVal.length() != 0) {
             return retVal;
         }
 
         // if it's an alias compliant address, use that.
-        if (isAlias(address, subId)) {
+        if (isAlias(address)) {
             return address;
         }
 
@@ -1054,71 +1031,4 @@ public class MessageUtils {
     private static void log(String msg) {
         Log.d(TAG, "[MsgUtils] " + msg);
     }
-
-    private static class ReadRecInfo {
-        private String mAddress;
-        private int mSubId;
-        public ReadRecInfo(String address, int subIndex) {
-            mAddress = address;
-            mSubId = subIndex;
-        }
-
-        public String getAddress() {
-            return mAddress;
-        }
-
-        public int getSubIndex() {
-            return mSubId;
-        }
-    }
-
-    public static CharSequence getSubInfo(Context context, int subId) {
-        Log.d(TAG, "getSubInfo subId = " + subId);
-        if (!SubscriptionManager.isValidSubId(subId)) {
-            return "";
-        }
-        // get sub info
-        return getSubInfoSync(context, subId);
-    }
-
-    public static CharSequence getSubInfoSync(Context context, int subId) {
-        SubscriptionInfo subInfo = SubscriptionManager.getSubscriptionInfoForSubscriber(subId);
-        if (null == subInfo) {
-            return "";
-        }
-
-        CharSequence displayName = subInfo.getDisplayName();
-        SpannableStringBuilder buf = new SpannableStringBuilder();
-        Resources res = context.getResources();
-        String subNameContainer = res.getString(R.string.sub_name_container);
-        if (displayName == null) {
-            displayName = res.getString(R.string.default_sim_name, subId);
-        } else {
-            int len = displayName.length();
-            if (len > 7) {
-                displayName = displayName.subSequence(0, 4)
-                        + res.getString(R.string.sub_name_ellipsis)
-                        + displayName.subSequence(len - 1, len);
-            }
-        }
-
-        buf.append(String.format(subNameContainer, displayName));
-        // set background image
-        Drawable drawable;
-        Resources resources = context.getResources();
-        if (subInfo.getSimSlotIndex() >= 0) {
-            // slotId being >= 0 means this SIM card is inserted
-            drawable = new BitmapDrawable(resources, subInfo.createIconBitmap(context));
-        } else {
-            drawable = resources.getDrawable(R.drawable.sim_background_locked);
-        }
-        buf.setSpan(new BackgroundImageSpan(drawable), 0, buf.length(),
-                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        // set subInfo icon tint color
-        int tint = subInfo.getIconTint();
-        buf.setSpan(new ForegroundColorSpan(tint), 0, buf.length(),
-                Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-        return buf;
-    }
-
 }
diff --git a/src/com/android/mms/ui/MessagingPreferenceActivity.java b/src/com/android/mms/ui/MessagingPreferenceActivity.java
index 0b7abf72..3c5f6093 100644..100755
--- a/src/com/android/mms/ui/MessagingPreferenceActivity.java
+++ b/src/com/android/mms/ui/MessagingPreferenceActivity.java
@@ -17,19 +17,20 @@
 
 package com.android.mms.ui;
 
-import java.util.List;
-
 import android.app.ActionBar;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Vibrator;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
@@ -39,14 +40,13 @@ import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.preference.RingtonePreference;
 import android.provider.SearchRecentSuggestions;
-import android.provider.Telephony;
-import android.telephony.SmsManager;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 
+import com.android.internal.telephony.IccCardConstants;
+import com.android.internal.telephony.TelephonyIntents;
+
 import com.android.mms.MmsApp;
 import com.android.mms.MmsConfig;
 import com.android.mms.R;
@@ -73,14 +73,6 @@ public class MessagingPreferenceActivity extends PreferenceActivity
     public static final String RETRIEVAL_DURING_ROAMING = "pref_key_mms_retrieval_during_roaming";
     public static final String AUTO_DELETE              = "pref_key_auto_delete";
     public static final String GROUP_MMS_MODE           = "pref_key_mms_group_mms";
-    public static final String MULTI_SIM_ASK            = "pref_key_ask_sim";
-
-    public static final String SMS_DELIVERY_REPORT_MSIM_MODE = "pref_key_sms_delivery_reports_msim";
-    public static final String MMS_DELIVERY_REPORT_MSIM_MODE = "pref_key_mms_delivery_reports_msim";
-    public static final String READ_REPORT_MSIM_MODE         = "pref_key_mms_read_reports_msim";
-    public static final String MANAGE_SIM_MESSAGE_MODE       = "pref_key_manage_sim_messages";
-    public static final String PREFERENCE_KEY                = "PREFERENCE_KEY";
-    public static final String PREFERENCE_TITLE_ID           = "PREFERENCE_TITLE";
 
     // Menu entries
     private static final int MENU_RESTORE_DEFAULTS    = 1;
@@ -105,7 +97,6 @@ public class MessagingPreferenceActivity extends PreferenceActivity
     private CheckBoxPreference mVibratePref;
     private CheckBoxPreference mEnableNotificationsPref;
     private CheckBoxPreference mMmsAutoRetrievialPref;
-    private CheckBoxPreference mAlwaysAskSimPref;
     private RingtonePreference mRingtonePref;
     private Recycler mSmsRecycler;
     private Recycler mMmsRecycler;
@@ -115,6 +106,23 @@ public class MessagingPreferenceActivity extends PreferenceActivity
     // sure we notice if the user has changed the default SMS app.
     private boolean mIsSmsEnabled;
 
+    private BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        public void onReceive(Context context, Intent intent) {
+            final String action = intent.getAction();
+            if (TelephonyIntents.ACTION_SIM_STATE_CHANGED.equals(action)) {
+                String stateExtra = intent.getStringExtra(IccCardConstants.INTENT_KEY_ICC_STATE);
+                if (stateExtra != null
+                        && IccCardConstants.INTENT_VALUE_ICC_ABSENT.equals(stateExtra)) {
+                    PreferenceCategory smsCategory =
+                            (PreferenceCategory)findPreference("pref_key_sms_settings");
+                    if (smsCategory != null) {
+                        smsCategory.removePreference(mManageSimPref);
+                    }
+                }
+            }
+        }
+    };
+
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -128,7 +136,7 @@ public class MessagingPreferenceActivity extends PreferenceActivity
     @Override
     protected void onResume() {
         super.onResume();
-        boolean isSmsEnabled = MmsConfig.isSmsEnabled();
+        boolean isSmsEnabled = MmsConfig.isSmsEnabled(this);
         if (isSmsEnabled != mIsSmsEnabled) {
             mIsSmsEnabled = isSmsEnabled;
             invalidateOptionsMenu();
@@ -157,27 +165,25 @@ public class MessagingPreferenceActivity extends PreferenceActivity
         mSmsPrefCategory.setEnabled(mIsSmsEnabled);
         mMmsPrefCategory.setEnabled(mIsSmsEnabled);
         mNotificationPrefCategory.setEnabled(mIsSmsEnabled);
-        mAlwaysAskSimPref.setEnabled(mIsSmsEnabled);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        unregisterReceiver(mReceiver);
     }
 
     private void loadPrefs() {
-        boolean isHasActivatedSub = hasActivatedSub();
         addPreferencesFromResource(R.xml.preferences);
 
         mSmsDisabledPref = findPreference("pref_key_sms_disabled");
-        Intent intent = new Intent(Telephony.Sms.Intents.ACTION_CHANGE_DEFAULT);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        intent.setPackage("com.android.settings");
-        intent.putExtra("package", getApplicationContext().getPackageName());
-        mSmsDisabledPref.setIntent(intent);
-
         mSmsEnabledPref = findPreference("pref_key_sms_enabled");
 
-        mStoragePrefCategory = (PreferenceCategory) findPreference("pref_key_storage_settings");
-        mSmsPrefCategory = (PreferenceCategory) findPreference("pref_key_sms_settings");
-        mMmsPrefCategory = (PreferenceCategory) findPreference("pref_key_mms_settings");
-        mNotificationPrefCategory = (PreferenceCategory) findPreference(
-                "pref_key_notification_settings");
+        mStoragePrefCategory = (PreferenceCategory)findPreference("pref_key_storage_settings");
+        mSmsPrefCategory = (PreferenceCategory)findPreference("pref_key_sms_settings");
+        mMmsPrefCategory = (PreferenceCategory)findPreference("pref_key_mms_settings");
+        mNotificationPrefCategory =
+                (PreferenceCategory)findPreference("pref_key_notification_settings");
 
         mManageSimPref = findPreference("pref_key_manage_sim_messages");
         mSmsLimitPref = findPreference("pref_key_sms_delete_limit");
@@ -190,59 +196,16 @@ public class MessagingPreferenceActivity extends PreferenceActivity
         mEnableNotificationsPref = (CheckBoxPreference) findPreference(NOTIFICATION_ENABLED);
         mMmsAutoRetrievialPref = (CheckBoxPreference) findPreference(AUTO_RETRIEVAL);
         mVibratePref = (CheckBoxPreference) findPreference(NOTIFICATION_VIBRATE);
+        Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+        if (mVibratePref != null && (vibrator == null || !vibrator.hasVibrator())) {
+            mNotificationPrefCategory.removePreference(mVibratePref);
+            mVibratePref = null;
+        }
         mRingtonePref = (RingtonePreference) findPreference(NOTIFICATION_RINGTONE);
-        mAlwaysAskSimPref = (CheckBoxPreference) findPreference(MULTI_SIM_ASK);
-
-
-        if (!isHasActivatedSub) {
-            mSmsPrefCategory.removePreference(mSmsDeliveryReportPref);
-            mMmsPrefCategory.removePreference(mMmsDeliveryReportPref);
-            mMmsPrefCategory.removePreference(mMmsReadReportPref);
-            mSmsPrefCategory.removePreference(findPreference(SMS_DELIVERY_REPORT_MSIM_MODE));
-            mMmsPrefCategory.removePreference(findPreference(MMS_DELIVERY_REPORT_MSIM_MODE));
-            mMmsPrefCategory.removePreference(findPreference(READ_REPORT_MSIM_MODE));
-            getPreferenceScreen().removePreference(mAlwaysAskSimPref);
-        } else {
-            int activeSimCount = getActiveSimCount();
-            int simCount = MmsApp.getApplication().getTelephonyManager().getSimCount();
-            if (simCount > 1) {
-                mSmsPrefCategory.removePreference(mSmsDeliveryReportPref);
-                mMmsPrefCategory.removePreference(mMmsDeliveryReportPref);
-                mMmsPrefCategory.removePreference(mMmsReadReportPref);
 
-                mSmsDeliveryReportPref = findPreference(SMS_DELIVERY_REPORT_MSIM_MODE);
-                mMmsDeliveryReportPref = findPreference(MMS_DELIVERY_REPORT_MSIM_MODE);
-                mMmsReadReportPref = findPreference(READ_REPORT_MSIM_MODE);
-            } else {
-                mSmsPrefCategory.removePreference(findPreference(SMS_DELIVERY_REPORT_MSIM_MODE));
-                mMmsPrefCategory.removePreference(findPreference(MMS_DELIVERY_REPORT_MSIM_MODE));
-                mMmsPrefCategory.removePreference(findPreference(READ_REPORT_MSIM_MODE));
-            }
-            if (activeSimCount <= 1) {
-                getPreferenceScreen().removePreference(mAlwaysAskSimPref);
-            }
-        }
         setMessagePreferences();
     }
 
-    public static int getActiveSimCount() {
-        List<SubscriptionInfo> subInfoRecords = SubscriptionManager.getActiveSubscriptionInfoList();
-        return subInfoRecords != null ? subInfoRecords.size() : 0;
-    }
-
-    private static boolean isAnySubscriptionValueSet(String configValue) {
-        List<SubscriptionInfo> subInfoRecords = SubscriptionManager.getActiveSubscriptionInfoList();
-        if (subInfoRecords == null) {
-            return false;
-        }
-        for (final SubscriptionInfo subInfo : subInfoRecords) {
-             if (MmsConfig.getBoolean(subInfo.getSubscriptionId(), configValue)) {
-                 return true;
-             }
-        }
-        return false;
-    }
-
     private void restoreDefaultPreferences() {
         PreferenceManager.getDefaultSharedPreferences(this).edit().clear().apply();
         setPreferenceScreen(null);
@@ -259,34 +222,33 @@ public class MessagingPreferenceActivity extends PreferenceActivity
     }
 
     private void setMessagePreferences() {
-        boolean isHasActivatedSub = hasActivatedSub();
-        if (!isHasActivatedSub) {
+        if (!MmsApp.getApplication().getTelephonyManager().hasIccCard()) {
             // No SIM card, remove the SIM-related prefs
             mSmsPrefCategory.removePreference(mManageSimPref);
         }
 
-        if (!isAnySubscriptionValueSet(SmsManager.MMS_CONFIG_SMS_DELIVERY_REPORT_ENABLED)) {
+        if (!MmsConfig.getSMSDeliveryReportsEnabled()) {
             mSmsPrefCategory.removePreference(mSmsDeliveryReportPref);
-            if (!isHasActivatedSub) {
+            if (!MmsApp.getApplication().getTelephonyManager().hasIccCard()) {
                 getPreferenceScreen().removePreference(mSmsPrefCategory);
             }
         }
 
-        if (!isAnySubscriptionValueSet(SmsManager.MMS_CONFIG_MMS_ENABLED)) {
+        if (!MmsConfig.getMmsEnabled()) {
             // No Mms, remove all the mms-related preferences
             getPreferenceScreen().removePreference(mMmsPrefCategory);
 
             mStoragePrefCategory.removePreference(findPreference("pref_key_mms_delete_limit"));
         } else {
-            if (!MmsConfig.getBoolean(SmsManager.MMS_CONFIG_MMS_DELIVERY_REPORT_ENABLED)) {
+            if (!MmsConfig.getMMSDeliveryReportsEnabled()) {
                 mMmsPrefCategory.removePreference(mMmsDeliveryReportPref);
             }
-            if (!MmsConfig.getBoolean(SmsManager.MMS_CONFIG_MMS_READ_REPORT_ENABLED)) {
+            if (!MmsConfig.getMMSReadReportsEnabled()) {
                 mMmsPrefCategory.removePreference(mMmsReadReportPref);
             }
             // If the phone's SIM doesn't know it's own number, disable group mms.
-            if (!MmsConfig.getBoolean(SmsManager.MMS_CONFIG_GROUP_MMS_ENABLED) ||
-                    !MessageUtils.simHasNumber()) {
+            if (!MmsConfig.getGroupMmsEnabled() ||
+                    TextUtils.isEmpty(MessageUtils.getLocalNumber())) {
                 mMmsPrefCategory.removePreference(mMmsGroupMmsPref);
             }
         }
@@ -296,7 +258,7 @@ public class MessagingPreferenceActivity extends PreferenceActivity
         // If needed, migrate vibration setting from the previous tri-state setting stored in
         // NOTIFICATION_VIBRATE_WHEN to the boolean setting stored in NOTIFICATION_VIBRATE.
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
-        if (sharedPreferences.contains(NOTIFICATION_VIBRATE_WHEN)) {
+        if (mVibratePref != null && sharedPreferences.contains(NOTIFICATION_VIBRATE_WHEN)) {
             String vibrateWhen = sharedPreferences.
                     getString(MessagingPreferenceActivity.NOTIFICATION_VIBRATE_WHEN, null);
             boolean vibrate = "always".equals(vibrateWhen);
@@ -371,18 +333,6 @@ public class MessagingPreferenceActivity extends PreferenceActivity
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
             Preference preference) {
-
-        int simCount = MmsApp.getApplication().getTelephonyManager().getSimCount();
-        if (simCount > 1 && ((preference == mManageSimPref)
-                || (preference == mSmsDeliveryReportPref)
-                || (preference == mMmsDeliveryReportPref)
-                || (preference == mMmsReadReportPref))) {
-            Intent intent = new Intent(this, SubSelectActivity.class);
-            intent.putExtra(PREFERENCE_KEY, preference.getKey());
-            intent.putExtra(PREFERENCE_TITLE_ID, preference.getTitleRes());
-            startActivity(intent);
-            return true;
-        }
         if (preference == mSmsLimitPref) {
             new NumberPickerDialog(this,
                     mSmsLimitListener,
@@ -481,6 +431,9 @@ public class MessagingPreferenceActivity extends PreferenceActivity
 
     private void registerListeners() {
         mRingtonePref.setOnPreferenceChangeListener(this);
+        final IntentFilter intentFilter =
+                new IntentFilter(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
+        registerReceiver(mReceiver, intentFilter);
     }
 
     public boolean onPreferenceChange(Preference preference, Object newValue) {
@@ -496,23 +449,12 @@ public class MessagingPreferenceActivity extends PreferenceActivity
     //  1. the feature is enabled in mms_config.xml (currently on by default)
     //  2. the feature is enabled in the mms settings page
     //  3. the SIM knows its own phone number
-    public static boolean getIsGroupMmsEnabled(Context context, int subId) {
+    public static boolean getIsGroupMmsEnabled(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean groupMmsPrefOn = prefs.getBoolean(
                 MessagingPreferenceActivity.GROUP_MMS_MODE, true);
-        return MmsConfig.getBoolean(SmsManager.MMS_CONFIG_GROUP_MMS_ENABLED) &&
+        return MmsConfig.getGroupMmsEnabled() &&
                 groupMmsPrefOn &&
-                !TextUtils.isEmpty(MessageUtils.getLocalNumber(subId));
-    }
-
-    private boolean hasActivatedSub() {
-        List<SubscriptionInfo> subList = SubscriptionManager.getActiveSubscriptionInfoList();
-        return subList == null ? false : subList.size() != 0;
-    }
-
-    public static boolean isMultiSimAskEnabled(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        return prefs.getBoolean(MULTI_SIM_ASK,
-                context.getResources().getBoolean(R.bool.sim_ask_preference_default_value));
+                !TextUtils.isEmpty(MessageUtils.getLocalNumber());
     }
 }
diff --git a/src/com/android/mms/ui/NoConfirmationSendService.java b/src/com/android/mms/ui/NoConfirmationSendService.java
index 8c752c42..0b13bf4a 100644
--- a/src/com/android/mms/ui/NoConfirmationSendService.java
+++ b/src/com/android/mms/ui/NoConfirmationSendService.java
@@ -20,12 +20,10 @@ import android.app.IntentService;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.internal.telephony.PhoneConstants;
 import com.android.mms.LogTag;
 import com.android.mms.MmsConfig;
 import com.android.mms.data.Conversation;
@@ -49,7 +47,7 @@ public class NoConfirmationSendService extends IntentService {
     protected void onHandleIntent(Intent intent) {
         ComposeMessageActivity.log("NoConfirmationSendService onHandleIntent");
 
-        if (!MmsConfig.isSmsEnabled()) {
+        if (!MmsConfig.isSmsEnabled(this)) {
             ComposeMessageActivity.log("NoConfirmationSendService is not the default sms app");
             return;
         }
@@ -67,12 +65,6 @@ public class NoConfirmationSendService extends IntentService {
         }
 
         String message = extras.getString(Intent.EXTRA_TEXT);
-        int subId = extras.getInt(PhoneConstants.SUBSCRIPTION_KEY,
-                SubscriptionManager.INVALID_SUB_ID);
-        if (!SubscriptionManager.isValidSubId(subId)) {
-            Log.e(TAG, "subId is invalid");
-            return;
-        }
 
         Uri intentUri = intent.getData();
         String recipients = Conversation.getRecipients(intentUri);
@@ -96,7 +88,7 @@ public class NoConfirmationSendService extends IntentService {
             // provider looks up the threadId based on the recipient(s).
             long threadId = 0;
             SmsMessageSender smsMessageSender = new SmsMessageSender(this, dests,
-                    message, threadId, subId);
+                    message, threadId);
             try {
                 // This call simply puts the message on a queue and sends a broadcast to start
                 // a service to send the message. In queing up the message, however, it does
diff --git a/src/com/android/mms/ui/RecipientsEditor.java b/src/com/android/mms/ui/RecipientsEditor.java
index 820d94ba..b276b66c 100644
--- a/src/com/android/mms/ui/RecipientsEditor.java
+++ b/src/com/android/mms/ui/RecipientsEditor.java
@@ -23,8 +23,6 @@ import java.util.List;
 import android.content.Context;
 import android.provider.Telephony.Mms;
 import android.telephony.PhoneNumberUtils;
-import android.telephony.SmsManager;
-import android.telephony.SubscriptionManager;
 import android.text.Annotation;
 import android.text.Editable;
 import android.text.Layout;
@@ -37,14 +35,17 @@ import android.text.util.Rfc822Token;
 import android.text.util.Rfc822Tokenizer;
 import android.util.AttributeSet;
 import android.view.ContextMenu.ContextMenuInfo;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 import android.widget.AdapterView;
 import android.widget.MultiAutoCompleteTextView;
 
+import com.android.ex.chips.DropdownChipLayouter;
 import com.android.ex.chips.RecipientEditTextView;
 import com.android.mms.MmsConfig;
+import com.android.mms.R;
 import com.android.mms.data.Contact;
 import com.android.mms.data.ContactList;
 
@@ -125,6 +126,13 @@ public class RecipientsEditor extends RecipientEditTextView {
                 mAffected = null;
             }
         });
+
+        setDropdownChipLayouter(new DropdownChipLayouter(LayoutInflater.from(context), context) {
+            @Override
+            protected int getItemLayoutResId(AdapterType type) {
+                return R.layout.mms_chips_recipient_dropdown_item;
+            }
+        });
     }
 
     @Override
@@ -165,20 +173,20 @@ public class RecipientsEditor extends RecipientEditTextView {
         return mTokenizer.getNumbers();
     }
 
-    public ContactList constructContactsFromInput(boolean blocking, int subId) {
+    public ContactList constructContactsFromInput(boolean blocking) {
         List<String> numbers = mTokenizer.getNumbers();
         ContactList list = new ContactList();
         for (String number : numbers) {
-            Contact contact = Contact.get(number, blocking, subId);
+            Contact contact = Contact.get(number, blocking);
             contact.setNumber(number);
             list.add(contact);
         }
         return list;
     }
 
-    private boolean isValidAddress(String number, boolean isMms, int subId) {
+    private boolean isValidAddress(String number, boolean isMms) {
         if (isMms) {
-            return MessageUtils.isValidMmsAddress(number, subId);
+            return MessageUtils.isValidMmsAddress(number);
         } else {
             // TODO: PhoneNumberUtils.isWellFormedSmsAddress() only check if the number is a valid
             // GSM SMS address. If the address contains a dialable char, it considers it a well
@@ -189,20 +197,20 @@ public class RecipientsEditor extends RecipientEditTextView {
         }
     }
 
-    public boolean hasValidRecipient(boolean isMms, int subId) {
+    public boolean hasValidRecipient(boolean isMms) {
         for (String number : mTokenizer.getNumbers()) {
-            if (isValidAddress(number, isMms, subId))
+            if (isValidAddress(number, isMms))
                 return true;
         }
         return false;
     }
 
-    public boolean hasInvalidRecipient(boolean isMms, int subId) {
+    public boolean hasInvalidRecipient(boolean isMms) {
         for (String number : mTokenizer.getNumbers()) {
-            if (!isValidAddress(number, isMms, subId)) {
-                if (MmsConfig.getString(SmsManager.MMS_CONFIG_EMAIL_GATEWAY_NUMBER) == null) {
+            if (!isValidAddress(number, isMms)) {
+                if (MmsConfig.getEmailGateway() == null) {
                     return true;
-                } else if (!MessageUtils.isAlias(number, subId)) {
+                } else if (!MessageUtils.isAlias(number)) {
                     return true;
                 }
             }
@@ -210,10 +218,10 @@ public class RecipientsEditor extends RecipientEditTextView {
         return false;
     }
 
-    public String formatInvalidNumbers(boolean isMms, int subId) {
+    public String formatInvalidNumbers(boolean isMms) {
         StringBuilder sb = new StringBuilder();
         for (String number : mTokenizer.getNumbers()) {
-            if (!isValidAddress(number, isMms, subId)) {
+            if (!isValidAddress(number, isMms)) {
                 if (sb.length() != 0) {
                     sb.append(", ");
                 }
@@ -325,8 +333,7 @@ public class RecipientsEditor extends RecipientEditTextView {
 
                 if (end != start) {
                     String number = getNumberAt(getText(), start, end, getContext());
-                    Contact c = Contact.get(number, false,
-                            SubscriptionManager.getDefaultSmsSubId());
+                    Contact c = Contact.get(number, false);
                     return new RecipientContextMenuInfo(c);
                 }
             }
diff --git a/src/com/android/mms/ui/SearchActivity.java b/src/com/android/mms/ui/SearchActivity.java
index 23e77f6e..e7fe0dd6 100644
--- a/src/com/android/mms/ui/SearchActivity.java
+++ b/src/com/android/mms/ui/SearchActivity.java
@@ -33,7 +33,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.provider.SearchRecentSuggestions;
 import android.provider.Telephony;
-import android.telephony.SubscriptionManager;
 import android.text.SpannableString;
 import android.text.TextPaint;
 import android.text.style.StyleSpan;
@@ -317,8 +316,7 @@ public class SearchActivity extends ListActivity
                         final TextViewSnippet snippet = (TextViewSnippet)(view.findViewById(R.id.subtitle));
 
                         String address = cursor.getString(addressPos);
-                        Contact contact = address != null ? Contact.get(address, false,
-                                SubscriptionManager.getDefaultSmsSubId()) : null;
+                        Contact contact = address != null ? Contact.get(address, false) : null;
 
                         String titleString = contact != null ? contact.getNameAndNumber() : "";
                         title.setText(titleString);
diff --git a/src/com/android/mms/ui/SlideEditorActivity.java b/src/com/android/mms/ui/SlideEditorActivity.java
index 5d3e2991..2f62e934 100644
--- a/src/com/android/mms/ui/SlideEditorActivity.java
+++ b/src/com/android/mms/ui/SlideEditorActivity.java
@@ -29,7 +29,6 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
-import android.telephony.SmsManager;
 import android.text.InputFilter;
 import android.text.InputFilter.LengthFilter;
 import android.text.TextUtils;
@@ -59,7 +58,6 @@ import com.android.mms.model.SlideModel;
 import com.android.mms.model.SlideshowModel;
 import com.android.mms.ui.BasicSlideEditorView.OnTextChangedListener;
 import com.android.mms.ui.MessageUtils.ResizeImageResultCallback;
-
 import com.google.android.mms.ContentType;
 import com.google.android.mms.MmsException;
 import com.google.android.mms.pdu.PduBody;
@@ -152,10 +150,8 @@ public class SlideEditorActivity extends Activity {
         mRemoveSlide.setOnClickListener(mOnRemoveSlide);
 
         mTextEditor = (EditText) findViewById(R.id.text_message);
-        final int maxTextLength = MmsConfig.getInt(SmsManager.MMS_CONFIG_MESSAGE_TEXT_MAX_SIZE);
-        if (maxTextLength > 0) {
-            mTextEditor.setFilters(new InputFilter[] {new LengthFilter(maxTextLength)});
-        }
+        mTextEditor.setFilters(new InputFilter[] {
+                new LengthFilter(MmsConfig.getMaxTextLimit())});
 
         mDone = (Button) findViewById(R.id.done_button);
         mDone.setOnClickListener(mDoneClickListener);
@@ -381,7 +377,7 @@ public class SlideEditorActivity extends Activity {
             menu.add(0, MENU_DEL_AUDIO, 0, R.string.remove_music).setIcon(
                     R.drawable.ic_menu_remove_sound);
         } else if (!slide.hasVideo()) {
-            if (MmsConfig.getBoolean(SmsManager.MMS_CONFIG_ALLOW_ATTACH_AUDIO)) {
+            if (MmsConfig.getAllowAttachAudio()) {
                 SubMenu subMenu = menu.addSubMenu(0, MENU_SUB_AUDIO, 0, R.string.add_music)
                     .setIcon(R.drawable.ic_menu_add_sound);
                 subMenu.add(0, MENU_ADD_AUDIO, 0, R.string.attach_sound);
diff --git a/src/com/android/mms/ui/SlideshowActivity.java b/src/com/android/mms/ui/SlideshowActivity.java
index 9f761e8d..004c2abb 100644
--- a/src/com/android/mms/ui/SlideshowActivity.java
+++ b/src/com/android/mms/ui/SlideshowActivity.java
@@ -54,7 +54,6 @@ import com.android.mms.model.LayoutModel;
 import com.android.mms.model.RegionModel;
 import com.android.mms.model.SlideshowModel;
 import com.android.mms.model.SmilHelper;
-
 import com.google.android.mms.MmsException;
 
 /**
diff --git a/src/com/android/mms/ui/SlideshowEditActivity.java b/src/com/android/mms/ui/SlideshowEditActivity.java
index a90589b3..225f34b6 100644
--- a/src/com/android/mms/ui/SlideshowEditActivity.java
+++ b/src/com/android/mms/ui/SlideshowEditActivity.java
@@ -44,7 +44,6 @@ import com.android.mms.model.IModelChangedObserver;
 import com.android.mms.model.Model;
 import com.android.mms.model.SlideModel;
 import com.android.mms.model.SlideshowModel;
-
 import com.google.android.mms.MmsException;
 import com.google.android.mms.pdu.PduBody;
 import com.google.android.mms.pdu.PduPersister;
diff --git a/src/com/android/mms/ui/SlideshowEditor.java b/src/com/android/mms/ui/SlideshowEditor.java
index dd916e36..39cb07a7 100644
--- a/src/com/android/mms/ui/SlideshowEditor.java
+++ b/src/com/android/mms/ui/SlideshowEditor.java
@@ -29,7 +29,6 @@ import com.android.mms.model.SlideModel;
 import com.android.mms.model.SlideshowModel;
 import com.android.mms.model.TextModel;
 import com.android.mms.model.VideoModel;
-
 import com.google.android.mms.ContentType;
 import com.google.android.mms.MmsException;
 
@@ -76,7 +75,7 @@ public class SlideshowEditor {
             SlideModel slide = new SlideModel(mModel);
 
             TextModel text = new TextModel(
-                    mContext, ContentType.TEXT_PLAIN, "text_" + size + ".txt",
+                    mContext, ContentType.TEXT_PLAIN, generateTextSrc(mModel, size),
                     mModel.getLayout().getTextRegion());
             slide.add(text);
 
@@ -87,6 +86,39 @@ public class SlideshowEditor {
             return false;
         }
     }
+
+    /**
+     * Generate an unique source for TextModel
+     *
+     * @param slideshow The current slideshow model
+     * @param position The expected position for the new model
+     * @return An unique source String
+     */
+    private String generateTextSrc(SlideshowModel slideshow, int position) {
+        final String prefix = "text_";
+        final String postfix = ".txt";
+
+        StringBuilder src = new StringBuilder(prefix).append(position).append(postfix);
+        boolean hasDupSrc = false;
+
+        do {
+            for (SlideModel model : slideshow) {
+                if (model.hasText()) {
+                    String testSrc = model.getText().getSrc();
+
+                    if (testSrc != null && testSrc.equals(src.toString())) {
+                        src = new StringBuilder(prefix).append(position + 1).append(postfix);
+                        hasDupSrc |= true;
+                        break;
+                    }
+                }
+                hasDupSrc = false;
+            }
+        } while (hasDupSrc);
+
+        return src.toString();
+    }
+
     /**
      * Add an existing slide at the specified position in the message.
      *
@@ -151,7 +183,7 @@ public class SlideshowEditor {
             TextModel text = slide.getText();
             if (text == null) {
                 text = new TextModel(mContext,
-                        ContentType.TEXT_PLAIN, "text_" + position + ".txt",
+                        ContentType.TEXT_PLAIN, generateTextSrc(mModel, position),
                         mModel.getLayout().getTextRegion());
                 text.setText(newText);
                 slide.add(text);
diff --git a/src/com/android/mms/ui/SubChooseAdapter.java b/src/com/android/mms/ui/SubChooseAdapter.java
deleted file mode 100644
index 606ddf07..00000000
--- a/src/com/android/mms/ui/SubChooseAdapter.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-package com.android.mms.ui;
-
-import android.R.string;
-
-import java.util.List;
-
-import android.content.Context;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-import com.android.mms.R;
-
-public class SubChooseAdapter extends BaseAdapter {
-
-    Context mContext;
-    List<SubscriptionInfo> mList;
-    public SubChooseAdapter(Context context, List<SubscriptionInfo> list) {
-        mContext = context;
-        mList = list;
-    }
-    @Override
-    public int getCount() {
-        return mList.size();
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return mList.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        SubscriptionView subView;
-        if (convertView == null) {
-            subView = new SubscriptionView(mContext);
-        } else {
-            subView = (SubscriptionView) convertView;
-        }
-        SubscriptionInfo subRecord = mList.get(position);
-        // Set theme of the item is LIGHT
-        subView.setThemeType(SubscriptionView.LIGHT_THEME);
-        if (subRecord.getSimSlotIndex() == SubscriptionManager.SIM_NOT_INSERTED) {
-            subView.setSubName(subRecord.getDisplayName());
-            subView.setSubNum(null);
-            subView.findViewById(R.id.sub_color).setVisibility(View.GONE);
-            subView.setClickable(true);
-        } else {
-            subView.setClickable(false);
-            subView.setSubInfo(subRecord);
-            subView.findViewById(R.id.sub_color).setVisibility(View.VISIBLE);
-        }
-        return subView;
-    }
-
-    public void setAdapterData(List<SubscriptionInfo> list) {
-        mList = list;
-    }
-
-}
diff --git a/src/com/android/mms/ui/SubSelectActivity.java b/src/com/android/mms/ui/SubSelectActivity.java
deleted file mode 100644
index 9d6fe176..00000000
--- a/src/com/android/mms/ui/SubSelectActivity.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-package com.android.mms.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import android.app.ActionBar;
-import android.app.ListActivity;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionListener;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.util.Log;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.ListView;
-
-import com.android.internal.telephony.PhoneConstants;
-import com.android.mms.LogTag;
-import com.android.mms.R;
-import com.android.mms.transaction.SimFullReceiver;
-import com.android.internal.telephony.TelephonyIntents;
-
-public class SubSelectActivity extends ListActivity {
-
-    private static String TAG = "SubSelectActivity";
-
-    // If intent has longArrayExtra with key EXTRA_APPOINTED_SUBS, activity
-    // only show subs in the longArrayExtra. If intent doesn't has the extra
-    // value,activity will show all active subs.
-    public static final String EXTRA_APPOINTED_SUBS = "subsArray";
-    private List<SubscriptionInfo> mSubInfoList = new ArrayList<SubscriptionInfo>();
-    private String mPreferenceKey;
-    private int mPreferenceTitleId;
-    private SubSelectAdapter mAdapter;
-    private int mOldSubCount = 0;
-    private int[] mAppointedSubArray = null;
-
-    private final SubscriptionListener mSubscriptionListener = new SubscriptionListener() {
-        @Override
-        public void onSubscriptionInfoChanged() {
-            List<SubscriptionInfo> nowSubList = SubscriptionManager.getActiveSubscriptionInfoList();
-            if (nowSubList == null || nowSubList.size() != mOldSubCount) {
-                Log.d(TAG, "sub count changed");
-                finish();
-            }
-        }
-    };
-
-    @Override
-    protected void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        getExtraValues(getIntent());
-        if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
-            Log.d(TAG, "onCreate preference key is: " + mPreferenceKey);
-        }
-        setTitle(mPreferenceTitleId);
-        //add action bar
-        ActionBar actionBar = getActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-
-        List<SubscriptionInfo> oldSubList = SubscriptionManager.getActiveSubscriptionInfoList();
-        if (oldSubList != null) {
-            mOldSubCount = oldSubList.size();
-        }
-
-        // Register for SubscriptionInfo list changes which is guaranteed
-        // to invoke onSubscriptionInfoChanged the first time.
-        SubscriptionManager.register(getBaseContext(), mSubscriptionListener,
-                SubscriptionListener.LISTEN_SUBSCRIPTION_INFO_LIST_CHANGED);
-
-        setAdapter();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        SubscriptionManager.unregister(getBaseContext(), mSubscriptionListener);
-    }
-
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        getExtraValues(intent);
-        setTitle(mPreferenceTitleId);
-        mAppointedSubArray = intent.getIntArrayExtra(EXTRA_APPOINTED_SUBS);
-        refreshAdapter();
-    }
-
-    private void getExtraValues(Intent intent) {
-        mPreferenceKey = intent.getStringExtra(MessagingPreferenceActivity.PREFERENCE_KEY);
-        mPreferenceTitleId = intent
-                .getIntExtra(MessagingPreferenceActivity.PREFERENCE_TITLE_ID, -1);
-        mAppointedSubArray = intent.getIntArrayExtra(EXTRA_APPOINTED_SUBS);
-    }
-
-    private void initialSubInfoList() {
-        int simCount = TelephonyManager.getDefault().getSimCount();
-        mSubInfoList.clear();
-        for (int slotId = 0; slotId < simCount; slotId++) {
-            List<SubscriptionInfo> subInfoRecordInOneSim = SubscriptionManager.getSubscriptionInfoUsingSlotId(
-                    slotId);
-            if (subInfoRecordInOneSim == null || subInfoRecordInOneSim.size() == 0) {
-                continue;
-            } else {
-                SubscriptionInfo infoRecord;
-                for (int i = 0; i < subInfoRecordInOneSim.size(); i++) {
-                    infoRecord = subInfoRecordInOneSim.get(i);
-                    // mNeedShowSubArray == null means intent isn't specified
-                    if (mAppointedSubArray == null || isSubIdInNeededShowArray(
-                            infoRecord.getSubscriptionId())) {
-                        mSubInfoList.add(infoRecord);
-                    }
-                }
-            }
-        }
-        if (mSubInfoList == null || mSubInfoList.size() == 0) {
-            finish();
-            return;
-        }
-    }
-
-    private void setAdapter() {
-        initialSubInfoList();
-        mAdapter = new SubSelectAdapter(this, mPreferenceKey, mSubInfoList);
-        setListAdapter(mAdapter);
-    }
-
-    private void refreshAdapter() {
-        initialSubInfoList();
-        mAdapter.setPreferenceKey(mPreferenceKey);
-        mAdapter.notifyDataSetChanged();
-    }
-
-    @Override
-    protected void onListItemClick(ListView l, View v, int position, long id) {
-        // start manage SIM message activity if preference is MANAGE_SIM_MESSAGE_MODE.
-        // else change the preference data.
-        if (MessagingPreferenceActivity.MANAGE_SIM_MESSAGE_MODE.equals(mPreferenceKey)) {
-            startManageSimMessages(position);
-        } else {
-            boolean isChecked =  mAdapter.isChecked(position);
-            SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(this)
-                    .edit();
-            editor.putBoolean(Integer.toString(mSubInfoList.get(position).getSubscriptionId())
-                    + "_" + mPreferenceKey, (!isChecked));
-            editor.apply();
-            CheckBox subCheckBox = (CheckBox) v.findViewById(R.id.subCheckBox);
-            subCheckBox.setChecked(!isChecked);
-        }
-    }
-
-    public void startManageSimMessages(int position) {
-        Intent it = new Intent();
-        it.setClass(this, ManageSimMessages.class);
-        it.putExtra(PhoneConstants.SUBSCRIPTION_KEY, mSubInfoList.get(position).getSubscriptionId());
-        startActivity(it);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                // The user clicked on the Messaging icon in the action bar. Take them back from
-                // wherever they came from
-                finish();
-                return true;
-        }
-        return false;
-    }
-
-    private boolean isSubIdInNeededShowArray(int subId) {
-        for (int id : mAppointedSubArray) {
-            if (subId == id) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/src/com/android/mms/ui/SubSelectAdapter.java b/src/com/android/mms/ui/SubSelectAdapter.java
deleted file mode 100644
index 5e531fed..00000000
--- a/src/com/android/mms/ui/SubSelectAdapter.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-package com.android.mms.ui;
-
-import java.util.List;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import android.telephony.SubscriptionInfo;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.CheckBox;
-import com.android.mms.R;
-
-public class SubSelectAdapter extends BaseAdapter {
-    private LayoutInflater mInf;
-    private String mPreferenceKey;
-    private Context mContext;
-    private List<SubscriptionInfo> mList;
-
-    public SubSelectAdapter(Context context, String preferenceKey, List<SubscriptionInfo> list) {
-        mInf = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        mContext = context;
-        mPreferenceKey = preferenceKey;
-        mList = list;
-    }
-
-
-    @Override
-    public int getCount() {
-        return mList == null ? 0 : mList.size();
-    }
-
-    @Override
-    public Object getItem(int position) {
-        return mList.get(position);
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        View view = mInf.inflate(R.layout.sub_select_item, null);
-        SubscriptionView subView;
-        if (convertView != null && (convertView instanceof SubscriptionView)) {
-            subView = (SubscriptionView) convertView;
-        } else {
-            subView = (SubscriptionView) view.findViewById(R.id.subItem);
-        }
-        subView.setThemeType(SubscriptionView.LIGHT_THEME);
-        subView.setSubInfo(mList.get(position));
-        CheckBox subCheckBox = (CheckBox) view.findViewById(R.id.subCheckBox);
-        if (MessagingPreferenceActivity.MANAGE_SIM_MESSAGE_MODE.equals(mPreferenceKey)) {
-            subCheckBox.setVisibility(View.GONE);
-        } else {
-            subCheckBox.setChecked(isChecked(position));
-        }
-        return view;
-    }
-
-    /**
-     * get the related preference data by position to find whether
-     * @param position
-     * @return whether has checked
-     */
-    public boolean isChecked(int position) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-        return prefs.getBoolean(Integer.toString(mList.get(position).getSubscriptionId())
-                + "_" + mPreferenceKey, false);
-    }
-
-    /**
-     * set the mPreferenceKey
-     *
-     * @param preferenceKey
-     */
-    public void setPreferenceKey(String preferenceKey) {
-        mPreferenceKey = preferenceKey;
-    }
-}
diff --git a/src/com/android/mms/ui/SubscriptionView.java b/src/com/android/mms/ui/SubscriptionView.java
deleted file mode 100644
index df8224ae..00000000
--- a/src/com/android/mms/ui/SubscriptionView.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-package com.android.mms.ui;
-
-import android.content.Context;
-import android.telephony.SubscriptionManager;
-import android.telephony.SubscriptionInfo;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.android.mms.R;
-
-public class SubscriptionView extends LinearLayout {
-
-    public static final int DARK_THEME = 0;
-    public static final int LIGHT_THEME = 1;
-    private static final int MIN_NUM_LENGTH = 4;
-
-    private TextView mSubNameView;
-    private TextView mSubNumView;
-    private TextView mSubShortNumView;
-    private RelativeLayout mSubColorView;
-    private int mThemeType = DARK_THEME;
-    private int mNumLength = MIN_NUM_LENGTH;
-
-    public SubscriptionView(Context context) {
-        this(context,null);
-    }
-
-    public SubscriptionView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        LayoutInflater inflator = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        View view = inflator.inflate(R.layout.subscription_item_layout, null);
-        addView(view);
-        initViewElement(view);
-    }
-
-    /**
-     * Set how many numbers to be shown for short number view, default is MIN_NUM_LENGTH which is 4
-     * @param numLength The length of subscription number to be shown
-     */
-    public void setNumLength(int numLength) {
-        mNumLength = numLength;
-    }
-
-    /**
-     * Theme type used for subscription background color, dark or light, default is in dark theme
-     * @param themeType The theme type 0 for dark, 1 for light
-     */
-    public void setThemeType(int themeType) {
-        mThemeType = themeType;
-    }
-
-    private void initViewElement(View view) {
-        mSubNameView = (TextView) view.findViewById(R.id.sub_name);
-        mSubNumView = (TextView) view.findViewById(R.id.sub_number);
-        mSubShortNumView = (TextView) view.findViewById(R.id.sub_short_number);
-        mSubColorView = (RelativeLayout) view.findViewById(R.id.sub_color);
-    }
-
-    /**
-     * By passing subscription information into view and set views based on Subscription information.
-     * Update Sub name / number / color / shortNumber views
-     * @param subInfo The SubInfoRecord of subscription
-     */
-    public void setSubInfo(SubscriptionInfo subInfo) {
-        if (subInfo != null) {
-            setSubIconTint(subInfo.getIconTint());
-            setSubName(subInfo.getDisplayName());
-            setSubNum(subInfo.getNumber());
-            // TODO currently fixed to the default
-            setSubShortNum(SubscriptionManager.DISPLAY_NUMBER_DEFAULT, subInfo.getNumber());
-        }
-    }
-
-    /**
-     * Set Sub icon tint color view
-     * @param tint The icon tint color from SubInfoRecord of subscription
-     */
-    public void setSubIconTint(int tint) {
-        mSubColorView.setBackgroundColor(tint);
-    }
-
-    /**
-     * Set subscription short number view
-     * @param format The format of short number of subscription, first 4 / last 4 / no display
-     * @param num The subscription number
-     */
-    public void setSubShortNum(int format, String num) {
-        String formatNum = "";
-        if (!TextUtils.isEmpty(num) && format != SubscriptionManager.DISPLAY_NUMBER_NONE) {
-            if (num.length() <= mNumLength) {
-                formatNum = num;
-            } else {
-                formatNum = format == SubscriptionManager.DISPLAY_NUMBER_FIRST ?
-                                      num.substring(0,mNumLength) :
-                                      num.substring(num.length() - mNumLength , num.length());
-            }
-            mSubShortNumView.setText(formatNum);
-        }
-        mSubShortNumView.setVisibility(TextUtils.isEmpty(formatNum) ? View.GONE : View.VISIBLE);
-    }
-
-    /**
-     * Set subscription number view
-     * @param num The number of subscription
-     */
-    public void setSubNum(CharSequence num) {
-        if (num != null) {
-            mSubNumView.setText(num);
-        }
-        mSubNumView.setVisibility(TextUtils.isEmpty(num) ? View.GONE : View.VISIBLE);
-    }
-
-    /**
-     * Set subscription name view
-     * @param name The name of subscription
-     */
-    public void setSubName(CharSequence name) {
-        if (name != null) {
-            mSubNameView.setText(name);
-        }
-        mSubNameView.setVisibility(TextUtils.isEmpty(name) ? View.GONE : View.VISIBLE);
-    }
-}
diff --git a/src/com/android/mms/util/AddressUtils.java b/src/com/android/mms/util/AddressUtils.java
index 87fd08df..f79c81cf 100644
--- a/src/com/android/mms/util/AddressUtils.java
+++ b/src/com/android/mms/util/AddressUtils.java
@@ -32,7 +32,6 @@ import com.google.android.mms.pdu.PduHeaders;
 import com.google.android.mms.pdu.PduPersister;
 
 public class AddressUtils {
-    private static final String TAG = "AddressUtils";
     private static PhoneNumberUtil mPhoneNumberUtil;
 
     private AddressUtils() {
diff --git a/src/com/android/mms/util/BackgroundLoaderManager.java b/src/com/android/mms/util/BackgroundLoaderManager.java
index aec899d6..44bd45c9 100644
--- a/src/com/android/mms/util/BackgroundLoaderManager.java
+++ b/src/com/android/mms/util/BackgroundLoaderManager.java
@@ -16,6 +16,8 @@
 
 package com.android.mms.util;
 
+import com.android.mms.LogTag;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -32,8 +34,6 @@ import android.net.Uri;
 import android.os.Handler;
 import android.util.Log;
 
-import com.android.mms.LogTag;
-
 /**
  * Base class {@link BackgroundLoaderManager} used by {@link MessagingApplication} for loading
  * items (images, thumbnails, pdus, etc.) in the background off of the UI thread.
diff --git a/src/com/android/mms/util/BlobCache.java b/src/com/android/mms/util/BlobCache.java
index fc062ff0..7d8026a2 100644
--- a/src/com/android/mms/util/BlobCache.java
+++ b/src/com/android/mms/util/BlobCache.java
@@ -65,6 +65,8 @@
 //
 package com.android.mms.util;
 
+import com.android.mms.LogTag;
+
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
@@ -76,8 +78,6 @@ import java.util.zip.Adler32;
 
 import android.util.Log;
 
-import com.android.mms.LogTag;
-
 public class BlobCache implements Closeable {
     private static final String TAG = LogTag.TAG;
 
diff --git a/src/com/android/mms/util/CacheManager.java b/src/com/android/mms/util/CacheManager.java
index 5412d178..06780e9d 100644
--- a/src/com/android/mms/util/CacheManager.java
+++ b/src/com/android/mms/util/CacheManager.java
@@ -16,6 +16,8 @@
 
 package com.android.mms.util;
 
+import com.android.mms.LogTag;
+
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;
@@ -25,8 +27,6 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.util.Log;
 
-import com.android.mms.LogTag;
-
 public class CacheManager {
     private static final String TAG = LogTag.TAG;
     private static final String KEY_CACHE_UP_TO_DATE = "cache-up-to-date";
diff --git a/src/com/android/mms/util/DownloadManager.java b/src/com/android/mms/util/DownloadManager.java
index c1446ccd..b6d9f497 100644
--- a/src/com/android/mms/util/DownloadManager.java
+++ b/src/com/android/mms/util/DownloadManager.java
@@ -41,7 +41,6 @@ import com.android.mms.LogTag;
 import com.android.mms.R;
 import com.android.mms.data.Contact;
 import com.android.mms.ui.MessagingPreferenceActivity;
-
 import com.google.android.mms.MmsException;
 import com.google.android.mms.pdu.EncodedStringValue;
 import com.google.android.mms.pdu.NotificationInd;
@@ -60,6 +59,8 @@ public class DownloadManager {
     public static final int STATE_TRANSIENT_FAILURE = 0x82;
     public static final int STATE_PERMANENT_FAILURE = 0x87;
     public static final int STATE_PRE_DOWNLOADING   = 0x88;
+    // TransactionService will skip downloading Mms if auto-download is off
+    public static final int STATE_SKIP_RETRYING     = 0x89;
 
     private final Context mContext;
     private final Handler mHandler;
@@ -186,7 +187,7 @@ public class DownloadManager {
         return "true".equals(roaming);
     }
 
-    public void markState(final Uri uri, int state, final int subId) {
+    public void markState(final Uri uri, int state) {
         // Notify user if the message has expired.
         try {
             NotificationInd nInd = (NotificationInd) PduPersister.getPduPersister(mContext)
@@ -212,7 +213,7 @@ public class DownloadManager {
             mHandler.post(new Runnable() {
                 public void run() {
                     try {
-                        Toast.makeText(mContext, getMessage(uri, subId),
+                        Toast.makeText(mContext, getMessage(uri),
                                 Toast.LENGTH_LONG).show();
                     } catch (MmsException e) {
                         Log.e(TAG, e.getMessage(), e);
@@ -244,7 +245,7 @@ public class DownloadManager {
         });
     }
 
-    private String getMessage(Uri uri, int subId) throws MmsException {
+    private String getMessage(Uri uri) throws MmsException {
         NotificationInd ind = (NotificationInd) PduPersister
                 .getPduPersister(mContext).load(uri);
 
@@ -254,7 +255,7 @@ public class DownloadManager {
 
         v = ind.getFrom();
         String from = (v != null)
-                ? Contact.get(v.getString(), false, subId).getName()
+                ? Contact.get(v.getString(), false).getName()
                 : mContext.getString(R.string.unknown_sender);
 
         return mContext.getString(R.string.dl_failure_notification, subject, from);
diff --git a/src/com/android/mms/util/ImageCacheService.java b/src/com/android/mms/util/ImageCacheService.java
index 9cd82f98..242220ba 100644
--- a/src/com/android/mms/util/ImageCacheService.java
+++ b/src/com/android/mms/util/ImageCacheService.java
@@ -22,9 +22,6 @@ import java.nio.ByteBuffer;
 import android.content.Context;
 
 public class ImageCacheService {
-    @SuppressWarnings("unused")
-    private static final String TAG = "ImageCacheService";
-
     public static final String IMAGE_CACHE_FILE = "imgcache";
     private static final int IMAGE_CACHE_MAX_ENTRIES = 500;
     private static final int IMAGE_CACHE_MAX_BYTES = 20 * 1024 * 1024;
diff --git a/src/com/android/mms/util/PduLoaderManager.java b/src/com/android/mms/util/PduLoaderManager.java
index 8253042c..5ef7e5e3 100644
--- a/src/com/android/mms/util/PduLoaderManager.java
+++ b/src/com/android/mms/util/PduLoaderManager.java
@@ -65,7 +65,7 @@ public class PduLoaderManager extends BackgroundLoaderManager {
     public PduLoaderManager(final Context context) {
         super(context);
 
-        mSlideshowCache = new SimpleCache<Uri, SlideshowModel>(8, 16, 0.75f, true);
+        mSlideshowCache = new SimpleCache<Uri, SlideshowModel>(8, 16, 0.75f, false);
         mPduCache = PduCache.getInstance();
         mPduPersister = PduPersister.getPduPersister(context);
         mContext = context;
diff --git a/src/com/android/mms/util/RateController.java b/src/com/android/mms/util/RateController.java
index b97371b4..1364f995 100644
--- a/src/com/android/mms/util/RateController.java
+++ b/src/com/android/mms/util/RateController.java
@@ -17,6 +17,8 @@
 
 package com.android.mms.util;
 
+import com.android.mms.LogTag;
+
 import android.content.BroadcastReceiver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -27,8 +29,6 @@ import android.database.sqlite.SqliteWrapper;
 import android.provider.Telephony.Mms.Rate;
 import android.util.Log;
 
-import com.android.mms.LogTag;
-
 public class RateController {
     private static final String TAG = LogTag.TAG;
     private static final boolean DEBUG = false;
@@ -81,6 +81,7 @@ public class RateController {
 
         if (sInstance != null) {
             Log.w(TAG, "Already initialized.");
+            return;
         }
         sInstance = new RateController(context);
     }
diff --git a/src/com/android/mms/util/SendingProgressTokenManager.java b/src/com/android/mms/util/SendingProgressTokenManager.java
index 5d3e0898..63d0b46b 100644
--- a/src/com/android/mms/util/SendingProgressTokenManager.java
+++ b/src/com/android/mms/util/SendingProgressTokenManager.java
@@ -17,12 +17,12 @@
 
 package com.android.mms.util;
 
+import com.android.mms.LogTag;
+
 import java.util.HashMap;
 
 import android.util.Log;
 
-import com.android.mms.LogTag;
-
 public class SendingProgressTokenManager {
     private static final String TAG = LogTag.TAG;
     private static final boolean DEBUG = false;
diff --git a/src/com/android/mms/util/SubStatusResolver.java b/src/com/android/mms/util/SubStatusResolver.java
deleted file mode 100644
index 65af128c..00000000
--- a/src/com/android/mms/util/SubStatusResolver.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-package com.android.mms.util;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.provider.Settings;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.util.Log;
-
-import java.util.List;
-
-import com.android.mms.LogTag;
-
-public class SubStatusResolver {
-    private static final String TAG = "SubStatusResolver";
-
-    public static boolean isMobileDataEnabledOnAnySub(Context context) {
-        ConnectivityManager connectivityManager = (ConnectivityManager) context.
-                getSystemService(Context.CONNECTIVITY_SERVICE);
-        List<SubscriptionInfo> subInfoList = SubscriptionManager.getActiveSubscriptionInfoList();
-        if (subInfoList != null) {
-            for (SubscriptionInfo subInfo : subInfoList) {
-                if (connectivityManager.getMobileDataEnabled(/* TODO subInfo.subId*/)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/src/com/android/mms/widget/MmsWidgetProvider.java b/src/com/android/mms/widget/MmsWidgetProvider.java
index 10d146ec..6787313d 100644
--- a/src/com/android/mms/widget/MmsWidgetProvider.java
+++ b/src/com/android/mms/widget/MmsWidgetProvider.java
@@ -129,4 +129,4 @@ public class MmsWidgetProvider extends AppWidgetProvider {
         context.sendBroadcast(intent);
     }
 
-}
-\ No newline at end of file
+}
diff --git a/tests/Android.mk b/tests/Android.mk
index b79da116..ac06b11a 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -18,7 +18,7 @@ include $(CLEAR_VARS)
 # We only want this apk build for tests.
 LOCAL_MODULE_TAGS := tests
 
-LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common mms-common
+LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common
 
 # Include all test java files.
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/SmsAutoReply/res/values-et/strings.xml b/tests/SmsAutoReply/res/values-az-rAZ/strings.xml
index 0f5481c5..d5156c69 100644
--- a/tests/SmsAutoReply/res/values-et/strings.xml
+++ b/tests/SmsAutoReply/res/values-az-rAZ/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="hello" msgid="4362104386868779475">"Tere, maailm, AutoReplyActivity!"</string>
+    <string name="hello" msgid="4362104386868779475">"Hamıya salam, AutoReplyActivity!"</string>
     <string name="app_name" msgid="8981613135633738208">"SmsAutoReply"</string>
 </resources>
diff --git a/tests/SmsAutoReply/res/values-bn-rBD/strings.xml b/tests/SmsAutoReply/res/values-bn-rBD/strings.xml
new file mode 100644
index 00000000..b9515af6
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-bn-rBD/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"হ্যালো ওয়ার্ল্ড, AutoReplyActivity!"</string>
+    <string name="app_name" msgid="8981613135633738208">"SmsAutoReply"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-eu-rES/strings.xml b/tests/SmsAutoReply/res/values-eu-rES/strings.xml
new file mode 100644
index 00000000..9b19aa09
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-eu-rES/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"Kaixo denei, AutoReplyActivity!"</string>
+    <string name="app_name" msgid="8981613135633738208">"SMS mezuei automatikoki erantzuteko zerbitzua"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-gl-rES/strings.xml b/tests/SmsAutoReply/res/values-gl-rES/strings.xml
new file mode 100644
index 00000000..504f6a44
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-gl-rES/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"Ola a todo o mundo, AutoReplyActivity!"</string>
+    <string name="app_name" msgid="8981613135633738208">"SmsAutoReply"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-ms/strings.xml b/tests/SmsAutoReply/res/values-is-rIS/strings.xml
index 68fe36ba..b796f9c2 100644
--- a/tests/SmsAutoReply/res/values-ms/strings.xml
+++ b/tests/SmsAutoReply/res/values-is-rIS/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="hello" msgid="4362104386868779475">"Helo Dunia, AktivitiBalasAuto!"</string>
+    <string name="hello" msgid="4362104386868779475">"Halló, heimur. AutoReplyActivity!"</string>
     <string name="app_name" msgid="8981613135633738208">"SmsAutoReply"</string>
 </resources>
diff --git a/tests/SmsAutoReply/res/values-kk-rKZ/strings.xml b/tests/SmsAutoReply/res/values-kk-rKZ/strings.xml
new file mode 100644
index 00000000..e46b7b81
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-kk-rKZ/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"Сәлем Әлем, AвтоЖауапӘрекеті!"</string>
+    <string name="app_name" msgid="8981613135633738208">"SmsAвтоЖауап"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-kn-rIN/strings.xml b/tests/SmsAutoReply/res/values-kn-rIN/strings.xml
new file mode 100644
index 00000000..bbe67834
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-kn-rIN/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"ಹಲೋ ವರ್ಲ್ಡ್, ಸ್ವಯಂ ಪ್ರತ್ಯುತ್ತರ ಚಟುವಟಿಕೆ!"</string>
+    <string name="app_name" msgid="8981613135633738208">"Sms ಸ್ವಯಂ ಪ್ರತ್ಯುತ್ತರ"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-ky-rKG/strings.xml b/tests/SmsAutoReply/res/values-ky-rKG/strings.xml
new file mode 100644
index 00000000..757023f9
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-ky-rKG/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"Салам дүйнө, АвтоЖоопбергичИшАракети!"</string>
+    <string name="app_name" msgid="8981613135633738208">"SmsАвтоЖоопбергич"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-mk-rMK/strings.xml b/tests/SmsAutoReply/res/values-mk-rMK/strings.xml
new file mode 100644
index 00000000..7407af98
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-mk-rMK/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"Здраво на светот, AutoReplyActivity!"</string>
+    <string name="app_name" msgid="8981613135633738208">"SmsAutoReply"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-ml-rIN/strings.xml b/tests/SmsAutoReply/res/values-ml-rIN/strings.xml
new file mode 100644
index 00000000..86486686
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-ml-rIN/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"ഹലോ ലോകമേ, AutoReplyActivity!"</string>
+    <string name="app_name" msgid="8981613135633738208">"SmsAutoReply"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-mr-rIN/strings.xml b/tests/SmsAutoReply/res/values-mr-rIN/strings.xml
new file mode 100644
index 00000000..ff878645
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-mr-rIN/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"हॅलो वर्ल्ड, AutoReplyActivity!"</string>
+    <string name="app_name" msgid="8981613135633738208">"SmsAutoReply"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-my-rMM/strings.xml b/tests/SmsAutoReply/res/values-my-rMM/strings.xml
new file mode 100644
index 00000000..27e0f01b
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-my-rMM/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"မင်္ဂလာပါကမ္ဘာကြီး AutoReplyActivity!"</string>
+    <string name="app_name" msgid="8981613135633738208">"စာတို အလိုအလျောက် ပြန်ခြင်း"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-ne-rNP/strings.xml b/tests/SmsAutoReply/res/values-ne-rNP/strings.xml
new file mode 100644
index 00000000..ca6a0870
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-ne-rNP/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"नमस्ते विश्व, AutoReplyActivity!"</string>
+    <string name="app_name" msgid="8981613135633738208">"SmsAutoReply"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-si-rLK/strings.xml b/tests/SmsAutoReply/res/values-si-rLK/strings.xml
new file mode 100644
index 00000000..d747db70
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-si-rLK/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"ආයුබෝවන් ලෝකය, AutoReplyActivity!"</string>
+    <string name="app_name" msgid="8981613135633738208">"SmsAutoReply"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-ta-rIN/strings.xml b/tests/SmsAutoReply/res/values-ta-rIN/strings.xml
new file mode 100644
index 00000000..2b1901f4
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-ta-rIN/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"அன்பார்ந்தவர்களே, AutoReplyActivity!"</string>
+    <string name="app_name" msgid="8981613135633738208">"SmsAutoReply"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-te-rIN/strings.xml b/tests/SmsAutoReply/res/values-te-rIN/strings.xml
new file mode 100644
index 00000000..f732bde3
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-te-rIN/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"హలో ప్రపంచం, AutoReplyActivity!"</string>
+    <string name="app_name" msgid="8981613135633738208">"SmsAutoReply"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-ur-rPK/strings.xml b/tests/SmsAutoReply/res/values-ur-rPK/strings.xml
new file mode 100644
index 00000000..2be4e4a8
--- /dev/null
+++ b/tests/SmsAutoReply/res/values-ur-rPK/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="hello" msgid="4362104386868779475">"‏ہیلو دنیا والو، AutoReplyActivity!‎"</string>
+    <string name="app_name" msgid="8981613135633738208">"SmsAutoReply"</string>
+</resources>
diff --git a/tests/SmsAutoReply/res/values-be/strings.xml b/tests/SmsAutoReply/res/values-uz-rUZ/strings.xml
index 0a7d2f29..b1caf77f 100644
--- a/tests/SmsAutoReply/res/values-be/strings.xml
+++ b/tests/SmsAutoReply/res/values-uz-rUZ/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="hello" msgid="4362104386868779475">"Hello World, AutoReplyActivity!"</string>
+    <string name="hello" msgid="4362104386868779475">"Salom dunyo, AutoReplyActivity!"</string>
     <string name="app_name" msgid="8981613135633738208">"SmsAutoReply"</string>
 </resources>
diff --git a/tests/src/com/android/mms/RecyclerTest.java b/tests/src/com/android/mms/RecyclerTest.java
index e3d79568..2446a26a 100644
--- a/tests/src/com/android/mms/RecyclerTest.java
+++ b/tests/src/com/android/mms/RecyclerTest.java
@@ -22,10 +22,10 @@ import java.util.Random;
 
 import com.android.mms.data.Contact;
 import com.android.mms.util.Recycler;
-
 import android.provider.Telephony.Sms;
 import android.provider.Telephony.Threads;
 import android.provider.Telephony.Sms.Inbox;
+
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
@@ -35,7 +35,6 @@ import android.database.sqlite.SQLiteException;
 import android.database.sqlite.SqliteWrapper;
 import android.net.Uri;
 import android.provider.Telephony.Sms.Conversations;
-import android.telephony.SubscriptionManager;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Log;
@@ -160,7 +159,7 @@ public class RecyclerTest extends AndroidTestCase {
         // Make sure we've got a thread id so after the insert we'll be able to delete
         // excess messages.
         Long threadId = 0L;
-        Contact cacheContact = Contact.get(address, true, SubscriptionManager.DEFAULT_SUB_ID);
+        Contact cacheContact = Contact.get(address,true);
         if (cacheContact != null) {
             address = cacheContact.getNumber();
         }
diff --git a/tests/src/com/android/mms/ui/ComposeMessageActivityTests.java b/tests/src/com/android/mms/ui/ComposeMessageActivityTests.java
index 96c79ba6..ca2fd51a 100644
--- a/tests/src/com/android/mms/ui/ComposeMessageActivityTests.java
+++ b/tests/src/com/android/mms/ui/ComposeMessageActivityTests.java
@@ -26,7 +26,6 @@ import com.android.mms.ui.MessageListAdapter.ColumnsMap;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.telephony.SubscriptionManager;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
@@ -195,23 +194,19 @@ public class ComposeMessageActivityTests
     // the threads directly to the mms provider's threads table.
     @LargeTest
     public void testCreateManyThreads() {
-        final int subId = SubscriptionManager.getDefaultSmsSubId();
         for (int i = 0; i < 10; i++) {
             String phoneNum = String.format("424-123-%04d", i);
-            ContactList contactList = ContactList.getByNumbers(phoneNum, false, false,
-                    SubscriptionManager.DEFAULT_SUB_ID);
-            Conversation conv = Conversation.get(mActivity, contactList, false,
-                    SubscriptionManager.DEFAULT_SUB_ID);
-
-            WorkingMessage workingMsg = WorkingMessage.loadDraft(mActivity, conv, null,
-                    SubscriptionManager.DEFAULT_SUB_ID);
-            workingMsg.setConversation(conv, subId);
+            ContactList contactList = ContactList.getByNumbers(phoneNum, false, false);
+            Conversation conv = Conversation.get(mActivity, contactList, false);
+
+            WorkingMessage workingMsg = WorkingMessage.loadDraft(mActivity, conv, null);
+            workingMsg.setConversation(conv);
             workingMsg.setText("This is test #" + i + " thread id: " + conv.getThreadId());
 
 //            Log.i(TAG, "[testCreateManyThreads] workingMsg: ");
 //            workingMsg.dump();
 
-            workingMsg.saveDraft(false, subId);
+            workingMsg.saveDraft(false);
         }
     }
 }
diff --git a/tests/src/com/android/mms/ui/SmsTest.java b/tests/src/com/android/mms/ui/SmsTest.java
index 56be37ab..89c04c13 100644
--- a/tests/src/com/android/mms/ui/SmsTest.java
+++ b/tests/src/com/android/mms/ui/SmsTest.java
@@ -26,7 +26,6 @@ import com.android.mms.SmsTestRunner;
 
 import android.database.Cursor;
 import android.content.Context;
-import android.telephony.SubscriptionManager;
 import android.test.ActivityInstrumentationTestCase2;
 import android.view.View;
 import android.view.ViewStub;
@@ -94,7 +93,7 @@ public class SmsTest
         if (mInst.mRecipient != null) {
             mRecipient = mInst.mRecipient;
         } else {
-            mRecipient = getLocalNumber(SubscriptionManager.getDefaultSmsSubId());
+            mRecipient = getLocalNumber();
         }
         if (mInst.mReceiveTimer > 0) {
             mReceiveTimer = mInst.mReceiveTimer;
@@ -209,8 +208,8 @@ public class SmsTest
     /**
      * @return the local number for this test device
      */
-    protected String getLocalNumber(int subId) {
-        return MessageUtils.getLocalNumber(subId);
+    protected String getLocalNumber() {
+        return MessageUtils.getLocalNumber();
     }
 
     /**
diff --git a/tests/src/com/android/mms/util/VerifyRecipientUnitTests.java b/tests/src/com/android/mms/util/VerifyRecipientUnitTests.java
index 1c3c1791..53343b39 100644
--- a/tests/src/com/android/mms/util/VerifyRecipientUnitTests.java
+++ b/tests/src/com/android/mms/util/VerifyRecipientUnitTests.java
@@ -18,7 +18,6 @@ package com.android.mms.util;
 
 import android.content.Context;
 import android.provider.Telephony.Threads;
-import android.telephony.SubscriptionManager;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ -51,13 +50,11 @@ public class VerifyRecipientUnitTests extends AndroidTestCase {
      */
     public void testVerifyRecipients() {
         assertEquals("Numbers aren't equal",
-                Conversation.verifySingleRecipient(getContext(), mThreadId1, "(415) 232-4567",
-                        SubscriptionManager.DEFAULT_SUB_ID),
+                Conversation.verifySingleRecipient(getContext(), mThreadId1, "(415) 232-4567"),
                 "(415) 232-4567");
 
         assertEquals("Numbers aren't equal",
-                Conversation.verifySingleRecipient(getContext(), mThreadId1, " 232-4567",
-                        SubscriptionManager.DEFAULT_SUB_ID),
+                Conversation.verifySingleRecipient(getContext(), mThreadId1, " 232-4567"),
                 "232-4567");
     }
 }
author	Tom Taylor <tomtaylor@google.com>	2014-11-13 11:49:06 -0800
committer	Tom Taylor <tomtaylor@google.com>	2014-11-13 11:49:06 -0800
commit	a277f438d33872b9a0f1611fb8a86a918765f04b (patch)
tree	db76dae863325d29aac809e0abce45b3c06ceae4
parent	0f5099dfc908e0ea76b68b69b46b864039b52552 (diff)
download	Mms-a277f438d33872b9a0f1611fb8a86a918765f04b.tar.gz