diff --git a/res/layout/stk_title.xml b/res/layout/stk_title.xml
index c5ca16c..a5ef109 100755
--- a/res/layout/stk_title.xml
+++ b/res/layout/stk_title.xml
@@ -36,13 +36,19 @@
             android:layout_alignParentLeft="true"
             android:scaleType="fitCenter" />
 
-        <TextView android:id="@+id/title_text"
-            android:gravity="center_vertical"
+        <HorizontalScrollView
             android:layout_width="match_parent"
-            android:layout_height="32dip"
-            android:ellipsize="end"
-            android:maxLines="1"
-            style="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title" />
+            android:layout_height="match_parent"
+            android:scrollbars="none">
+            <TextView android:id="@+id/title_text"
+                android:gravity="center_vertical"
+                android:layout_width="match_parent"
+                android:layout_height="32dip"
+                android:ellipsize="end"
+                android:maxLines="1"
+                style="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title" />
+        </HorizontalScrollView>
+
     </LinearLayout>
 
     <LinearLayout android:id="@+id/right_container"
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 51af5c4..414bfc6 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -42,5 +42,5 @@
     <string name="stk_dialog_accept" msgid="8498901537508923727">"አዎ"</string>
     <string name="stk_dialog_reject" msgid="921848059485746796">"አይ"</string>
     <string name="no_sim_card_inserted" msgid="5316620398365235988">"የሲም መሥሪያ ስብስብን ለማስጀመር እባክዎ ሲም ያስገቡ።"</string>
-    <string name="stk_channel_name" msgid="8828587788561382056">"የተንቀሳቃሽ ስልክ አገልግሎት መልእክቶች"</string>
+    <string name="stk_channel_name" msgid="8828587788561382056">"የተንቀሳቃሽ ስልክ አገልግሎት መልዕክቶች"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 8d981f7..f6af645 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -32,7 +32,7 @@
     <string name="default_setup_call_msg" msgid="6126904475461162162">"جارٍ إعداد المكالمة"</string>
     <string name="stk_app_state" msgid="18582277302584082">"حالة التطبيق"</string>
     <string name="enable_app" msgid="3701224550936728203">"تم التمكين"</string>
-    <string name="disable_app" msgid="6725081975611415214">"معطّل"</string>
+    <string name="disable_app" msgid="6725081975611415214">"غير مفعّل"</string>
     <string name="stk_dialog_title" msgid="6954825385456886726">"‏مجموعة أدوات شريحة SIM"</string>
     <string name="default_tone_dialog_msg" msgid="4595366992944391641">"تشغيل نغمة"</string>
     <string name="default_open_channel_msg" msgid="2216070254100295924">"قناة مفتوحة؟"</string>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
new file mode 100644
index 0000000..b866021
--- /dev/null
+++ b/res/values-as/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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_name" msgid="8396461461738434341">"ছিমৰ টুলকিট"</string>
+    <string name="menu_end_session" msgid="7368541737750982217">"ছেশ্বন সমাপ্ত কৰক"</string>
+    <string name="help" msgid="9209980881219397319">"সহায়"</string>
+    <string name="menu_back" msgid="301227740977453364">"উভতি যাওক"</string>
+    <string name="service_name" msgid="6860303747999592491">"সেৱাৰ নাম"</string>
+    <string name="stk_no_service" msgid="5427773116839809131">"কোনো সেৱা নাই"</string>
+    <string name="button_ok" msgid="5760722312558549555">"ঠিক আছে"</string>
+    <string name="button_cancel" msgid="1997847915560800261">"বাতিল কৰক"</string>
+    <string name="button_yes" msgid="624420260648337203">"হ\'ব"</string>
+    <string name="button_no" msgid="1824959157582605627">"নালাগে"</string>
+    <string name="alphabet" msgid="1583185545938805861">"বৰ্ণমালাবোৰ"</string>
+    <string name="digits" msgid="1746796679021682388">"অংকবোৰ (০-৯, *, #, +)"</string>
+    <string name="default_call_setup_msg" msgid="7960194995759849940">"কল চলি আছে…"</string>
+    <string name="default_setup_call_msg" msgid="6126904475461162162">"কল ছেটআপ কৰি থকা হৈছে"</string>
+    <string name="stk_app_state" msgid="18582277302584082">"এপ্লিকেশ্বনৰ স্থিতি"</string>
+    <string name="enable_app" msgid="3701224550936728203">"সক্ষম কৰা হৈছে"</string>
+    <string name="disable_app" msgid="6725081975611415214">"অক্ষম কৰা হৈছে"</string>
+    <string name="stk_dialog_title" msgid="6954825385456886726">"ছিমৰ টুলকিট"</string>
+    <string name="default_tone_dialog_msg" msgid="4595366992944391641">"ট\'ন প্লে কৰি থকা হৈছে"</string>
+    <string name="default_open_channel_msg" msgid="2216070254100295924">"চ্চেনেল খুলিবনে?"</string>
+    <string name="default_send_data_msg" msgid="6011219698689931272">"ডেটা পঠিয়াই থকা হৈছে"</string>
+    <string name="default_receive_data_msg" msgid="618096941772010682">"ডেটা প্ৰাপ্ত কৰি থকা হৈছে"</string>
+    <string name="default_close_channel_msg" msgid="765364262263839824">"চ্চেনেল বন্ধ কৰা হ\'ল"</string>
+    <string name="stk_dialog_accept" msgid="8498901537508923727">"হয়"</string>
+    <string name="stk_dialog_reject" msgid="921848059485746796">"নহয়"</string>
+    <string name="no_sim_card_inserted" msgid="5316620398365235988">"ছিমৰ টুলকিট লঞ্চ কৰিবলৈ অনুগ্ৰহ কৰি ছিম ভৰাওক।"</string>
+    <string name="stk_channel_name" msgid="8828587788561382056">"ম’বাইল সেৱাৰ বাৰ্তাবোৰ"</string>
+</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 5fb2c5c..5b17537 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="8396461461738434341">"SIM Toolkit"</string>
-    <string name="menu_end_session" msgid="7368541737750982217">"Završiti sesiju"</string>
+    <string name="menu_end_session" msgid="7368541737750982217">"Završi sesiju"</string>
     <string name="help" msgid="9209980881219397319">"Pomoć"</string>
     <string name="menu_back" msgid="301227740977453364">"Nazad"</string>
     <string name="service_name" msgid="6860303747999592491">"Ime usluge"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b162b3b..c737d46 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -20,7 +20,7 @@
     <string name="menu_end_session" msgid="7368541737750982217">"Afslut sessionen"</string>
     <string name="help" msgid="9209980881219397319">"Hjælp"</string>
     <string name="menu_back" msgid="301227740977453364">"Tilbage"</string>
-    <string name="service_name" msgid="6860303747999592491">"Tjenestenavn"</string>
+    <string name="service_name" msgid="6860303747999592491">"Tjenestens navn"</string>
     <string name="stk_no_service" msgid="5427773116839809131">"Der er ingen tilgængelig tjeneste"</string>
     <string name="button_ok" msgid="5760722312558549555">"OK"</string>
     <string name="button_cancel" msgid="1997847915560800261">"Annuller"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 32ef96e..d61ed31 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -24,7 +24,7 @@
     <string name="stk_no_service" msgid="5427773116839809131">"Kein Dienst verfügbar"</string>
     <string name="button_ok" msgid="5760722312558549555">"OK"</string>
     <string name="button_cancel" msgid="1997847915560800261">"Abbrechen"</string>
-    <string name="button_yes" msgid="624420260648337203">"Ja"</string>
+    <string name="button_yes" msgid="624420260648337203">"\"Ja\""</string>
     <string name="button_no" msgid="1824959157582605627">"Nein"</string>
     <string name="alphabet" msgid="1583185545938805861">"Buchstaben"</string>
     <string name="digits" msgid="1746796679021682388">"Ziffern (0-9, *, #, +)"</string>
@@ -39,7 +39,7 @@
     <string name="default_send_data_msg" msgid="6011219698689931272">"Daten senden"</string>
     <string name="default_receive_data_msg" msgid="618096941772010682">"Daten empfangen"</string>
     <string name="default_close_channel_msg" msgid="765364262263839824">"Kanal geschlossen"</string>
-    <string name="stk_dialog_accept" msgid="8498901537508923727">"Ja"</string>
+    <string name="stk_dialog_accept" msgid="8498901537508923727">"\"JA\""</string>
     <string name="stk_dialog_reject" msgid="921848059485746796">"Nein"</string>
     <string name="no_sim_card_inserted" msgid="5316620398365235988">"Bitte lege die SIM-Karte ein, um das SIM-Toolkit zu starten."</string>
     <string name="stk_channel_name" msgid="8828587788561382056">"Mobilfunkdienst-Nachrichten"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..4c0fe00
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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_name" msgid="8396461461738434341">"SIM Tool Kit"</string>
+    <string name="menu_end_session" msgid="7368541737750982217">"End session"</string>
+    <string name="help" msgid="9209980881219397319">"Help"</string>
+    <string name="menu_back" msgid="301227740977453364">"Back"</string>
+    <string name="service_name" msgid="6860303747999592491">"Service name"</string>
+    <string name="stk_no_service" msgid="5427773116839809131">"No service available"</string>
+    <string name="button_ok" msgid="5760722312558549555">"OK"</string>
+    <string name="button_cancel" msgid="1997847915560800261">"Cancel"</string>
+    <string name="button_yes" msgid="624420260648337203">"Yes"</string>
+    <string name="button_no" msgid="1824959157582605627">"No"</string>
+    <string name="alphabet" msgid="1583185545938805861">"Alphabets"</string>
+    <string name="digits" msgid="1746796679021682388">"Digits (0-9, *, #, +)"</string>
+    <string name="default_call_setup_msg" msgid="7960194995759849940">"Call in progress…"</string>
+    <string name="default_setup_call_msg" msgid="6126904475461162162">"Call being set up"</string>
+    <string name="stk_app_state" msgid="18582277302584082">"Application status"</string>
+    <string name="enable_app" msgid="3701224550936728203">"Enabled"</string>
+    <string name="disable_app" msgid="6725081975611415214">"Disabled"</string>
+    <string name="stk_dialog_title" msgid="6954825385456886726">"SIM Tool Kit"</string>
+    <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Playing tone"</string>
+    <string name="default_open_channel_msg" msgid="2216070254100295924">"Open Channel?"</string>
+    <string name="default_send_data_msg" msgid="6011219698689931272">"Sending Data"</string>
+    <string name="default_receive_data_msg" msgid="618096941772010682">"Receiving Data"</string>
+    <string name="default_close_channel_msg" msgid="765364262263839824">"Channel Closed"</string>
+    <string name="stk_dialog_accept" msgid="8498901537508923727">"YES"</string>
+    <string name="stk_dialog_reject" msgid="921848059485746796">"NO"</string>
+    <string name="no_sim_card_inserted" msgid="5316620398365235988">"Please insert SIM to launch SIM Toolkit."</string>
+    <string name="stk_channel_name" msgid="8828587788561382056">"Mobile service messages"</string>
+</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
new file mode 100644
index 0000000..8b573cb
--- /dev/null
+++ b/res/values-en-rXC/strings.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 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_name" msgid="8396461461738434341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎SIM Toolkit‎‏‎‎‏‎"</string>
+    <string name="menu_end_session" msgid="7368541737750982217">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‎End session‎‏‎‎‏‎"</string>
+    <string name="help" msgid="9209980881219397319">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎Help‎‏‎‎‏‎"</string>
+    <string name="menu_back" msgid="301227740977453364">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‎Back‎‏‎‎‏‎"</string>
+    <string name="service_name" msgid="6860303747999592491">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎Service name‎‏‎‎‏‎"</string>
+    <string name="stk_no_service" msgid="5427773116839809131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‎No service available‎‏‎‎‏‎"</string>
+    <string name="button_ok" msgid="5760722312558549555">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎OK‎‏‎‎‏‎"</string>
+    <string name="button_cancel" msgid="1997847915560800261">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎Cancel‎‏‎‎‏‎"</string>
+    <string name="button_yes" msgid="624420260648337203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎Yes‎‏‎‎‏‎"</string>
+    <string name="button_no" msgid="1824959157582605627">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎No‎‏‎‎‏‎"</string>
+    <string name="alphabet" msgid="1583185545938805861">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎Alphabets‎‏‎‎‏‎"</string>
+    <string name="digits" msgid="1746796679021682388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎Digits (0-9, *, #, +)‎‏‎‎‏‎"</string>
+    <string name="default_call_setup_msg" msgid="7960194995759849940">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎Call in progress…‎‏‎‎‏‎"</string>
+    <string name="default_setup_call_msg" msgid="6126904475461162162">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎Call being setup‎‏‎‎‏‎"</string>
+    <string name="stk_app_state" msgid="18582277302584082">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎Application state‎‏‎‎‏‎"</string>
+    <string name="enable_app" msgid="3701224550936728203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎Enabled‎‏‎‎‏‎"</string>
+    <string name="disable_app" msgid="6725081975611415214">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎Disabled‎‏‎‎‏‎"</string>
+    <string name="stk_dialog_title" msgid="6954825385456886726">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎SIM ToolKit‎‏‎‎‏‎"</string>
+    <string name="default_tone_dialog_msg" msgid="4595366992944391641">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‎Playing Tone‎‏‎‎‏‎"</string>
+    <string name="default_open_channel_msg" msgid="2216070254100295924">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‎Open Channel?‎‏‎‎‏‎"</string>
+    <string name="default_send_data_msg" msgid="6011219698689931272">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎‎Sending Data‎‏‎‎‏‎"</string>
+    <string name="default_receive_data_msg" msgid="618096941772010682">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎Receiving Data‎‏‎‎‏‎"</string>
+    <string name="default_close_channel_msg" msgid="765364262263839824">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‎‎Channel Closed‎‏‎‎‏‎"</string>
+    <string name="stk_dialog_accept" msgid="8498901537508923727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎YES‎‏‎‎‏‎"</string>
+    <string name="stk_dialog_reject" msgid="921848059485746796">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎NO‎‏‎‎‏‎"</string>
+    <string name="no_sim_card_inserted" msgid="5316620398365235988">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎Please insert SIM to launch SIM Toolkit.‎‏‎‎‏‎"</string>
+    <string name="stk_channel_name" msgid="8828587788561382056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎Mobile service messages‎‏‎‎‏‎"</string>
+</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 04147d7..e44d438 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -32,7 +32,7 @@
     <string name="default_setup_call_msg" msgid="6126904475461162162">"Чалуу орнотулууда"</string>
     <string name="stk_app_state" msgid="18582277302584082">"Колдонмонун абалы"</string>
     <string name="enable_app" msgid="3701224550936728203">"Иштетилген"</string>
-    <string name="disable_app" msgid="6725081975611415214">"Токтотулган"</string>
+    <string name="disable_app" msgid="6725081975611415214">"Өчүк"</string>
     <string name="stk_dialog_title" msgid="6954825385456886726">"SIM Шаймандары"</string>
     <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Ойноо добушу"</string>
     <string name="default_open_channel_msg" msgid="2216070254100295924">"Канал ачылсынбы?"</string>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 8274460..6842950 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -42,5 +42,5 @@
     <string name="stk_dialog_accept" msgid="8498901537508923727">"होय"</string>
     <string name="stk_dialog_reject" msgid="921848059485746796">"नाही"</string>
     <string name="no_sim_card_inserted" msgid="5316620398365235988">"कृपया सिम टूलकिट लाँच करण्‍यासाठी सिम घाला."</string>
-    <string name="stk_channel_name" msgid="8828587788561382056">"मोबाइल सेवा संदेश"</string>
+    <string name="stk_channel_name" msgid="8828587788561382056">"मोबाइल सेवा मेसेज"</string>
 </resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 192cbc8..ddd49d8 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -22,7 +22,7 @@
     <string name="menu_back" msgid="301227740977453364">"နောက်သို့"</string>
     <string name="service_name" msgid="6860303747999592491">"ဝန်ဆောင်မှုအမည်"</string>
     <string name="stk_no_service" msgid="5427773116839809131">"ဆက်သွယ်ချိတ်ဆက်ရန် ဝန်ဆောင်မှု တစ်ခုမှမရှိပါ"</string>
-    <string name="button_ok" msgid="5760722312558549555">"အိုကေ"</string>
+    <string name="button_ok" msgid="5760722312558549555">"OK"</string>
     <string name="button_cancel" msgid="1997847915560800261">"မလုပ်တော့"</string>
     <string name="button_yes" msgid="624420260648337203">"Yes"</string>
     <string name="button_no" msgid="1824959157582605627">"No"</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index ff1aa67..843423a 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -22,7 +22,7 @@
     <string name="menu_back" msgid="301227740977453364">"पछाडि जानुहोस्"</string>
     <string name="service_name" msgid="6860303747999592491">"सेवा नाम"</string>
     <string name="stk_no_service" msgid="5427773116839809131">"सेवा उपलब्ध छैन"</string>
-    <string name="button_ok" msgid="5760722312558549555">"ठीक छ"</string>
+    <string name="button_ok" msgid="5760722312558549555">"ठिक छ"</string>
     <string name="button_cancel" msgid="1997847915560800261">"रद्द गर्नुहोस्"</string>
     <string name="button_yes" msgid="624420260648337203">"हो"</string>
     <string name="button_no" msgid="1824959157582605627">"होइन"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 9d34917..5ed9a87 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -28,7 +28,7 @@
     <string name="button_no" msgid="1824959157582605627">"Nee"</string>
     <string name="alphabet" msgid="1583185545938805861">"Alfabetten"</string>
     <string name="digits" msgid="1746796679021682388">"Symbolen (0-9, *, #, +)"</string>
-    <string name="default_call_setup_msg" msgid="7960194995759849940">"Actieve oproep..."</string>
+    <string name="default_call_setup_msg" msgid="7960194995759849940">"Actief gesprek..."</string>
     <string name="default_setup_call_msg" msgid="6126904475461162162">"Aanroep wordt ingesteld"</string>
     <string name="stk_app_state" msgid="18582277302584082">"Toepassingsstatus"</string>
     <string name="enable_app" msgid="3701224550936728203">"Ingeschakeld"</string>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 31d7972..ed8c454 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8396461461738434341">"SIM Toolkit"</string>
+    <string name="app_name" msgid="8396461461738434341">"ਸਿਮ ਟੂਲਕਿੱਟ"</string>
     <string name="menu_end_session" msgid="7368541737750982217">"ਸੈਸ਼ਨ ਸਮਾਪਤ ਕਰੋ"</string>
     <string name="help" msgid="9209980881219397319">"ਮਦਦ"</string>
     <string name="menu_back" msgid="301227740977453364">"ਪਿੱਛੇ"</string>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 40eab69..d9ecefb 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -16,7 +16,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="app_name" msgid="8396461461738434341">"SIM karta menyusi"</string>
+    <string name="app_name" msgid="8396461461738434341">"SIM menyusi"</string>
     <string name="menu_end_session" msgid="7368541737750982217">"Sessiyani yakunlash"</string>
     <string name="help" msgid="9209980881219397319">"Yordam"</string>
     <string name="menu_back" msgid="301227740977453364">"Orqaga"</string>
@@ -33,7 +33,7 @@
     <string name="stk_app_state" msgid="18582277302584082">"Ilova holati"</string>
     <string name="enable_app" msgid="3701224550936728203">"Yoniq"</string>
     <string name="disable_app" msgid="6725081975611415214">"O‘chiq"</string>
-    <string name="stk_dialog_title" msgid="6954825385456886726">"SIM karta menyusi"</string>
+    <string name="stk_dialog_title" msgid="6954825385456886726">"SIM menyusi"</string>
     <string name="default_tone_dialog_msg" msgid="4595366992944391641">"Signal ijrosi"</string>
     <string name="default_open_channel_msg" msgid="2216070254100295924">"Kanal ochilsinmi?"</string>
     <string name="default_send_data_msg" msgid="6011219698689931272">"Ma’lumot yuborilmoqda"</string>
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java
index 52200a7..7fe3a09 100644
--- a/src/com/android/stk/StkAppService.java
+++ b/src/com/android/stk/StkAppService.java
@@ -64,7 +64,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager;
-import android.view.WindowManagerPolicy;
+import android.view.WindowManagerPolicyConstants;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -1718,7 +1718,7 @@
         if (mUserActivityReceiver == null) {
             mUserActivityReceiver = new BroadcastReceiver() {
                 @Override public void onReceive(Context context, Intent intent) {
-                    if (WindowManagerPolicy.ACTION_USER_ACTIVITY_NOTIFICATION.equals(
+                    if (WindowManagerPolicyConstants.ACTION_USER_ACTIVITY_NOTIFICATION.equals(
                             intent.getAction())) {
                         Message message = mServiceHandler.obtainMessage();
                         message.arg1 = OP_USER_ACTIVITY;
@@ -1728,7 +1728,7 @@
                 }
             };
             registerReceiver(mUserActivityReceiver, new IntentFilter(
-                    WindowManagerPolicy.ACTION_USER_ACTIVITY_NOTIFICATION));
+                    WindowManagerPolicyConstants.ACTION_USER_ACTIVITY_NOTIFICATION));
             try {
                 IWindowManager wm = IWindowManager.Stub.asInterface(
                         ServiceManager.getService(Context.WINDOW_SERVICE));
@@ -2071,6 +2071,8 @@
                     !msg.iconSelfExplanatory) {
                 notificationBuilder.setContentText(msg.text);
                 notificationBuilder.setTicker(msg.text);
+                notificationBuilder.setStyle(new Notification.BigTextStyle(notificationBuilder)
+                        .bigText(msg.text));
             }
             if (msg.icon != null) {
                 notificationBuilder.setLargeIcon(msg.icon);