diff --git a/Android.mk b/Android.mk
index 916b0128a..ce4d98d67 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,6 +29,8 @@ LOCAL_SRC_FILES += \
 LOCAL_PACKAGE_NAME := Phone
 LOCAL_CERTIFICATE := platform
 
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
 include $(BUILD_PACKAGE)
 
 # Build the test package
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 06a06e2dd..cc8ed03ca 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -42,7 +42,9 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.READ_CALL_LOG" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CALL_LOG" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" />
     <uses-permission android:name="android.permission.ADD_SYSTEM_SERVICE" />
@@ -58,6 +60,7 @@
     <uses-permission android:name="android.permission.WRITE_SMS" />
     <uses-permission android:name="android.permission.SEND_SMS" />
     <uses-permission android:name="android.permission.SEND_SMS_NO_CONFIRMATION" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.SET_TIME_ZONE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -79,6 +82,7 @@
     <uses-permission android:name="android.permission.PERFORM_CDMA_PROVISIONING" />
     <uses-permission android:name="android.permission.USE_SIP" />
     <uses-permission android:name="android.permission.REBOOT" />
+    <uses-permission android:name="android.permission.UPDATE_LOCK" />
     <uses-permission android:name="com.android.smspush.WAPPUSH_MANAGER_BIND" />
 
     <!-- This tells the activity manager to not delay any of our activity
@@ -90,11 +94,19 @@
                  android:persistent="true"
                  android:label="@string/phoneAppLabel"
                  android:icon="@drawable/ic_launcher_phone">
-            <provider android:name="IccProvider"
-                      android:authorities="icc"
-                      android:multiprocess="true"
-                      android:readPermission="android.permission.READ_CONTACTS"
-                      android:writePermission="android.permission.WRITE_CONTACTS" />
+
+        <provider android:name="IccProvider"
+                  android:authorities="icc"
+                  android:multiprocess="true"
+                  android:readPermission="android.permission.READ_CONTACTS"
+                  android:writePermission="android.permission.WRITE_CONTACTS" />
+
+        <!-- Workaround for non saved phone number -->
+        <receiver android:name=".MyPhoneNumber">
+            <intent-filter>
+                <action android:name="android.intent.action.SIM_STATE_CHANGED" />
+            </intent-filter>
+        </receiver>
 
         <!-- Dialer UI that only allows emergency calls -->
         <activity android:name="EmergencyDialer"
@@ -117,6 +129,7 @@
         <activity android:name="SimContacts"
             android:label="@string/simContacts_title"
             android:theme="@style/SimImportTheme"
+            android:screenOrientation="portrait"
             android:icon="@mipmap/ic_launcher_contacts">
 
             <intent-filter>
@@ -135,8 +148,9 @@
         </activity>
 
         <activity android:name="OutgoingCallBroadcaster"
-                android:theme="@android:style/Theme.NoDisplay"
+                android:theme="@style/OutgoingCallBroadcasterTheme"
                 android:permission="android.permission.CALL_PHONE"
+                android:screenOrientation="portrait"
                 android:configChanges="orientation|screenSize|keyboardHidden">
             <!-- CALL action intent filters, for the various ways
                  of initiating an outgoing call. -->
@@ -253,9 +267,9 @@
 
         <!-- "Mobile network settings" screen, used on both
              non-voice-capable tablets and regular phone devices. -->
-        <activity android:name="Settings"
-                android:label="@string/settings_label"
-                android:theme="@style/Theme.Settings">
+        <activity android:name="MobileNetworkSettings"
+            android:label="@string/settings_label"
+            android:theme="@style/Theme.Settings">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.MAIN" />
@@ -264,6 +278,9 @@
             </intent-filter>
         </activity>
 
+        <activity-alias android:name="Settings"
+            android:targetActivity="MobileNetworkSettings" />
+
         <!-- networks setting -->
         <!-- service to handle network query requests sent to RIL -->
         <service android:name="NetworkQueryService" />
@@ -394,7 +411,7 @@
             </intent-filter>
         </activity>
 
-        <!-- Data usage and throttling setting -->
+        <!-- Data usage and throttling setting for ThrottleService in framework. -->
         <activity android:name="DataUsage"
                 android:label="@string/throttle_data_usage"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge">
@@ -443,6 +460,9 @@
         <service android:name="EmergencyCallbackModeService">
         </service>
 
+        <!-- service to dump telephony information -->
+        <service android:name="TelephonyDebugService" />
+
         <activity android:name="EmergencyCallbackModeExitDialog"
             android:excludeFromRecents="true"
             android:label="@string/ecm_exit_dialog"
@@ -481,10 +501,18 @@
                 android:uiOptions="splitActionBarWhenNarrow">
         </activity>
         <activity android:name=".SipCallOptionHandler"
-                android:theme="@android:style/Theme.Holo.NoActionBar"
+                android:theme="@style/SipCallOptionHandlerTheme"
+                android:screenOrientation="portrait"
                 android:configChanges="orientation|screenSize|keyboardHidden">
         </activity>
 
+        <receiver android:name="com.android.phone.PhoneToggler" android:permission="com.android.phone.CHANGE_NETWORK_MODE">
+            <intent-filter>
+                <action android:name="com.android.internal.telephony.REQUEST_NETWORK_MODE" />
+                <action android:name="com.android.internal.telephony.MODIFY_NETWORK_MODE" />
+            </intent-filter>
+        </receiver>
+
         <activity android:name="RespondViaSmsManager$Settings"
                 android:label="@string/respond_via_sms_setting_title"
                 android:configChanges="orientation|screenSize|keyboardHidden"
@@ -494,5 +522,25 @@
             </intent-filter>
         </activity>
 
+        <receiver android:name="CallerInfoCacheUpdateReceiver">
+            <intent-filter>
+                <action android:name="com.android.phone.UPDATE_CALLER_INFO_CACHE" />
+            </intent-filter>
+        </receiver>
+
+        <!-- BroadcastReceiver for receiving Intents from Notification mechanism. -->
+        <receiver android:name="PhoneApp$NotificationBroadcastReceiver" exported="false">
+            <intent-filter>
+                <action android:name="com.android.phone.ACTION_HANG_UP_ONGOING_CALL" />
+                <action android:name="com.android.phone.ACTION_CALL_BACK_FROM_NOTIFICATION" />
+                <action android:name="com.android.phone.ACTION_SEND_SMS_FROM_NOTIFICATION" />
+            </intent-filter>
+        </receiver>
+
     </application>
+    <permission android:name="com.android.phone.CHANGE_NETWORK_MODE"
+        android:label="@string/perm_change_mobile_network"
+        android:description="@string/perm_change_mobile_network_desc"
+        android:permissionGroup="android.permission-group.COST_MONEY"
+        android:protectionLevel="dangerous" />
 </manifest>
diff --git a/res/drawable/dial_num_1_no_vm.xml b/lint.xml
similarity index 70%
rename from res/drawable/dial_num_1_no_vm.xml
rename to lint.xml
index 84a93940c..77207455b 100644
--- a/res/drawable/dial_num_1_no_vm.xml
+++ b/lint.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
+<!-- Copyright (C) 2012 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.
@@ -13,8 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@drawable/dial_num_1_no_vm_wht" />
-</selector>
+<!-- To suppress lint warnings -->
+<lint>
+    <!-- Phone app is not unbundled intentionally. -->
+    <issue id="UsesSdk" severity="ignore" />
+    <issue id="PrivateResource" severity="ignore" />
+</lint>
diff --git a/proguard.flags b/proguard.flags
new file mode 100644
index 000000000..c5f4c7229
--- /dev/null
+++ b/proguard.flags
@@ -0,0 +1,6 @@
+# Keep names that are used only by animation framework.
+-keepclasseswithmembers class com.android.phone.AnimationUtils$CrossFadeDrawable {
+  *** setCrossFadeAlpha(...);
+}
+
+-verbose
\ No newline at end of file
diff --git a/res/anim/activity_close_enter.xml b/res/anim/activity_close_enter.xml
new file mode 100644
index 000000000..a526fe1b3
--- /dev/null
+++ b/res/anim/activity_close_enter.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android" android:zAdjustment="normal">
+    <alpha android:fromAlpha="1.0" android:toAlpha="1.0"
+            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
+            android:duration="300"/>
+</set>
diff --git a/res/anim/activity_close_exit.xml b/res/anim/activity_close_exit.xml
new file mode 100644
index 000000000..b879bdb49
--- /dev/null
+++ b/res/anim/activity_close_exit.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 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.
+** 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.
+*/
+-->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shareInterpolator="false" android:zAdjustment="top">
+    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
+            android:interpolator="@*android:interpolator/decelerate_cubic"
+            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
+            android:duration="300"/>
+    <scale android:fromXScale="1.0" android:toXScale=".8"
+            android:fromYScale="1.0" android:toYScale=".8"
+            android:pivotX="50%p" android:pivotY="50%p"
+            android:interpolator="@*android:interpolator/decelerate_cubic"
+            android:fillEnabled="true" android:fillBefore="true" android:fillAfter="true"
+            android:duration="300"/>
+</set>
diff --git a/res/color/dialer_button_text.xml b/res/color/dialer_button_text.xml
deleted file mode 100644
index a841adc82..000000000
--- a/res/color/dialer_button_text.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Half-way between #FFF and #000 -->
-    <item android:state_enabled="false" android:color="#888"/>
-
-    <item android:state_pressed="true" android:color="#000"/>
-    <item android:state_selected="true" android:color="#000"/>
-    <item android:state_focused="true" android:color="#FFF"/>
-    <item android:color="#FFF"/> <!-- not selected -->
-
-</selector>
-
diff --git a/res/drawable-hdpi/btn_dial_textfield_normal.9.png b/res/drawable-hdpi/btn_dial_textfield_normal.9.png
deleted file mode 100644
index 1718372d0..000000000
Binary files a/res/drawable-hdpi/btn_dial_textfield_normal.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_dial_textfield_pressed.9.png b/res/drawable-hdpi/btn_dial_textfield_pressed.9.png
deleted file mode 100644
index eb1fda0f9..000000000
Binary files a/res/drawable-hdpi/btn_dial_textfield_pressed.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_dial_textfield_selected.9.png b/res/drawable-hdpi/btn_dial_textfield_selected.9.png
deleted file mode 100644
index 5ad7b563b..000000000
Binary files a/res/drawable-hdpi/btn_dial_textfield_selected.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/dialog_bg_calling_via.9.png b/res/drawable-hdpi/dialog_bg_calling_via.9.png
deleted file mode 100644
index ab5ded71c..000000000
Binary files a/res/drawable-hdpi/dialog_bg_calling_via.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/endcall_active.png b/res/drawable-hdpi/endcall_active.png
new file mode 100644
index 000000000..38f1e1ce1
Binary files /dev/null and b/res/drawable-hdpi/endcall_active.png differ
diff --git a/res/drawable-hdpi/endcall_disable.png b/res/drawable-hdpi/endcall_disable.png
new file mode 100644
index 000000000..6a0f65867
Binary files /dev/null and b/res/drawable-hdpi/endcall_disable.png differ
diff --git a/res/drawable-hdpi/ic_active_state_dialer_holo_dark.png b/res/drawable-hdpi/ic_active_state_dialer_holo_dark.png
index 341c630cc..f4a08bea0 100644
Binary files a/res/drawable-hdpi/ic_active_state_dialer_holo_dark.png and b/res/drawable-hdpi/ic_active_state_dialer_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_button_conference_end.png b/res/drawable-hdpi/ic_button_conference_end.png
deleted file mode 100644
index a07599936..000000000
Binary files a/res/drawable-hdpi/ic_button_conference_end.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_button_conference_private.png b/res/drawable-hdpi/ic_button_conference_private.png
deleted file mode 100644
index 76090895d..000000000
Binary files a/res/drawable-hdpi/ic_button_conference_private.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_dial_action_search.png b/res/drawable-hdpi/ic_dial_action_search.png
deleted file mode 100644
index e87152d7d..000000000
Binary files a/res/drawable-hdpi/ic_dial_action_search.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_dial_end_call.png b/res/drawable-hdpi/ic_dial_end_call.png
new file mode 100644
index 000000000..ab3adb443
Binary files /dev/null and b/res/drawable-hdpi/ic_dial_end_call.png differ
diff --git a/res/drawable-hdpi/ic_end_call.png b/res/drawable-hdpi/ic_end_call.png
deleted file mode 100644
index be6cdfc8b..000000000
Binary files a/res/drawable-hdpi/ic_end_call.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_end_call_holo_dark.png b/res/drawable-hdpi/ic_end_call_holo_dark.png
new file mode 100644
index 000000000..0f373bb26
Binary files /dev/null and b/res/drawable-hdpi/ic_end_call_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_lockscreen_answer_activated.png b/res/drawable-hdpi/ic_lockscreen_answer_activated.png
new file mode 100644
index 000000000..3d2752fa7
Binary files /dev/null and b/res/drawable-hdpi/ic_lockscreen_answer_activated.png differ
diff --git a/res/drawable-hdpi/ic_lockscreen_answer_normal.png b/res/drawable-hdpi/ic_lockscreen_answer_normal.png
new file mode 100644
index 000000000..9e26edaf5
Binary files /dev/null and b/res/drawable-hdpi/ic_lockscreen_answer_normal.png differ
diff --git a/res/drawable-hdpi/ic_lockscreen_decline_activated.png b/res/drawable-hdpi/ic_lockscreen_decline_activated.png
new file mode 100644
index 000000000..b7a438f2e
Binary files /dev/null and b/res/drawable-hdpi/ic_lockscreen_decline_activated.png differ
diff --git a/res/drawable-hdpi/ic_lockscreen_decline_normal.png b/res/drawable-hdpi/ic_lockscreen_decline_normal.png
new file mode 100644
index 000000000..a687ae3ee
Binary files /dev/null and b/res/drawable-hdpi/ic_lockscreen_decline_normal.png differ
diff --git a/res/drawable-hdpi/ic_lockscreen_text_activated.png b/res/drawable-hdpi/ic_lockscreen_text_activated.png
new file mode 100644
index 000000000..22cf07c5d
Binary files /dev/null and b/res/drawable-hdpi/ic_lockscreen_text_activated.png differ
diff --git a/res/drawable-hdpi/ic_lockscreen_text_normal.png b/res/drawable-hdpi/ic_lockscreen_text_normal.png
new file mode 100644
index 000000000..db6c05d6c
Binary files /dev/null and b/res/drawable-hdpi/ic_lockscreen_text_normal.png differ
diff --git a/res/drawable-hdpi/ic_split_holo_dark.png b/res/drawable-hdpi/ic_split_holo_dark.png
new file mode 100644
index 000000000..5b10cf948
Binary files /dev/null and b/res/drawable-hdpi/ic_split_holo_dark.png differ
diff --git a/res/drawable-hdpi/ic_text_holo_dark.png b/res/drawable-hdpi/ic_text_holo_dark.png
new file mode 100644
index 000000000..6d21e42c5
Binary files /dev/null and b/res/drawable-hdpi/ic_text_holo_dark.png differ
diff --git a/res/drawable-hdpi/stat_sys_phone_call.png b/res/drawable-hdpi/stat_sys_phone_call.png
index d6f921c48..7eda84ca5 100644
Binary files a/res/drawable-hdpi/stat_sys_phone_call.png and b/res/drawable-hdpi/stat_sys_phone_call.png differ
diff --git a/res/drawable-hdpi/stat_sys_phone_call_bluetooth.png b/res/drawable-hdpi/stat_sys_phone_call_bluetooth.png
deleted file mode 100644
index aec4efc49..000000000
Binary files a/res/drawable-hdpi/stat_sys_phone_call_bluetooth.png and /dev/null differ
diff --git a/res/drawable-hdpi/stat_sys_phone_call_end.png b/res/drawable-hdpi/stat_sys_phone_call_end.png
new file mode 100644
index 000000000..bc7493751
Binary files /dev/null and b/res/drawable-hdpi/stat_sys_phone_call_end.png differ
diff --git a/res/drawable-hdpi/stat_sys_phone_call_ringing.png b/res/drawable-hdpi/stat_sys_phone_call_ringing.png
deleted file mode 100644
index d6f921c48..000000000
Binary files a/res/drawable-hdpi/stat_sys_phone_call_ringing.png and /dev/null differ
diff --git a/res/drawable-hdpi/stat_sys_vp_phone_call_bluetooth.png b/res/drawable-hdpi/stat_sys_vp_phone_call_bluetooth.png
deleted file mode 100644
index ad74cb596..000000000
Binary files a/res/drawable-hdpi/stat_sys_vp_phone_call_bluetooth.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_dial_textfield_normal.9.png b/res/drawable-mdpi/btn_dial_textfield_normal.9.png
deleted file mode 100644
index 277400bf9..000000000
Binary files a/res/drawable-mdpi/btn_dial_textfield_normal.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_dial_textfield_pressed.9.png b/res/drawable-mdpi/btn_dial_textfield_pressed.9.png
deleted file mode 100644
index 57a8dd977..000000000
Binary files a/res/drawable-mdpi/btn_dial_textfield_pressed.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/btn_dial_textfield_selected.9.png b/res/drawable-mdpi/btn_dial_textfield_selected.9.png
deleted file mode 100644
index 5956668ce..000000000
Binary files a/res/drawable-mdpi/btn_dial_textfield_selected.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/dialog_bg_calling_via.9.png b/res/drawable-mdpi/dialog_bg_calling_via.9.png
deleted file mode 100644
index 809560474..000000000
Binary files a/res/drawable-mdpi/dialog_bg_calling_via.9.png and /dev/null differ
diff --git a/res/drawable-mdpi/endcall_active.png b/res/drawable-mdpi/endcall_active.png
new file mode 100644
index 000000000..a82738bfc
Binary files /dev/null and b/res/drawable-mdpi/endcall_active.png differ
diff --git a/res/drawable-mdpi/endcall_disable.png b/res/drawable-mdpi/endcall_disable.png
new file mode 100644
index 000000000..bd1a2f380
Binary files /dev/null and b/res/drawable-mdpi/endcall_disable.png differ
diff --git a/res/drawable-mdpi/ic_active_state_dialer_holo_dark.png b/res/drawable-mdpi/ic_active_state_dialer_holo_dark.png
index 880cf343e..6ff8e4844 100644
Binary files a/res/drawable-mdpi/ic_active_state_dialer_holo_dark.png and b/res/drawable-mdpi/ic_active_state_dialer_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_button_conference_end.png b/res/drawable-mdpi/ic_button_conference_end.png
deleted file mode 100644
index 389c7c0bc..000000000
Binary files a/res/drawable-mdpi/ic_button_conference_end.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_button_conference_private.png b/res/drawable-mdpi/ic_button_conference_private.png
deleted file mode 100644
index 4ee6050d8..000000000
Binary files a/res/drawable-mdpi/ic_button_conference_private.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_dial_action_search.png b/res/drawable-mdpi/ic_dial_action_search.png
deleted file mode 100644
index 0b0e0dad7..000000000
Binary files a/res/drawable-mdpi/ic_dial_action_search.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_dial_end_call.png b/res/drawable-mdpi/ic_dial_end_call.png
new file mode 100644
index 000000000..c47664226
Binary files /dev/null and b/res/drawable-mdpi/ic_dial_end_call.png differ
diff --git a/res/drawable-mdpi/ic_end_call.png b/res/drawable-mdpi/ic_end_call.png
deleted file mode 100644
index e76553bef..000000000
Binary files a/res/drawable-mdpi/ic_end_call.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_end_call_holo_dark.png b/res/drawable-mdpi/ic_end_call_holo_dark.png
new file mode 100644
index 000000000..e090cc806
Binary files /dev/null and b/res/drawable-mdpi/ic_end_call_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_lockscreen_answer_activated.png b/res/drawable-mdpi/ic_lockscreen_answer_activated.png
new file mode 100644
index 000000000..6a78f817e
Binary files /dev/null and b/res/drawable-mdpi/ic_lockscreen_answer_activated.png differ
diff --git a/res/drawable-mdpi/ic_lockscreen_answer_normal.png b/res/drawable-mdpi/ic_lockscreen_answer_normal.png
new file mode 100644
index 000000000..da15c33c7
Binary files /dev/null and b/res/drawable-mdpi/ic_lockscreen_answer_normal.png differ
diff --git a/res/drawable-mdpi/ic_lockscreen_decline_activated.png b/res/drawable-mdpi/ic_lockscreen_decline_activated.png
new file mode 100644
index 000000000..649662681
Binary files /dev/null and b/res/drawable-mdpi/ic_lockscreen_decline_activated.png differ
diff --git a/res/drawable-mdpi/ic_lockscreen_decline_normal.png b/res/drawable-mdpi/ic_lockscreen_decline_normal.png
new file mode 100644
index 000000000..27fe09306
Binary files /dev/null and b/res/drawable-mdpi/ic_lockscreen_decline_normal.png differ
diff --git a/res/drawable-mdpi/ic_lockscreen_text_activated.png b/res/drawable-mdpi/ic_lockscreen_text_activated.png
new file mode 100644
index 000000000..e3e4fc13d
Binary files /dev/null and b/res/drawable-mdpi/ic_lockscreen_text_activated.png differ
diff --git a/res/drawable-mdpi/ic_lockscreen_text_normal.png b/res/drawable-mdpi/ic_lockscreen_text_normal.png
new file mode 100644
index 000000000..4a2a54b01
Binary files /dev/null and b/res/drawable-mdpi/ic_lockscreen_text_normal.png differ
diff --git a/res/drawable-mdpi/ic_split_holo_dark.png b/res/drawable-mdpi/ic_split_holo_dark.png
new file mode 100644
index 000000000..3980acbb8
Binary files /dev/null and b/res/drawable-mdpi/ic_split_holo_dark.png differ
diff --git a/res/drawable-mdpi/ic_text_holo_dark.png b/res/drawable-mdpi/ic_text_holo_dark.png
new file mode 100644
index 000000000..80b95eec1
Binary files /dev/null and b/res/drawable-mdpi/ic_text_holo_dark.png differ
diff --git a/res/drawable-mdpi/stat_sys_phone_call.png b/res/drawable-mdpi/stat_sys_phone_call.png
index 76ca72013..70a4bbe71 100644
Binary files a/res/drawable-mdpi/stat_sys_phone_call.png and b/res/drawable-mdpi/stat_sys_phone_call.png differ
diff --git a/res/drawable-mdpi/stat_sys_phone_call_bluetooth.png b/res/drawable-mdpi/stat_sys_phone_call_bluetooth.png
deleted file mode 100644
index 6ca152c7d..000000000
Binary files a/res/drawable-mdpi/stat_sys_phone_call_bluetooth.png and /dev/null differ
diff --git a/res/drawable-mdpi/stat_sys_phone_call_end.png b/res/drawable-mdpi/stat_sys_phone_call_end.png
new file mode 100644
index 000000000..15e7e67fc
Binary files /dev/null and b/res/drawable-mdpi/stat_sys_phone_call_end.png differ
diff --git a/res/drawable-mdpi/stat_sys_phone_call_ringing.png b/res/drawable-mdpi/stat_sys_phone_call_ringing.png
deleted file mode 100644
index 76ca72013..000000000
Binary files a/res/drawable-mdpi/stat_sys_phone_call_ringing.png and /dev/null differ
diff --git a/res/drawable-mdpi/stat_sys_vp_phone_call_bluetooth.png b/res/drawable-mdpi/stat_sys_vp_phone_call_bluetooth.png
deleted file mode 100644
index 339fe4349..000000000
Binary files a/res/drawable-mdpi/stat_sys_vp_phone_call_bluetooth.png and /dev/null differ
diff --git a/res/drawable-xhdpi/btn_dial_textfield_normal.9.png b/res/drawable-xhdpi/btn_dial_textfield_normal.9.png
deleted file mode 100644
index 990362415..000000000
Binary files a/res/drawable-xhdpi/btn_dial_textfield_normal.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/btn_dial_textfield_pressed.9.png b/res/drawable-xhdpi/btn_dial_textfield_pressed.9.png
deleted file mode 100644
index 00e2e7ea7..000000000
Binary files a/res/drawable-xhdpi/btn_dial_textfield_pressed.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/btn_dial_textfield_selected.9.png b/res/drawable-xhdpi/btn_dial_textfield_selected.9.png
deleted file mode 100644
index bf2e27f5b..000000000
Binary files a/res/drawable-xhdpi/btn_dial_textfield_selected.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/dialog_bg_calling_via.9.png b/res/drawable-xhdpi/dialog_bg_calling_via.9.png
deleted file mode 100644
index 15e46f85c..000000000
Binary files a/res/drawable-xhdpi/dialog_bg_calling_via.9.png and /dev/null differ
diff --git a/res/drawable-xhdpi/endcall_active.png b/res/drawable-xhdpi/endcall_active.png
new file mode 100644
index 000000000..5347ed29e
Binary files /dev/null and b/res/drawable-xhdpi/endcall_active.png differ
diff --git a/res/drawable-xhdpi/endcall_disable.png b/res/drawable-xhdpi/endcall_disable.png
new file mode 100644
index 000000000..fa10196c7
Binary files /dev/null and b/res/drawable-xhdpi/endcall_disable.png differ
diff --git a/res/drawable-xhdpi/ic_active_state_dialer_holo_dark.png b/res/drawable-xhdpi/ic_active_state_dialer_holo_dark.png
index 64fd89e25..0211d69b9 100644
Binary files a/res/drawable-xhdpi/ic_active_state_dialer_holo_dark.png and b/res/drawable-xhdpi/ic_active_state_dialer_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_button_conference_end.png b/res/drawable-xhdpi/ic_button_conference_end.png
deleted file mode 100644
index c31e6f015..000000000
Binary files a/res/drawable-xhdpi/ic_button_conference_end.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_button_conference_private.png b/res/drawable-xhdpi/ic_button_conference_private.png
deleted file mode 100644
index 19b17b2e0..000000000
Binary files a/res/drawable-xhdpi/ic_button_conference_private.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_dial_action_search.png b/res/drawable-xhdpi/ic_dial_action_search.png
deleted file mode 100644
index 020fab560..000000000
Binary files a/res/drawable-xhdpi/ic_dial_action_search.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_dial_end_call.png b/res/drawable-xhdpi/ic_dial_end_call.png
new file mode 100644
index 000000000..c24ec9872
Binary files /dev/null and b/res/drawable-xhdpi/ic_dial_end_call.png differ
diff --git a/res/drawable-xhdpi/ic_end_call.png b/res/drawable-xhdpi/ic_end_call.png
deleted file mode 100644
index c464a6dc5..000000000
Binary files a/res/drawable-xhdpi/ic_end_call.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_end_call_holo_dark.png b/res/drawable-xhdpi/ic_end_call_holo_dark.png
new file mode 100644
index 000000000..f64f5e3d9
Binary files /dev/null and b/res/drawable-xhdpi/ic_end_call_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_answer_activated.png b/res/drawable-xhdpi/ic_lockscreen_answer_activated.png
new file mode 100644
index 000000000..cd6a6abb2
Binary files /dev/null and b/res/drawable-xhdpi/ic_lockscreen_answer_activated.png differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_answer_normal.png b/res/drawable-xhdpi/ic_lockscreen_answer_normal.png
new file mode 100644
index 000000000..983d5d941
Binary files /dev/null and b/res/drawable-xhdpi/ic_lockscreen_answer_normal.png differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_decline_activated.png b/res/drawable-xhdpi/ic_lockscreen_decline_activated.png
new file mode 100644
index 000000000..317b3296c
Binary files /dev/null and b/res/drawable-xhdpi/ic_lockscreen_decline_activated.png differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_decline_normal.png b/res/drawable-xhdpi/ic_lockscreen_decline_normal.png
new file mode 100644
index 000000000..2cb03e7b1
Binary files /dev/null and b/res/drawable-xhdpi/ic_lockscreen_decline_normal.png differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_text_activated.png b/res/drawable-xhdpi/ic_lockscreen_text_activated.png
new file mode 100644
index 000000000..41ea18af0
Binary files /dev/null and b/res/drawable-xhdpi/ic_lockscreen_text_activated.png differ
diff --git a/res/drawable-xhdpi/ic_lockscreen_text_normal.png b/res/drawable-xhdpi/ic_lockscreen_text_normal.png
new file mode 100644
index 000000000..15e477934
Binary files /dev/null and b/res/drawable-xhdpi/ic_lockscreen_text_normal.png differ
diff --git a/res/drawable-xhdpi/ic_split_holo_dark.png b/res/drawable-xhdpi/ic_split_holo_dark.png
new file mode 100644
index 000000000..db558e49a
Binary files /dev/null and b/res/drawable-xhdpi/ic_split_holo_dark.png differ
diff --git a/res/drawable-xhdpi/ic_text_holo_dark.png b/res/drawable-xhdpi/ic_text_holo_dark.png
new file mode 100644
index 000000000..e80a04234
Binary files /dev/null and b/res/drawable-xhdpi/ic_text_holo_dark.png differ
diff --git a/res/drawable-xhdpi/stat_sys_phone_call.png b/res/drawable-xhdpi/stat_sys_phone_call.png
index db42b7cd9..1bb434076 100644
Binary files a/res/drawable-xhdpi/stat_sys_phone_call.png and b/res/drawable-xhdpi/stat_sys_phone_call.png differ
diff --git a/res/drawable-xhdpi/stat_sys_phone_call_bluetooth.png b/res/drawable-xhdpi/stat_sys_phone_call_bluetooth.png
deleted file mode 100644
index b0ecb9101..000000000
Binary files a/res/drawable-xhdpi/stat_sys_phone_call_bluetooth.png and /dev/null differ
diff --git a/res/drawable-xhdpi/stat_sys_phone_call_end.png b/res/drawable-xhdpi/stat_sys_phone_call_end.png
new file mode 100644
index 000000000..b0b1bc1c8
Binary files /dev/null and b/res/drawable-xhdpi/stat_sys_phone_call_end.png differ
diff --git a/res/drawable-xhdpi/stat_sys_phone_call_ringing.png b/res/drawable-xhdpi/stat_sys_phone_call_ringing.png
deleted file mode 100644
index db42b7cd9..000000000
Binary files a/res/drawable-xhdpi/stat_sys_phone_call_ringing.png and /dev/null differ
diff --git a/res/drawable-xhdpi/stat_sys_vp_phone_call_bluetooth.png b/res/drawable-xhdpi/stat_sys_vp_phone_call_bluetooth.png
deleted file mode 100644
index 833cd1fa6..000000000
Binary files a/res/drawable-xhdpi/stat_sys_vp_phone_call_bluetooth.png and /dev/null differ
diff --git a/res/drawable/btn_call.xml b/res/drawable/btn_call.xml
index 73ff87b11..abce98313 100644
--- a/res/drawable/btn_call.xml
+++ b/res/drawable/btn_call.xml
@@ -17,8 +17,7 @@
 <!-- Background resource for call button in the various dialpads.
      Almost a copy from framework's item_background_holo_dark.xml, but has different pressed effect
   -->
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_window_focused="false" android:drawable="@android:color/transparent" />
 
diff --git a/res/drawable/btn_compound_audio.xml b/res/drawable/btn_compound_audio.xml
index 30251ae85..c348c98c1 100644
--- a/res/drawable/btn_compound_audio.xml
+++ b/res/drawable/btn_compound_audio.xml
@@ -80,12 +80,18 @@
                 android:gravity="center" />
     </item>
 
-    <!-- Speakerphone is active -->
-    <item android:id="@+id/speakerphoneItem">
+    <!-- Speakerphone icon showing 'speaker on' state -->
+    <item android:id="@+id/speakerphoneOnItem">
         <bitmap android:src="@drawable/ic_sound_speakerphone_holo_dark"
                 android:gravity="center" />
     </item>
 
+    <!-- Speakerphone icon showing 'speaker off' state -->
+    <item android:id="@+id/speakerphoneOffItem">
+        <bitmap android:src="@drawable/ic_sound_off_speakerphone_holo_dark"
+                android:gravity="center" />
+    </item>
+
     <!-- Generic "audio mode" icon.  Looks almost identical to
          ic_sound_speakerphone_holo_dark.png -->
     <!-- TODO: is this actually needed? -->
@@ -96,13 +102,4 @@
         </item>
     -->
 
-    <!-- Speakerphone with no audio waves coming out -->
-    <!-- TODO: is this actually needed for any possible state of the UI? -->
-    <!--
-        <item android:id="@+id/soundOffItem">
-            <bitmap android:src="@drawable/ic_sound_off_speakerphone_holo_dark"
-                    android:gravity="center" />
-        </item>
-    -->
-
 </layer-list>
diff --git a/res/drawable/dial_num_2.xml b/res/drawable/clickable_dim_effect.xml
similarity index 68%
rename from res/drawable/dial_num_2.xml
rename to res/drawable/clickable_dim_effect.xml
index ceb868961..e4b4f6fd6 100644
--- a/res/drawable/dial_num_2.xml
+++ b/res/drawable/clickable_dim_effect.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2012 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.
@@ -14,8 +14,11 @@
      limitations under the License.
 -->
 
+<!-- Background drawable used with dim effect for secondary photo. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@drawable/dial_num_2_wht" />
-</selector>
 
+    <item android:state_pressed="true" android:state_enabled="true"
+          android:drawable="@drawable/list_pressed_holo_dark" />
+    <item android:drawable="@color/on_hold_dim_effect" />
+
+</selector>
diff --git a/res/drawable/dial_num_1_no_vm_wht.xml b/res/drawable/dial_num_1_no_vm_wht.xml
deleted file mode 100644
index 84a93940c..000000000
--- a/res/drawable/dial_num_1_no_vm_wht.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@drawable/dial_num_1_no_vm_wht" />
-</selector>
diff --git a/res/drawable/dial_num_3.xml b/res/drawable/dial_num_3.xml
deleted file mode 100644
index 62528e7bc..000000000
--- a/res/drawable/dial_num_3.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@drawable/dial_num_3_wht" />
-</selector>
-
diff --git a/res/drawable/dial_num_4.xml b/res/drawable/dial_num_4.xml
deleted file mode 100644
index 9e1b168e2..000000000
--- a/res/drawable/dial_num_4.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@drawable/dial_num_4_wht" />
-</selector>
-
diff --git a/res/drawable/dial_num_5.xml b/res/drawable/dial_num_5.xml
deleted file mode 100644
index 7c1fdcc0f..000000000
--- a/res/drawable/dial_num_5.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@drawable/dial_num_5_wht" />
-</selector>
-
diff --git a/res/drawable/dial_num_6.xml b/res/drawable/dial_num_6.xml
deleted file mode 100644
index 3ed5052e3..000000000
--- a/res/drawable/dial_num_6.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@drawable/dial_num_6_wht" />
-</selector>
-
diff --git a/res/drawable/dial_num_7.xml b/res/drawable/dial_num_7.xml
deleted file mode 100644
index cd5624a9b..000000000
--- a/res/drawable/dial_num_7.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@drawable/dial_num_7_wht" />
-</selector>
-
diff --git a/res/drawable/dial_num_8.xml b/res/drawable/dial_num_8.xml
deleted file mode 100644
index b93567be1..000000000
--- a/res/drawable/dial_num_8.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@drawable/dial_num_8_wht" />
-</selector>
-
diff --git a/res/drawable/dial_num_9.xml b/res/drawable/dial_num_9.xml
deleted file mode 100644
index c12d98922..000000000
--- a/res/drawable/dial_num_9.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@drawable/dial_num_9_wht" />
-</selector>
-
diff --git a/res/drawable/dial_num_pound.xml b/res/drawable/dial_num_pound.xml
deleted file mode 100644
index c9c1e6f8c..000000000
--- a/res/drawable/dial_num_pound.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- <item android:state_pressed="true"
-        android:drawable="@drawable/dial_num_pound_blk" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/dial_num_pound_blk" /> -->
-    <item
-        android:drawable="@drawable/dial_num_pound_wht" />
-</selector>
-
diff --git a/res/drawable/dial_num_star.xml b/res/drawable/dial_num_star.xml
deleted file mode 100644
index af3c20e5b..000000000
--- a/res/drawable/dial_num_star.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- <item android:state_pressed="true"
-        android:drawable="@drawable/dial_num_star_blk" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/dial_num_star_blk" /> -->
-    <item
-        android:drawable="@drawable/dial_num_star_wht" />
-</selector>
-
diff --git a/res/drawable/end_call_background.xml b/res/drawable/end_call_background.xml
index efd13a425..33ec22fa1 100644
--- a/res/drawable/end_call_background.xml
+++ b/res/drawable/end_call_background.xml
@@ -14,6 +14,32 @@
      limitations under the License.
 -->
 
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/endcall_background_texture"
-    android:tileMode="repeat" />
+<!-- Background drawable used to render the "end call" button. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_enabled="false">
+        <bitmap
+            android:src="@drawable/endcall_disable"
+            android:tileMode="repeat" />
+    </item>
+
+    <item android:state_pressed="true">
+        <bitmap
+            android:src="@drawable/endcall_active"
+            android:tileMode="repeat" />
+    </item>
+
+    <item>
+        <layer-list>
+            <item>
+                <bitmap
+                    android:src="@drawable/endcall_background_texture"
+                    android:tileMode="repeat" />
+            </item>
+
+            <!-- The standard "compound button" background. -->
+            <item android:drawable="@drawable/btn_compound_background" />
+        </layer-list>
+    </item>
+
+</selector>
diff --git a/res/drawable/ic_in_call_touch_handle.xml b/res/drawable/ic_in_call_touch_handle.xml
index 5c52fe7d7..e657e92ed 100644
--- a/res/drawable/ic_in_call_touch_handle.xml
+++ b/res/drawable/ic_in_call_touch_handle.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<!-- Touch handle for the MultiWaveView widget on the incoming call screen -->
+<!-- Touch handle for the GlowPadView widget on the incoming call screen -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
diff --git a/res/drawable/dial_num_0_no_plus_wht.xml b/res/drawable/ic_lockscreen_answer.xml
similarity index 52%
rename from res/drawable/dial_num_0_no_plus_wht.xml
rename to res/drawable/ic_lockscreen_answer.xml
index 470ddf469..3184111fb 100644
--- a/res/drawable/dial_num_0_no_plus_wht.xml
+++ b/res/drawable/ic_lockscreen_answer.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2012 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.
@@ -13,8 +13,15 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
+<!-- Used with incoming call wigdet. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:drawable="@drawable/dial_num_0_no_plus_wht" />
+        android:state_enabled="true" android:state_active="false" android:state_focused="false"
+        android:drawable="@drawable/ic_lockscreen_answer_normal_layer"/>
+    <item
+        android:state_enabled="true" android:state_active="true"  android:state_focused="false"
+        android:drawable="@drawable/ic_lockscreen_answer_activated_layer" />
+   <item
+        android:state_enabled="true" android:state_active="false"  android:state_focused="true"
+        android:drawable="@drawable/ic_lockscreen_answer_activated_layer" />
 </selector>
diff --git a/res/drawable/ic_lockscreen_answer_activated_layer.xml b/res/drawable/ic_lockscreen_answer_activated_layer.xml
new file mode 100644
index 000000000..6889581c7
--- /dev/null
+++ b/res/drawable/ic_lockscreen_answer_activated_layer.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+            <solid android:color="#99cc00"/>
+            <size
+                android:width="@dimen/incoming_call_widget_circle_size"
+                android:height="@dimen/incoming_call_widget_circle_size" />
+        </shape>
+    </item>
+    <item
+        android:top="@dimen/incoming_call_widget_asset_margin"
+        android:right="@dimen/incoming_call_widget_asset_margin"
+        android:bottom="@dimen/incoming_call_widget_asset_margin"
+        android:left="@dimen/incoming_call_widget_asset_margin"
+        android:drawable="@drawable/ic_lockscreen_answer_activated" />
+</layer-list>
diff --git a/res/drawable/ic_lockscreen_answer_normal_layer.xml b/res/drawable/ic_lockscreen_answer_normal_layer.xml
new file mode 100644
index 000000000..083fe3fbd
--- /dev/null
+++ b/res/drawable/ic_lockscreen_answer_normal_layer.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- A fake circle to fix the size of this layer asset. -->
+    <item>
+        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+            <solid android:color="#00000000"/>
+            <size
+                android:width="@dimen/incoming_call_widget_circle_size"
+                android:height="@dimen/incoming_call_widget_circle_size" />
+        </shape>
+    </item>
+    <item
+        android:top="@dimen/incoming_call_widget_asset_margin"
+        android:right="@dimen/incoming_call_widget_asset_margin"
+        android:bottom="@dimen/incoming_call_widget_asset_margin"
+        android:left="@dimen/incoming_call_widget_asset_margin"
+        android:drawable="@drawable/ic_lockscreen_answer_normal" />
+</layer-list>
diff --git a/res/drawable/btn_dial_textfield.xml b/res/drawable/ic_lockscreen_decline.xml
similarity index 52%
rename from res/drawable/btn_dial_textfield.xml
rename to res/drawable/ic_lockscreen_decline.xml
index 4eabf1856..6643816d9 100644
--- a/res/drawable/btn_dial_textfield.xml
+++ b/res/drawable/ic_lockscreen_decline.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2012 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.
@@ -13,13 +13,15 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
+<!-- Used with incoming call wigdet. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" 
-        android:drawable="@drawable/btn_dial_textfield_pressed" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/btn_dial_textfield_selected" />
     <item
-        android:drawable="@drawable/btn_dial_textfield_normal" />
+        android:state_enabled="true" android:state_active="false" android:state_focused="false"
+        android:drawable="@drawable/ic_lockscreen_decline_normal_layer" />
+    <item
+        android:state_enabled="true" android:state_active="true"  android:state_focused="false"
+        android:drawable="@drawable/ic_lockscreen_decline_activated_layer" />
+    <item
+        android:state_enabled="true" android:state_active="false"  android:state_focused="true"
+        android:drawable="@drawable/ic_lockscreen_decline_activated_layer" />
 </selector>
-
diff --git a/res/drawable/ic_lockscreen_decline_activated_layer.xml b/res/drawable/ic_lockscreen_decline_activated_layer.xml
new file mode 100644
index 000000000..e3606d1e7
--- /dev/null
+++ b/res/drawable/ic_lockscreen_decline_activated_layer.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+            <solid android:color="#ff4040"/>
+            <size
+                android:width="@dimen/incoming_call_widget_circle_size"
+                android:height="@dimen/incoming_call_widget_circle_size" />
+        </shape>
+    </item>
+    <item
+        android:top="@dimen/incoming_call_widget_asset_margin"
+        android:right="@dimen/incoming_call_widget_asset_margin"
+        android:bottom="@dimen/incoming_call_widget_asset_margin"
+        android:left="@dimen/incoming_call_widget_asset_margin"
+        android:drawable="@drawable/ic_lockscreen_decline_activated" />
+</layer-list>
diff --git a/res/drawable/ic_lockscreen_decline_normal_layer.xml b/res/drawable/ic_lockscreen_decline_normal_layer.xml
new file mode 100644
index 000000000..2896bef80
--- /dev/null
+++ b/res/drawable/ic_lockscreen_decline_normal_layer.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- A fake circle to fix the size of this layer asset. -->
+    <item>
+        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+            <solid android:color="#00000000"/>
+            <size
+                android:width="@dimen/incoming_call_widget_circle_size"
+                android:height="@dimen/incoming_call_widget_circle_size" />
+        </shape>
+    </item>
+    <item
+        android:top="@dimen/incoming_call_widget_asset_margin"
+        android:right="@dimen/incoming_call_widget_asset_margin"
+        android:bottom="@dimen/incoming_call_widget_asset_margin"
+        android:left="@dimen/incoming_call_widget_asset_margin"
+        android:drawable="@drawable/ic_lockscreen_decline_normal" />
+</layer-list>
diff --git a/res/drawable/dial_num_0_no_plus.xml b/res/drawable/ic_lockscreen_text.xml
similarity index 52%
rename from res/drawable/dial_num_0_no_plus.xml
rename to res/drawable/ic_lockscreen_text.xml
index 470ddf469..f9caac818 100644
--- a/res/drawable/dial_num_0_no_plus.xml
+++ b/res/drawable/ic_lockscreen_text.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
+<!-- Copyright (C) 2012 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.
@@ -13,8 +13,15 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
+<!-- Used with incoming call wigdet. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
-        android:drawable="@drawable/dial_num_0_no_plus_wht" />
+        android:state_enabled="true" android:state_active="false" android:state_focused="false"
+        android:drawable="@drawable/ic_lockscreen_text_normal_layer" />
+    <item
+        android:state_enabled="true" android:state_active="true"  android:state_focused="false"
+        android:drawable="@drawable/ic_lockscreen_text_activated_layer" />
+    <item
+        android:state_enabled="true" android:state_active="false"  android:state_focused="true"
+        android:drawable="@drawable/ic_lockscreen_text_activated_layer" />
 </selector>
diff --git a/res/drawable/ic_lockscreen_text_activated_layer.xml b/res/drawable/ic_lockscreen_text_activated_layer.xml
new file mode 100644
index 000000000..95141e5ce
--- /dev/null
+++ b/res/drawable/ic_lockscreen_text_activated_layer.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+            <solid android:color="#99cc00"/>
+            <size
+                android:width="@dimen/incoming_call_widget_circle_size"
+                android:height="@dimen/incoming_call_widget_circle_size" />
+        </shape>
+    </item>
+    <item
+        android:top="@dimen/incoming_call_widget_asset_margin"
+        android:right="@dimen/incoming_call_widget_asset_margin"
+        android:bottom="@dimen/incoming_call_widget_asset_margin"
+        android:left="@dimen/incoming_call_widget_asset_margin"
+        android:drawable="@drawable/ic_lockscreen_text_activated" />
+</layer-list>
diff --git a/res/drawable/ic_lockscreen_text_normal_layer.xml b/res/drawable/ic_lockscreen_text_normal_layer.xml
new file mode 100644
index 000000000..42fd51de6
--- /dev/null
+++ b/res/drawable/ic_lockscreen_text_normal_layer.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- A fake circle to fix the size of this layer asset. -->
+    <item>
+        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+            <solid android:color="#00000000"/>
+            <size
+                android:width="@dimen/incoming_call_widget_circle_size"
+                android:height="@dimen/incoming_call_widget_circle_size" />
+        </shape>
+    </item>
+    <item
+        android:top="@dimen/incoming_call_widget_asset_margin"
+        android:right="@dimen/incoming_call_widget_asset_margin"
+        android:bottom="@dimen/incoming_call_widget_asset_margin"
+        android:left="@dimen/incoming_call_widget_asset_margin"
+        android:drawable="@drawable/ic_lockscreen_text_normal" />
+</layer-list>
diff --git a/res/layout-land/emergency_dialer.xml b/res/layout-land/emergency_dialer.xml
index d6b8eaa6f..7d8ed3ffa 100644
--- a/res/layout-land/emergency_dialer.xml
+++ b/res/layout-land/emergency_dialer.xml
@@ -19,26 +19,61 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
->
+    android:layout_marginLeft="@dimen/dialpad_horizontal_margin"
+    android:layout_marginRight="@dimen/dialpad_horizontal_margin">
 
     <!-- Text field above the keypad where the digits are displayed -->
-    <!-- TODO: Use a textAppearance to control the display of the number -->
-    <EditText android:id="@+id/digits"
+    <LinearLayout
+        android:id="@+id/digits_container"
         android:layout_width="match_parent"
         android:layout_height="@dimen/emergency_dialer_digits_height"
+        android:layout_marginTop="@dimen/dialpad_vertical_margin"
         android:layout_marginBottom="69dip"
-        android:layout_marginTop="1dip"
         android:gravity="center"
-        android:maxLines="1"
-        android:scrollHorizontally="true"
-        android:textSize="28sp"
-        android:freezesText="true"
-        android:background="@drawable/btn_dial_textfield"
-        android:textColor="@color/dialer_button_text"
-        android:hint="@string/dialerKeyboardHintText"
-     />
-
-    <!-- Horizontal row of buttons (Search + DialButton + Delete.) -->
-    <include layout="@layout/dialpad_additional_buttons"/>
+        android:background="@drawable/dialpad_background" >
+
+        <EditText
+            android:id="@+id/digits"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:scrollHorizontally="true"
+            android:textAppearance="@style/DialtactsDigitsTextAppearance"
+            android:nextFocusRight="@+id/deleteButton"
+            android:background="@android:color/transparent"
+            android:hint="@string/dialerKeyboardHintText" />
+
+        <ImageButton
+            android:id="@+id/deleteButton"
+            android:layout_width="56dip"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:gravity="center"
+            android:state_enabled="false"
+            android:background="?android:attr/selectableItemBackground"
+            android:contentDescription="@string/description_delete_button"
+            android:src="@drawable/ic_dial_action_delete" />
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/dialButtonContainer"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:layout_gravity="center_horizontal"
+        android:background="@drawable/dialpad_background">
+
+        <ImageButton
+            android:id="@+id/dialButton"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:state_enabled="false"
+            android:background="@drawable/btn_call"
+            android:contentDescription="@string/description_dial_button"
+            android:src="@drawable/ic_dial_action_call" />
+
+    </FrameLayout>
 
 </LinearLayout>
diff --git a/res/layout/adn_list.xml b/res/layout/adn_list.xml
index 233221a04..8bb3ebb14 100644
--- a/res/layout/adn_list.xml
+++ b/res/layout/adn_list.xml
@@ -14,11 +14,7 @@
      limitations under the License.
 -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/adnRoot"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
     <ListView android:id="@android:id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -31,4 +27,4 @@
         android:textAppearance="?android:attr/textAppearanceLarge"
         android:gravity="center"
     />
-</FrameLayout>
+</merge>
diff --git a/res/layout/call_card.xml b/res/layout/call_card.xml
index 45da49e8d..aac9c1c29 100644
--- a/res/layout/call_card.xml
+++ b/res/layout/call_card.xml
@@ -14,27 +14,23 @@
      limitations under the License.
 -->
 
-<!-- XML resource file for the *children* of a CallCard used in the Phone app.
-     The CallCard itself is a subclass of FrameLayout, and its (single)
-     child is the LinearLayout found here.  (In the CallCard constructor,
-     we inflate this file and add it as a child.)
+<!-- XML resource file for the CallCard used in the Phone app.
 
      Note that the CallCard is technically the size of the full screen (since
      our parent container is full-screen, and the layout_width and layout_height
      here are both "match_parent"), but we manually adjust its bottom margin
      in CallCard.updateCallInfoLayout() to make sure it doesn't overlap with
      the onscreen buttons from incall_touch_ui.xml. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.phone.CallCard xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/call_info_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    >
+    android:orientation="vertical">
 
     <!-- The main content of the CallCard is either one or two "call info"
          blocks, depending on whether one or two lines are in use.
 
-         The call_info blocks are stacked vertically inside a LinearLayout,
+         The call_info blocks are stacked vertically inside a CallCard (LinearLayout),
          each with layout_weight="1".  If only one line is in use (i.e. the
          common case) then the 2nd call info will be GONE and thus the 1st one
          will expand to fill the full height of the CallCard.
@@ -43,244 +39,15 @@
          updateCallInfoLayout()) to make sure it doesn't overlap with either
          the bottom button cluster or the incoming-call widget. -->
 
-    <!-- TODO (XML cleanup): Currently, every View of the entire CallCard
-         UI is spelled out here in this XML file.
+    <!-- Primary "Call info" block, for the foreground call. -->
+    <include android:id="@+id/primary_call_info"
+         layout="@layout/primary_call_info" />
 
-         This is because the the in-call visual design is still in
-         flux, and it's easier to shuffle layouts around this way
-         rather than having sub-components in separate XML files.
+    <!-- Secondary "Call info" block , for the background ("on hold") call. -->
+    <ViewStub android:id="@+id/secondary_call_info"
+         android:layout="@layout/secondary_call_info"
+         android:layout_width="match_parent"
+         android:layout_height="0dp"
+         android:layout_weight="1" />
 
-         But once the in-call visual design is final, let's
-         rearrange this XML to be more object-oriented:
-
-         - Have the "call banners" (or at least the banner for call
-           #1) come from separate XML files that get <include>d when
-           needed.  Consider making "CallBanner" an actual widget.
-
-           (Note: if we end up including the same XML file multiple
-           times, like for both call banners, we won't have separate
-           XML ids for (for example) "name" and "secondaryCallName".
-           So CallCard.java will need to look up those views
-           separately by calling findViewById on the specific
-           container around each banner.)
-
-         - Move any remaining hardcoded margin / padding / size
-           constants (both here and in incall_touch_ui.xml) out to
-           dimens.xml or styles.xml.
-    -->
-
-    <!-- "Call info" block #1, for the foreground call. -->
-    <RelativeLayout android:id="@+id/call_info_1"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        >
-
-        <!-- Contact photo for call_info_1 -->
-        <com.android.phone.InCallContactPhoto android:id="@+id/photo"
-                   android:layout_alignParentTop="true"
-                   android:layout_width="match_parent"
-                   android:layout_height="match_parent"
-                   android:gravity="top|center_horizontal"
-                   android:scaleType="centerCrop"
-                   android:contentDescription="@string/contactPhoto"
-                   />
-
-        <!-- "Call Banner" for call #1, the foregound or ringing call.
-             The "call banner" is a block of info about a single call,
-             including the contact name, phone number, call time counter,
-             and other status info.  This info is shown as a "banner"
-             overlaid across the top of contact photo. -->
-        <RelativeLayout android:id="@+id/call_banner_1"
-            android:layout_alignParentTop="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="@dimen/call_banner_height"
-            android:paddingLeft="@dimen/call_banner_side_padding"
-            android:paddingRight="@dimen/call_banner_side_padding"
-            android:paddingTop="@dimen/call_banner_top_bottom_padding"
-            android:paddingBottom="@dimen/call_banner_top_bottom_padding"
-            android:background="@color/incall_call_banner_background"
-            >
-
-            <!-- Name (or the phone number, if we don't have a name to display). -->
-            <TextView android:id="@+id/name"
-                      android:layout_alignParentTop="true"
-                      android:layout_alignParentLeft="true"
-                      android:layout_width="match_parent"
-                      android:layout_height="wrap_content"
-                      android:paddingRight="@dimen/call_banner_name_number_right_padding"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textColor="@color/incall_call_banner_text_color"
-                      android:singleLine="true"
-                      />
-
-            <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
-            <LinearLayout android:id="@+id/labelAndNumber"
-                          android:layout_below="@id/name"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:paddingRight="@dimen/call_banner_name_number_right_padding"
-                          android:orientation="horizontal"
-                          >
-                <TextView android:id="@+id/phoneNumber"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:textAppearance="?android:attr/textAppearanceSmall"
-                          android:textColor="@color/incall_call_banner_text_color"
-                          android:singleLine="true"
-                          />
-                <TextView android:id="@+id/label"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"
-                          android:textAppearance="?android:attr/textAppearanceSmall"
-                          android:textColor="@color/incall_call_banner_text_color"
-                          android:textAllCaps="true"
-                          android:singleLine="true"
-                          android:layout_marginLeft="6dip"
-                          />
-            </LinearLayout>
-
-            <!-- Elapsed time indication for a call in progress. -->
-            <TextView android:id="@+id/elapsedTime"
-                      android:layout_alignParentRight="true"
-                      android:layout_centerVertical="true"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textColor="@color/incall_call_banner_text_color"
-                      android:singleLine="true"
-                      />
-
-            <!-- Call type indication: a special label and/or branding
-                 for certain kinds of calls (like "Internet call" for a SIP call.) -->
-            <TextView android:id="@+id/callTypeLabel"
-                      android:layout_below="@id/labelAndNumber"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:textAppearance="?android:attr/textAppearanceSmall"
-                      android:textColor="@color/incall_call_banner_text_color"
-                      android:maxLines="1"
-                      android:ellipsize="end"
-                      />
-
-            <!-- Social status (currently unused) -->
-            <TextView android:id="@+id/socialStatus"
-                      android:layout_below="@id/callTypeLabel"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:textAppearance="?android:attr/textAppearanceSmall"
-                      android:textColor="@color/incall_call_banner_text_color"
-                      android:maxLines="2"
-                      android:ellipsize="end"
-                      />
-
-        </RelativeLayout>  <!-- End of call_banner for call_info #1. -->
-
-        <!-- "Inset" photo used with "id/photo" above:
-               When the contact photo is a lo-res thumbnail, id/photo
-             contains a scaled-up but *blurred* version of the photo, and
-             *this* ImageView is overlaid on top as a smaller, unblurred
-             inset.  (See InCallContactPhoto.java.)
-               The top of the inset is vertically aligned with the bottom
-             of the call banner.  (Note that means that in states where the
-             "call state label" is visible, the label (see below) will overlap
-             the top of the inset photo.)  -->
-        <ImageView android:id="@+id/insetPhoto"
-            android:layout_below="@id/call_banner_1"
-            android:layout_width="@dimen/contact_photo_inset_width"
-            android:layout_height="@dimen/contact_photo_inset_height"
-            android:scaleType="centerCrop"
-            android:layout_marginLeft="@dimen/contact_photo_inset_left_margin"
-            />
-
-        <!-- The "call state label": In some states, this shows a special
-             indication like "Dialing" or "Incoming call" or "Call ended".
-             It's unused for the normal case of an active ongoing call. -->
-        <!-- This is visually part of the call banner, but it's not actually
-             part of the "call_banner_1" RelativeLayout since it needs a
-             different background color. -->
-        <TextView android:id="@+id/callStateLabel"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/call_banner_1"
-            android:gravity="right"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp"
-            android:paddingRight="@dimen/call_banner_side_padding"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="@color/incall_call_banner_text_color"
-            android:textAllCaps="true"
-            android:background="@color/incall_call_state_label_background"
-            android:visibility="gone"
-            />
-
-    </RelativeLayout>
-
-
-    <!-- call_info block #2, for the background ("on hold") call.
-         If only one line is in use, this whole block will have its
-         visibility set to GONE. -->
-    <RelativeLayout android:id="@+id/call_info_2"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        >
-
-        <!-- Contact photo for call_info #2 -->
-        <com.android.phone.InCallContactPhoto android:id="@+id/secondaryCallPhoto"
-                   android:layout_alignParentTop="true"
-                   android:layout_width="match_parent"
-                   android:layout_height="match_parent"
-                   android:gravity="top|center_horizontal"
-                   android:scaleType="centerCrop"
-                   android:contentDescription="@string/onHold"
-                   />
-        <!-- For now, at least, there's no "inset" photo used with
-             "id/secondaryCallPhoto".  (That's the "on hold" call anyway,
-             so it's fine for it to be entirely blurry...) -->
-
-        <!-- call_banner for call_info #2 -->
-        <!-- Note this is much simpler than the call banner used
-             for the foreground call. -->
-        <RelativeLayout android:id="@+id/call_banner_2"
-            android:layout_alignParentTop="true"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/call_banner_height"
-            android:paddingLeft="@dimen/call_banner_side_padding"
-            android:paddingRight="@dimen/call_banner_side_padding"
-            android:paddingTop="@dimen/call_banner_top_bottom_padding"
-            android:paddingBottom="@dimen/call_banner_top_bottom_padding"
-            android:background="@color/incall_call_banner_background"
-            >
-            <!-- Name (or the phone number, if we don't have a name to display). -->
-            <TextView android:id="@+id/secondaryCallName"
-                      android:layout_alignParentTop="true"
-                      android:layout_alignParentLeft="true"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:textAppearance="?android:attr/textAppearanceMedium"
-                      android:textColor="@color/incall_call_banner_text_color"
-                      android:singleLine="true"
-                      />
-            <!-- TODO: possibly also add a label + number field below the name? -->
-
-            <!-- Call status of the background call, usually the string "On hold". -->
-            <!-- TODO: figure out where this really belongs! -->
-            <TextView android:id="@+id/secondaryCallStatus"
-                      android:layout_alignParentTop="true"
-                      android:layout_alignParentRight="true"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:text="@string/onHold"
-                      android:textAppearance="?android:attr/textAppearanceSmall"
-                      android:textColor="@color/incall_call_banner_text_color"
-                      android:textAllCaps="true"
-                      android:singleLine="true"
-                      />
-
-        </RelativeLayout>
-
-    </RelativeLayout>
-
-</LinearLayout>
+</com.android.phone.CallCard>
diff --git a/res/layout/caller_in_conference.xml b/res/layout/caller_in_conference.xml
index 93406ec91..f4aa6095e 100644
--- a/res/layout/caller_in_conference.xml
+++ b/res/layout/caller_in_conference.xml
@@ -4,9 +4,9 @@
      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.
@@ -14,102 +14,94 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="64dp"
+    android:orientation="horizontal"
     android:gravity="center_vertical">
 
-    <!-- List element -->
+    <!-- Caller information -->
     <LinearLayout
+        android:id="@+id/conferenceCallerSeparate"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="match_parent"
+        android:background="?android:attr/selectableItemBackground"
+        android:paddingLeft="16dp"
         android:orientation="horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:gravity="center_vertical">
 
-        <!-- "End" button for this caller -->
-        <ImageButton
-            android:id="@+id/conferenceCallerDisconnect"
-            style="?android:attr/buttonStyleSmall"
-            android:src="@drawable/ic_button_conference_end"
+        <!-- "Separate" (i.e. "go private") button for this caller -->
+        <ImageView
+            android:src="@drawable/ic_split_holo_dark"
             android:layout_width="46dp"
             android:layout_height="46dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginLeft="6dp"
             android:scaleType="center"
-            android:contentDescription="@string/onscreenEndCallText" />
+            android:contentDescription="@string/goPrivate"/>
 
-        <!-- Caller information -->
         <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="1dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:layout_marginLeft="4dp">
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:paddingLeft="8dp"
+             android:gravity="center_vertical"
+             android:orientation="vertical">
 
             <!-- Name or number of this caller -->
             <TextView
-                android:id="@+id/conferenceCallerName"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:textSize="22sp"
-                android:singleLine="true"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_marginRight="2dp"
-                />
+                 android:id="@+id/conferenceCallerName"
+                 android:textAppearance="?android:attr/textAppearanceLarge"
+                 android:textSize="18sp"
+                 android:singleLine="true"
+                 android:layout_width="wrap_content"
+                 android:layout_height="match_parent"
+                 android:layout_marginRight="2dp"
+                 />
 
             <!-- Number of this caller if name is supplied above -->
             <LinearLayout
-                android:orientation="horizontal"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical">
+                 android:layout_width="wrap_content"
+                 android:layout_height="match_parent"
+                 android:orientation="horizontal"
+                 android:gravity="bottom">
+
+                <!-- Number -->
+                <TextView
+                     android:id="@+id/conferenceCallerNumber"
+                     android:layout_width="wrap_content"
+                     android:layout_height="wrap_content"
+                     android:textSize="14sp"
+                     android:ellipsize="marquee"
+                     android:textColor="@color/manage_conference_secondary_text_color"
+                     android:singleLine="true"
+                     android:layout_marginRight="8dp" />
 
                 <!-- Number type -->
                 <TextView
                     android:id="@+id/conferenceCallerNumberType"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textStyle="bold"
-                    android:singleLine="true"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_marginRight="4dp"
-                    android:layout_marginBottom="2dp"/>
-
-                <!-- Number -->
-                <TextView
-                    android:id="@+id/conferenceCallerNumber"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:layout_height="wrap_content"
+                    android:textSize="12sp"
+                    android:textColor="@color/manage_conference_secondary_text_color"
+                    android:ellipsize="marquee"
                     android:singleLine="true"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"/>
+                    android:textAllCaps="true"
+                    android:gravity="left" />
 
             </LinearLayout>  <!-- End of caller number -->
 
         </LinearLayout>  <!-- End of caller information -->
+    </LinearLayout>
 
-        <!-- "Separate" (i.e. "go private") button for this caller -->
-        <ImageButton
-            android:id="@+id/conferenceCallerSeparate"
-            style="?android:attr/buttonStyleSmall"
-            android:src="@drawable/ic_button_conference_private"
-            android:layout_width="46dp"
-            android:layout_height="46dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginRight="6dp"
-            android:scaleType="center"
-            android:contentDescription="@string/goPrivate"/>
-
-    </LinearLayout>  <!-- End of single list element -->
-
-    <!-- List Divider -->
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:src="@android:drawable/divider_horizontal_dark"
-        android:scaleType="fitXY"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"/>
+    <!-- "End" button for this caller which should look like the
+         "end call" button in the main in-call UI screen -->
+    <ImageButton
+         android:id="@+id/conferenceCallerDisconnect"
+         android:layout_width="80dp"
+         android:layout_height="match_parent"
+         android:src="@drawable/ic_end_call_holo_dark"
+         android:background="@drawable/end_call_background"
+         android:scaleType="center"
+         android:contentDescription="@string/onscreenEndCallText" />
 
-</LinearLayout>
+</LinearLayout>  <!-- End of single list element -->
diff --git a/res/layout/dialpad.xml b/res/layout/dialpad.xml
index bdb135ab9..e112e1c93 100644
--- a/res/layout/dialpad.xml
+++ b/res/layout/dialpad.xml
@@ -33,13 +33,13 @@
          android:layout_height="0px"
          android:layout_weight="1">
         <ImageButton android:id="@+id/one" style="@style/DialpadButtonStyle"
-            android:src="@drawable/dial_num_1_no_vm"
+            android:src="@drawable/dial_num_1_no_vm_wht"
             android:contentDescription="@string/description_image_button_one" />
         <ImageButton android:id="@+id/two" style="@style/DialpadButtonStyle"
-            android:src="@drawable/dial_num_2"
+            android:src="@drawable/dial_num_2_wht"
             android:contentDescription="@string/description_image_button_two" />
         <ImageButton android:id="@+id/three" style="@style/DialpadButtonStyle"
-            android:src="@drawable/dial_num_3"
+            android:src="@drawable/dial_num_3_wht"
             android:contentDescription="@string/description_image_button_three" />
     </TableRow>
 
@@ -47,13 +47,13 @@
          android:layout_height="0px"
          android:layout_weight="1">
         <ImageButton android:id="@+id/four" style="@style/DialpadButtonStyle"
-            android:src="@drawable/dial_num_4"
+            android:src="@drawable/dial_num_4_wht"
             android:contentDescription="@string/description_image_button_four" />
         <ImageButton android:id="@+id/five" style="@style/DialpadButtonStyle"
-            android:src="@drawable/dial_num_5"
+            android:src="@drawable/dial_num_5_wht"
             android:contentDescription="@string/description_image_button_five" />
         <ImageButton android:id="@+id/six" style="@style/DialpadButtonStyle"
-            android:src="@drawable/dial_num_6"
+            android:src="@drawable/dial_num_6_wht"
             android:contentDescription="@string/description_image_button_six" />
     </TableRow>
 
@@ -61,13 +61,13 @@
          android:layout_height="0px"
          android:layout_weight="1">
         <ImageButton android:id="@+id/seven" style="@style/DialpadButtonStyle"
-            android:src="@drawable/dial_num_7"
+            android:src="@drawable/dial_num_7_wht"
             android:contentDescription="@string/description_image_button_seven" />
         <ImageButton android:id="@+id/eight" style="@style/DialpadButtonStyle"
-            android:src="@drawable/dial_num_8"
+            android:src="@drawable/dial_num_8_wht"
             android:contentDescription="@string/description_image_button_eight" />
         <ImageButton android:id="@+id/nine" style="@style/DialpadButtonStyle"
-            android:src="@drawable/dial_num_9"
+            android:src="@drawable/dial_num_9_wht"
             android:contentDescription="@string/description_image_button_nine" />
     </TableRow>
 
@@ -75,13 +75,13 @@
          android:layout_height="0px"
          android:layout_weight="1">
         <ImageButton android:id="@+id/star" style="@style/DialpadButtonStyle"
-            android:src="@drawable/dial_num_star"
+            android:src="@drawable/dial_num_star_wht"
             android:contentDescription="@string/description_image_button_star" />
         <ImageButton android:id="@+id/zero" style="@style/DialpadButtonStyle"
-            android:src="@drawable/dial_num_0_no_plus"
+            android:src="@drawable/dial_num_0_no_plus_wht"
             android:contentDescription="@string/description_image_button_zero" />
         <ImageButton android:id="@+id/pound" style="@style/DialpadButtonStyle"
-            android:src="@drawable/dial_num_pound"
+            android:src="@drawable/dial_num_pound_wht"
             android:contentDescription="@string/description_image_button_pound" />
     </TableRow>
 </TableLayout>
diff --git a/res/layout/dialpad_additional_buttons.xml b/res/layout/dialpad_additional_buttons.xml
deleted file mode 100644
index 9f5f27a5e..000000000
--- a/res/layout/dialpad_additional_buttons.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Horizontal row of buttons (Search / Dial / Backspace) shown
-     beneath the dialpad in the emergency dialer; see emergency_dialer.xml. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dialpadAdditionalButtons"
-    android:layout_width="match_parent"
-    android:layout_height="0px"
-    android:layout_weight="@integer/dialpad_layout_weight_additional_buttons"
-    android:layout_gravity="center_horizontal"
-    android:layout_marginTop="@dimen/dialpad_vertical_margin"
-    android:background="@drawable/dialpad_background"
-    android:orientation="horizontal">
-
-    <!-- Placeholder for the "Search" button.
-         (This button is never visible since there's no "Search" function
-         on this screen, but we have a placeholder here just to be
-         consistent with the dialpad in DialpadFragment.) -->
-    <ImageButton android:id="@+id/searchButton"
-        android:layout_width="0px"
-        android:layout_weight="0.30"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:state_enabled="false"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/description_search_button"
-        android:src="@drawable/ic_dial_action_search"
-        android:visibility="invisible"
-        />
-
-    <!-- Onscreen "Dial" button, used on all platforms by
-         default. Its usage can be disabled using resources (see
-         config.xml.) -->
-    <ImageButton android:id="@+id/dialButton"
-        android:layout_width="0px"
-        android:layout_weight="0.40"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:state_enabled="false"
-        android:background="@drawable/btn_call"
-        android:contentDescription="@string/description_dial_button"
-        android:src="@drawable/ic_dial_action_call" />
-
-    <!-- Onscreen "Backspace/Delete" button -->
-    <ImageButton android:id="@+id/deleteButton"
-        android:layout_width="0px"
-        android:layout_weight="0.30"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:state_enabled="false"
-        android:background="?android:attr/selectableItemBackground"
-        android:contentDescription="@string/description_delete_button"
-        android:src="@drawable/ic_dial_action_delete" />
-</LinearLayout>
-
diff --git a/res/layout/emergency_dialer.xml b/res/layout/emergency_dialer.xml
index 7216e7ed9..1f2b6eda3 100644
--- a/res/layout/emergency_dialer.xml
+++ b/res/layout/emergency_dialer.xml
@@ -24,25 +24,67 @@
     android:layout_marginRight="@dimen/dialpad_horizontal_margin">
 
     <!-- Text field above the keypad where the digits are displayed -->
-    <!-- TODO: Use a textAppearance to control the display of the number -->
-    <EditText android:id="@+id/digits"
+    <LinearLayout
+        android:id="@+id/digits_container"
         android:layout_width="match_parent"
         android:layout_height="0px"
         android:layout_weight="@integer/dialpad_layout_weight_digits"
         android:layout_marginTop="@dimen/dialpad_vertical_margin"
         android:gravity="center"
-        android:maxLines="1"
-        android:scrollHorizontally="true"
-        android:textSize="@dimen/dialpad_digits_text_size"
-        android:freezesText="true"
-        android:background="@drawable/dialpad_background"
-        android:textColor="?android:attr/textColorPrimary"
-        android:focusableInTouchMode="false" />
+        android:background="@drawable/dialpad_background" >
+
+        <EditText
+            android:id="@+id/digits"
+            android:layout_width="0dip"
+            android:layout_weight="1"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:scrollHorizontally="true"
+            android:textAppearance="@style/DialtactsDigitsTextAppearance"
+            android:focusableInTouchMode="false"
+            android:nextFocusRight="@+id/deleteButton"
+            android:background="@android:color/transparent" />
+
+        <ImageButton
+            android:id="@+id/deleteButton"
+            android:layout_width="56dip"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical"
+            android:gravity="center"
+            android:state_enabled="false"
+            android:background="?android:attr/selectableItemBackground"
+            android:contentDescription="@string/description_delete_button"
+            android:src="@drawable/ic_dial_action_delete" />
+    </LinearLayout>
 
     <!-- Keypad section -->
     <include layout="@layout/dialpad" />
 
-    <!-- Horizontal row of buttons beneath the dialpad (Search + DialButton + Delete.) -->
-    <include layout="@layout/dialpad_additional_buttons" />
+    <View
+       android:layout_width="match_parent"
+       android:layout_height="@dimen/dialpad_vertical_margin"
+       android:background="#66000000"/>
+
+    <!-- In usual dialpad we set some padding between this button and the
+         left/right edges. Here, we don't do that just for simplicitly. -->
+    <FrameLayout
+        android:id="@+id/dialButtonContainer"
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_weight="@integer/dialpad_layout_weight_additional_buttons"
+        android:layout_gravity="center_horizontal"
+        android:background="@drawable/dialpad_background">
+
+        <ImageButton
+            android:id="@+id/dialButton"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:state_enabled="false"
+            android:background="@drawable/btn_call"
+            android:contentDescription="@string/description_dial_button"
+            android:src="@drawable/ic_dial_action_call" />
+
+    </FrameLayout>
 
 </LinearLayout>
diff --git a/res/layout/extra_button_row.xml b/res/layout/extra_button_row.xml
new file mode 100644
index 000000000..1144661cf
--- /dev/null
+++ b/res/layout/extra_button_row.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/dialpad_background_opaque">
+    <!-- The buttons here have a text label floating off to the side
+         (which is necessary because these buttons are used only in
+         a few rare states, and the meaning of the icon might not be
+         obvious.)  The entire row (button + text) is clickable. -->
+
+    <!-- "Manage conference" -->
+    <!-- This button is used only on GSM devices, during a conference call. -->
+    <LinearLayout android:id="@+id/manageConferenceButton"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="@dimen/button_cluster_side_padding"
+        android:paddingRight="@dimen/button_cluster_side_padding"
+        android:background="?android:attr/selectableItemBackground">
+        <!-- The entire LinearLayout here is clickable, so we don't
+             care about clicks on the ImageButton itself. -->
+        <ImageButton android:id="@+id/manageConferenceButtonImage"
+            android:clickable="false"
+            style="@style/InCallExtraRowButton"
+            android:src="@drawable/ic_groups_holo_dark"
+            android:contentDescription="@string/onscreenManageConferenceText" />
+        <TextView android:id="@+id/manageConferenceButtonLabel"
+            style="@style/InCallExtraRowButtonLabel"
+            android:text="@string/onscreenManageConferenceText" />
+    </LinearLayout>
+
+    <!-- CDMA-specific "Merge" -->
+    <!-- This button is used only on CDMA devices, where we can't use
+         the Merge button in the main button row (because the "Add Call"
+         button might need to be enabled at the same time.) -->
+    <LinearLayout android:id="@+id/cdmaMergeButton"
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="@dimen/button_cluster_side_padding"
+        android:paddingRight="@dimen/button_cluster_side_padding"
+        android:background="?android:attr/selectableItemBackground">
+        <!-- The entire LinearLayout here is clickable, so we don't
+             care about clicks on the ImageButton itself. -->
+        <ImageButton android:id="@+id/cdmaMergeButtonImage"
+            android:clickable="false"
+            style="@style/InCallExtraRowButton"
+            android:src="@drawable/ic_merge_holo_dark"
+            android:contentDescription="@string/onscreenMergeCallsText" />
+        <TextView android:id="@+id/cdmaMergeButtonLabel"
+            style="@style/InCallExtraRowButtonLabel"
+            android:text="@string/onscreenMergeCallsText" />
+    </LinearLayout>
+
+</FrameLayout>
diff --git a/res/layout/get_pin2_screen.xml b/res/layout/get_pin2_screen.xml
index 27073a954..35c20c6ab 100644
--- a/res/layout/get_pin2_screen.xml
+++ b/res/layout/get_pin2_screen.xml
@@ -34,15 +34,27 @@
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/enter_pin2_text" />
 
-        <EditText android:id="@+id/pin"
-            android:layout_width="200dip"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:maxLines="1"
-            android:scrollHorizontally="true"
-            android:autoText="false"
-            android:capitalize="none"
-            android:password="true" />
+            android:orientation="horizontal">
+            <EditText
+                android:id="@+id/pin"
+                android:layout_width="200dip"
+                android:layout_height="wrap_content"
+                android:maxLines="1"
+                android:scrollHorizontally="true"
+                android:autoText="false"
+                android:capitalize="none"
+                android:password="true"
+                android:imeOptions="actionDone" />
 
+            <Button
+                android:id="@+id/ok"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@android:string/ok"/>
+        </LinearLayout>
     </LinearLayout>
 
 </RelativeLayout>
diff --git a/res/layout/incall_screen.xml b/res/layout/incall_screen.xml
index 732c33c21..da9a50960 100644
--- a/res/layout/incall_screen.xml
+++ b/res/layout/incall_screen.xml
@@ -16,39 +16,28 @@
 
 <!-- In-call Phone UI; see InCallScreen.java. -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/incall_screen"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-    <!-- inCallPanel: container for the CallCard. -->
-    <!-- TODO: This RelativeLayout is useless since it only has
-         one child.  And the only reason it's here is so we can
-         setVisibility(View.GONE) on it when we want to entirely
-         hide the CallCard.
-         So let's just get rid of it, and call setVisibility()
-         directly on the CallCard. -->
-    <!-- Note that the CallCard is technically the size of the full screen
+    android:layout_height="match_parent">
+    <!-- The "Call Card", which displays info about the currently
+         active phone call(s) on the device.  See call_card.xml.
+
+         Note that the CallCard is technically the size of the full screen
          (since layout_width and layout_height are both "match_parent" here) but
          we manually adjust its bottom margin in CallCard.updateCallInfoLayout()
          to make sure it doesn't overlap with the onscreen buttons from
          incall_touch_ui.xml. -->
-    <RelativeLayout android:id="@+id/inCallPanel"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    >
-        <!-- The "Call Card", which displays info about the currently
-             active phone call(s) on the device.  See call_card.xml. -->
-        <com.android.phone.CallCard android:id="@+id/callCard"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="match_parent"
-                                    />
-    </RelativeLayout>  <!-- End of inCallPanel -->
+    <include
+        layout="@layout/call_card"
+        android:id="@+id/callCard"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
 
     <!-- In-call onscreen touch controls; see InCallTouchUi.java.
          This widget contains the cluster of buttons shown at the bottom
          of the in-call screen, and also the DTMF dialpad (which, when
          visible, covers the upper part of the screen too.) -->
-    <com.android.phone.InCallTouchUi
+    <include layout="@layout/incall_touch_ui"
         android:id="@+id/inCallTouchUi"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -74,35 +63,4 @@
               android:layout_height="match_parent"
               />
 
-    <!-- Overlay for the "Calling via ..." provider badge, which is
-         displayed for a few seconds at the start of any outgoing call
-         using a gateway provider (see InCallScreen.updateProviderOverlay()). -->
-    <LinearLayout android:id="@+id/inCallProviderOverlay"
-        android:background="@drawable/dialog_bg_calling_via"
-        android:layout_width="match_parent"
-        android:layout_height="88dip"
-        android:layout_marginTop="@dimen/provider_overlay_top_margin"
-        android:layout_gravity="top"
-        android:gravity="center"
-        android:visibility="gone"
-        android:orientation="horizontal">
-
-         <ImageView android:id="@+id/callingViaIcon"
-            android:layout_width="40dip"
-            android:layout_height="40dip"
-            />
-        <TextView android:id="@+id/callingVia"
-            android:text="@string/calling_via_template"
-            android:layout_weight="1"
-            android:layout_width="0dip"
-            android:layout_height="match_parent"
-            android:textAppearance="?android:attr/textAppearanceSmallInverse"
-            android:gravity="center"
-            />
-        <View
-            android:layout_width="40dip"
-            android:layout_height="40dip"
-            />
-    </LinearLayout>
-
 </FrameLayout>
diff --git a/res/layout/incall_touch_ui.xml b/res/layout/incall_touch_ui.xml
index 4404e2ac5..598707e6d 100644
--- a/res/layout/incall_touch_ui.xml
+++ b/res/layout/incall_touch_ui.xml
@@ -19,64 +19,26 @@
      This layout is a fullscreen overlay, drawn on top of the
      non-touch-sensitive parts of the in-call UI (i.e. the call card).
 
-     The top-level View here is a FrameLayout with 2 children:
-       (1) incomingCallWidget: the UI displayed while an incoming call is ringing
-       (2) inCallControls: the widgets visible while a regular call (or calls) is in progress
-     Exactly one of these is visible at any given moment.
+     The top-level View here is a InCallTouchUi (FrameLayout) with 2 children:
+       (1) inCallControls: the widgets visible while a regular call (or calls) is in progress
+       (2) incomingCallWidget: the UI displayed while an incoming call is ringing
+     In usual cases, one of these is visible at any given moment.
+     One exception is when incomingCallWidget is fading-out. At that moment, we show
+     inCallControls beneath incomingCallWidget for smoother transition.
      -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.phone.InCallTouchUi xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:prvandroid="http://schemas.android.com/apk/prv/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     >
 
     <!--
-        (1) incomingCallWidget: the UI displayed while an incoming call is ringing.
-            See InCallTouchUi.showIncomingCallWidget().
-
-            Layout notes:
-            - Use an opaque black background since we need to cover up
-              a bit of the bottom of the contact photo
-            - The verticalOffset value gets us a little extra space above
-              the topmost "Respond by SMS" icon
-            - The negative layout_marginBottom shifts us slightly downward;
-              we're already aligned with the bottom of the screen, but we
-              don't have an icon in the downward direction so the whole
-              bottom area of this widget is just wasted space.
-    -->
-    <com.android.internal.widget.multiwaveview.MultiWaveView
-        android:id="@+id/incomingCallWidget"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="-46dp"
-        android:background="@android:color/black"
-        android:visibility="gone"
-
-        prvandroid:targetDrawables="@array/incoming_call_widget_3way_targets"
-        prvandroid:targetDescriptions="@array/incoming_call_widget_3way_target_descriptions"
-        prvandroid:directionDescriptions="@array/incoming_call_widget_3way_direction_descriptions"
-        prvandroid:handleDrawable="@drawable/ic_in_call_touch_handle"
-        prvandroid:waveDrawable="@*android:drawable/ic_lockscreen_outerring"
-        prvandroid:outerRadius="@*android:dimen/multiwaveview_target_placement_radius"
-        prvandroid:snapMargin="@*android:dimen/multiwaveview_snap_margin"
-        prvandroid:hitRadius="@*android:dimen/multiwaveview_hit_radius"
-        prvandroid:vibrationDuration="20"
-        prvandroid:leftChevronDrawable="@*android:drawable/ic_lockscreen_chevron_left"
-        prvandroid:rightChevronDrawable="@*android:drawable/ic_lockscreen_chevron_right"
-        prvandroid:feedbackCount="3"
-        prvandroid:horizontalOffset="0dip"
-        prvandroid:verticalOffset="20dip"
-        />
-
-    <!--
-        (2) inCallControls: the widgets visible while a regular call
+        (1) inCallControls: the widgets visible while a regular call
         (or calls) is in progress
     -->
     <RelativeLayout android:id="@+id/inCallControls"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_alignParentTop="true"
                     android:visibility="gone"
                     >
         <!-- DTMF dialpad shown in the upper part of the screen
@@ -93,91 +55,25 @@
                       android:orientation="vertical"
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
-                      android:layout_alignParentBottom="true"
-                      >
+                      android:layout_alignParentBottom="true">
 
             <!-- Row 1, the "extra button row": A couple of relatively rare
                  buttons used only in certain call states.
                  Most of the time this whole row is GONE.
                  For now, at least, there's only ever one button visible here
                  at a time, so this can be a simple FrameLayout. -->
-            <FrameLayout android:id="@+id/extraButtonRow"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@drawable/dialpad_background_opaque"
-                android:paddingLeft="@dimen/button_cluster_side_padding"
-                android:paddingRight="@dimen/button_cluster_side_padding"
-                >
-                <!-- The buttons here have a text label floating off to the side
-                     (which is necessary because these buttons are used only in
-                     a few rare states, and the meaning of the icon might not be
-                     obvious.)  The entire row (button + text) is clickable. -->
-
-                <!-- "Manage conference" -->
-                <!-- This button is used only on GSM devices, during a conference call. -->
-                <LinearLayout android:id="@+id/manageConferenceButton"
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="?android:attr/selectableItemBackground"
-                    >
-                    <!-- The entire LinearLayout here is clickable, so we don't
-                         care about clicks on the ImageButton itself. -->
-                    <ImageButton android:id="@+id/manageConferenceButtonImage"
-                        android:clickable="false"
-                        style="@style/InCallButton"
-                        android:src="@drawable/ic_groups_holo_dark"
-                        android:contentDescription="@string/onscreenManageConferenceText"
-                        />
-                    <TextView android:id="@+id/manageConferenceButtonLabel"
-                        style="@style/InCallExtraRowButtonLabel"
-                        android:text="@string/onscreenManageConferenceText"
-                        />
-                </LinearLayout>
-
-                <!-- CDMA-specific "Merge" -->
-                <!-- This button is used only on CDMA devices, where we can't use
-                     the Merge button in the main button row (because the "Add Call"
-                     button might need to be enabled at the same time.) -->
-                <LinearLayout android:id="@+id/cdmaMergeButton"
-                    android:orientation="horizontal"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="?android:attr/selectableItemBackground"
-                    >
-                    <!-- The entire LinearLayout here is clickable, so we don't
-                         care about clicks on the ImageButton itself. -->
-                    <ImageButton android:id="@+id/cdmaMergeButtonImage"
-                        android:clickable="false"
-                        style="@style/InCallButton"
-                        android:src="@drawable/ic_merge_holo_dark"
-                        android:contentDescription="@string/onscreenMergeCallsText"
-                        />
-                    <TextView android:id="@+id/cdmaMergeButtonLabel"
-                        style="@style/InCallExtraRowButtonLabel"
-                        android:text="@string/onscreenMergeCallsText"
-                        />
-                </LinearLayout>
-
-            </FrameLayout>
-
+            <ViewStub android:id="@+id/extraButtonRow"
+                      android:layout="@layout/extra_button_row"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content" />
 
             <!-- Row 2: The "End call" button. -->
-            <!-- This is in its own LinearLayout purely so that the whole row
-                 can have a background drawable distinct from the image itself. -->
-            <LinearLayout
-                android:orientation="horizontal"
+            <ImageButton android:id="@+id/endButton"
+                style="@style/InCallEndButton"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:src="@drawable/ic_dial_end_call"
                 android:background="@drawable/end_call_background"
-                >
-                <ImageButton android:id="@+id/endButton"
-                    style="@style/InCallEndButton"
-                    android:layout_width="match_parent"
-                    android:src="@drawable/ic_end_call"
-                    android:contentDescription="@string/onscreenEndCallText"
-                    />
-            </LinearLayout>
+                android:contentDescription="@string/onscreenEndCallText" />
 
             <!-- Row 3: The main batch of in-call buttons:
                     Dialpad / Audio mode / Mute / Hold / Add call
@@ -204,10 +100,8 @@
                      point exactly one of the pair is VISIBLE and the other is
                      GONE. -->
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
+                <!-- Separator between left padding and 1st button -->
+                <View style="@style/VerticalSeparator" />
 
                 <!-- "Dialpad" -->
                 <!-- This is a "compound button": it has checked and unchecked states. -->
@@ -217,11 +111,8 @@
                     android:contentDescription="@string/onscreenShowDialpadText"
                     />
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
-
+                <!-- Separator between 1st and 2nd button -->
+                <View style="@style/VerticalSeparator" />
 
                 <!-- "Audio mode" -->
                 <!-- This is a multi-mode button that can behave either like a
@@ -235,10 +126,8 @@
                     android:contentDescription="@string/onscreenAudioText"
                     />
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
+                <!-- Separator between 2nd and 3rd button -->
+                <View style="@style/VerticalSeparator" />
 
                 <!-- "Mute" -->
                 <!-- This is a "compound button": it has checked and unchecked states. -->
@@ -248,10 +137,8 @@
                     android:contentDescription="@string/onscreenMuteText"
                     />
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
+                <!-- Separator between 3rd and 4th button -->
+                <View style="@style/VerticalSeparator" />
 
                 <!-- This slot is either "Hold" or "Swap", depending on
                      the state of the call.   One or the other of these
@@ -270,10 +157,9 @@
                     android:contentDescription="@string/onscreenSwapCallsText"
                     />
 
+                <!-- Separator between 4th and 5th button (if 5th exists) -->
                 <View android:id="@+id/holdSwapSpacer"
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
+                      style="@style/VerticalSeparator" />
 
                 <!-- This slot is either "Add" or "Merge", depending on
                      the state of the call.  One or the other of these
@@ -294,10 +180,8 @@
                     android:contentDescription="@string/onscreenMergeCallsText"
                     />
 
-                <View
-                    android:layout_width="0dp"
-                    android:layout_weight="1"
-                    android:layout_height="match_parent" />
+                <!-- Separator between 4th (or 5th) button and right padding -->
+                <View style="@style/VerticalSeparator" />
 
             </LinearLayout>
 
@@ -305,4 +189,52 @@
 
     </RelativeLayout>
 
-</RelativeLayout>
+    <!--
+        (2) incomingCallWidget: the UI displayed while an incoming call is ringing.
+            See InCallTouchUi.showIncomingCallWidget().
+
+            Layout notes:
+            - Use an opaque black background since we need to cover up
+              a bit of the bottom of the contact photo
+            - The verticalOffset value gets us a little extra space above
+              the topmost "Respond by SMS" icon
+            - The negative layout_marginBottom shifts us slightly downward;
+              we're already aligned with the bottom of the screen, but we
+              don't have an icon in the downward direction so the whole
+              bottom area of this widget is just wasted space.
+    -->
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center|bottom"
+        android:orientation="vertical"
+        android:gravity="bottom"
+        android:background="@color/incall_call_banner_background">
+
+    <com.android.internal.widget.multiwaveview.GlowPadView
+        android:id="@+id/incomingCallWidget"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="20dip"
+        android:layout_marginBottom="-46dp"
+        android:visibility="gone"
+        android:layout_gravity="center_horizontal"
+        android:gravity="top"
+
+        prvandroid:targetDrawables="@array/incoming_call_widget_3way_targets"
+        prvandroid:targetDescriptions="@array/incoming_call_widget_3way_target_descriptions"
+        prvandroid:directionDescriptions="@array/incoming_call_widget_3way_direction_descriptions"
+        prvandroid:handleDrawable="@drawable/ic_in_call_touch_handle"
+        prvandroid:innerRadius="@*android:dimen/glowpadview_inner_radius"
+        prvandroid:outerRadius="@*android:dimen/glowpadview_target_placement_radius"
+        prvandroid:outerRingDrawable="@*android:drawable/ic_lockscreen_outerring"
+        prvandroid:snapMargin="@*android:dimen/glowpadview_snap_margin"
+        prvandroid:vibrationDuration="20"
+        prvandroid:feedbackCount="1"
+        prvandroid:glowRadius="@*android:dimen/glowpadview_glow_radius"
+        prvandroid:pointDrawable="@*android:drawable/ic_lockscreen_glowdot"
+        />
+    </FrameLayout>
+
+</com.android.phone.InCallTouchUi>
diff --git a/res/layout/manage_conference_panel.xml b/res/layout/manage_conference_panel.xml
index b819f090a..7baf09b39 100644
--- a/res/layout/manage_conference_panel.xml
+++ b/res/layout/manage_conference_panel.xml
@@ -48,29 +48,36 @@
         android:visibility="gone"/>
     <!-- End of the original header -->
 
-    <!-- New header, based on the list separator in Contacts. -->
-    <LinearLayout android:id="@+id/manageConferenceHeader"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:orientation="vertical">
+    <!-- Header which looks like ActionBar. -->
+    <FrameLayout
+        android:id="@+id/manageConferenceHeader"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@*android:drawable/ab_transparent_dark_holo">
 
-        <TextView
+        <LinearLayout
+            android:id="@+id/manage_done"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:background="@android:drawable/dark_header"
-            android:textColor="?android:attr/textColorSecondary"
-            android:textStyle="bold"
-            android:textSize="14sp"
-            android:paddingLeft="8dip"
-            android:text="@string/manageConferenceLabel"/>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dip"
-            android:background="?android:attr/listDivider"/>
+            android:background="?android:attr/selectableItemBackground"
+            android:clickable="true"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:src="?android:attr/homeAsUpIndicator"
+                android:layout_gravity="center_vertical|left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
 
-    </LinearLayout>  <!-- End of new header -->
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="?android:attr/actionBarSize"
+                style="@*android:style/TextAppearance.Holo.Widget.ActionBar.Title"
+                android:gravity="center_vertical"
+                android:text="@string/manageConferenceLabel"/>
+        </LinearLayout>
+
+    </FrameLayout>  <!-- End of header -->
 
     <!-- The scrollview wrapper for the list of callers on
          the conference call (in case the list gets too long). -->
@@ -78,16 +85,16 @@
         android:id="@+id/conferenceList"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/manageConferenceHeader"
-        android:layout_marginTop="8dip"
-        android:layout_marginBottom="60dip">
+        android:layout_below="@id/manageConferenceHeader">
 
         <!-- The actual list of callers; this embedded LinearLayout
              required since scrollview only supports a single child. -->
         <LinearLayout
             android:orientation="vertical"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:showDividers="middle|end"
+            android:divider="?android:attr/listDivider">
 
             <!-- A conference can have at most MAX_CALLERS_IN_CONFERENCE (= 5) callers,
                  so just define all those UI elements here. -->
@@ -121,25 +128,4 @@
 
     </ScrollView>  <!-- End of scrolling list wrapper for the linear layout -->
 
-    <!-- The grey footer, background behind the "Back to call" button -->
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="54dip"
-        android:gravity="center_vertical"
-        android:layout_alignParentBottom="true"
-        android:background="@android:drawable/dark_header"/>
-
-    <!-- The "Back to call" button -->
-    <Button android:id="@+id/manage_done"
-            style="?android:attr/buttonStyleSmall"
-            android:text="@string/caller_manage_manage_done_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:paddingTop="14dip"
-            android:paddingBottom="18dip"
-            android:paddingLeft="42dip"
-            android:paddingRight="42dip"/>
-
 </RelativeLayout>
diff --git a/res/layout/ongoing_call_notification.xml b/res/layout/ongoing_call_notification.xml
deleted file mode 100644
index 8b6992e9c..000000000
--- a/res/layout/ongoing_call_notification.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<!-- Layout file for the custom "expanded view" used by the ongoing call
-     Notification; see NotificationMgr.updateInCallNotification().
-
-     Based on xml files in framework.
-     - status_bar_latest_event_content.xml
-     - status_bar_latest_event_content_large_icon.xml (included by the first xml)
-     To keep layout consistency, this layout includes almost all views inside those
-     original xmls, some of which aren't used by Phone app.
-
-     Differences:
-     - merges those two files into one.
-     - uses Chronometer instead of TextView for "@+id/text1"
-     - adds "android:" (for public assets) or "*android:" (for private assets) to
-       each @dimen/@drawable.
-
-     TODO: Consider updating Notification.Builder to allow you to specify an arbitrary
-     (remotable) view for each line, rather than just setContentTitle() / setContentText().
-     That way we could use a Chronometer instead of a TextView in that one line, and not
-     need to duplicate the entire layout here.
-  -->
-<!-- status_bar_latest_event_content.xml -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/status_bar_latest_event_content"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-    <ImageView android:id="@+id/icon"
-        android:layout_width="@android:dimen/notification_large_icon_width"
-        android:layout_height="@android:dimen/notification_large_icon_width"
-        android:background="@*android:drawable/notify_panel_notification_icon_bg_tile"
-        android:scaleType="center"
-        />
-<!-- status_bar_latest_event_content_large_icon.xml -->
-<LinearLayout
-    android:id="@+id/status_bar_latest_event_content_large_icon"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:orientation="vertical"
-    android:paddingLeft="8dp"
-    android:paddingRight="8dp"
-    >
-    <TextView android:id="@+id/title"
-        android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent.Title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:fadingEdge="horizontal"
-        />
-    <TextView android:id="@+id/text2"
-        android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-2dp"
-        android:layout_marginBottom="-2dp"
-        android:singleLine="true"
-        android:fadingEdge="horizontal"
-        android:ellipsize="marquee"
-        android:visibility="gone"
-        android:alpha="0.7"
-        />
-    <LinearLayout
-        android:id="@+id/line3"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:alpha="0.7"
-        >
-        <Chronometer android:id="@+id/text1"
-            android:textAppearance="@android:style/TextAppearance.StatusBar.EventContent"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_gravity="center"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            />
-        <TextView android:id="@+id/info"
-            android:textAppearance="@*android:style/TextAppearance.StatusBar.EventContent.Info"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="0"
-            android:singleLine="true"
-            android:gravity="center"
-            android:paddingLeft="8dp"
-            />
-        <ImageView android:id="@+id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="0"
-            android:scaleType="center"
-            android:paddingLeft="8dp"
-            android:visibility="gone"
-            />
-    </LinearLayout>
-    <ProgressBar
-        android:id="@android:id/progress"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        style="?android:attr/progressBarStyleHorizontal"
-        />
-</LinearLayout> <!-- end of status_bar_latest_event_content_large_icon.xml -->
-
-</LinearLayout> <!-- end of status_bar_latest_event_content.xml -->
diff --git a/res/layout/outgoing_call_broadcaster.xml b/res/layout/outgoing_call_broadcaster.xml
new file mode 100644
index 000000000..eb1464732
--- /dev/null
+++ b/res/layout/outgoing_call_broadcaster.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<!-- The screen shown during CALL intent being handled. If the process is
+     unexpectedly slow, we'll make the spinner VISIBLE, to notify users
+     the black screen is intentional. -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/outgoing_call_broadcaster"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <ProgressBar
+        android:id="@+id/spinner"
+        style="@android:style/Widget.ProgressBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:visibility="gone"/>
+</FrameLayout>
diff --git a/res/layout/primary_call_info.xml b/res/layout/primary_call_info.xml
new file mode 100644
index 000000000..73718ee83
--- /dev/null
+++ b/res/layout/primary_call_info.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<!-- XML resource file for primary call info, which will be used by CallCard.
+     See also call_card.xml. -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    android:layout_weight="1">
+
+    <!-- Contact photo for primary call info -->
+    <ImageView android:id="@+id/photo"
+         android:layout_alignParentLeft="true"
+         android:layout_alignParentTop="true"
+         android:layout_width="match_parent"
+         android:layout_height="match_parent"
+         android:gravity="top|center_horizontal"
+         android:scaleType="centerCrop"
+         android:contentDescription="@string/contactPhoto" />
+
+    <!-- Used when the phone call is on hold, dimming the primary photo
+
+         Note: Theoretically it is possible to achieve this effect using
+         Drawable#setColorFilter().
+
+         But watch out: we also use cross fade between primary and
+         secondary photo, which may interfere with the dim effect with
+         setColorFilter(). To try it out, use GSM phones and do multiple
+         calls.
+
+         Detail: during the cross-fade effect we are currently using
+         TransitionDrawable. TransitionDrawable#setColorFilter() will call
+         the equivalent method for *both* drawables which are shared by
+         the two ImageViews. If we set setColorFilter() for "on hold" effect
+         during the cross-fade, *both* primary and secondary photos become
+         dim.
+
+         Theoretically it can be avoided (by copying drawable, or carefully
+         calling setColorFilter() conditionally. But it doesn't bang for the
+         buck for now.
+
+         TODO: try that. It may be smoother with slower devices.
+      -->
+    <View android:id="@+id/dim_effect_for_primary_photo"
+         android:layout_alignParentLeft="true"
+         android:layout_alignParentTop="true"
+         android:layout_width="match_parent"
+         android:layout_height="match_parent"
+         android:background="@color/on_hold_dim_effect"
+         android:visibility="gone" />
+
+    <!-- "Call Banner" for primary call, the foregound or ringing call.
+         The "call banner" is a block of info about a single call,
+         including the contact name, phone number, call time counter,
+         and other status info.  This info is shown as a "banner"
+         overlaid across the top of contact photo. -->
+    <RelativeLayout android:id="@+id/primary_call_banner"
+        android:layout_alignParentTop="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/call_banner_height"
+        android:paddingLeft="@dimen/call_banner_side_padding"
+        android:paddingRight="@dimen/call_banner_side_padding"
+        android:paddingTop="@dimen/call_banner_top_bottom_padding"
+        android:paddingBottom="@dimen/call_banner_top_bottom_padding"
+        android:background="@color/incall_call_banner_background">
+
+        <!-- Name (or the phone number, if we don't have a name to display). -->
+        <TextView android:id="@+id/name"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentLeft="true"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingRight="@dimen/call_banner_name_number_right_padding"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/incall_call_banner_text_color"
+            android:singleLine="true" />
+
+        <!-- Label (like "Mobile" or "Work", if present) and phone number, side by side -->
+        <LinearLayout android:id="@+id/labelAndNumber"
+            android:layout_below="@id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingRight="@dimen/call_banner_name_number_right_padding"
+            android:orientation="horizontal">
+            <TextView android:id="@+id/phoneNumber"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/incall_call_banner_text_color"
+                android:singleLine="true" />
+            <TextView android:id="@+id/label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/incall_call_banner_text_color"
+                android:textAllCaps="true"
+                android:singleLine="true"
+                android:layout_marginLeft="6dp" />
+        </LinearLayout>
+
+        <!-- Elapsed time indication for a call in progress. -->
+        <TextView android:id="@+id/elapsedTime"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/incall_call_banner_text_color"
+            android:singleLine="true"
+            android:visibility="invisible" />
+
+        <!-- Call type indication: a special label and/or branding
+             for certain kinds of calls (like "Internet call" for a SIP call.) -->
+        <TextView android:id="@+id/callTypeLabel"
+            android:layout_below="@id/labelAndNumber"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="@color/incall_call_banner_text_color"
+            android:maxLines="1"
+            android:ellipsize="end" />
+
+    </RelativeLayout>  <!-- End of call_banner -->
+
+    <LinearLayout android:id="@+id/secondary_info_container"
+        android:layout_below="@id/primary_call_banner"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|right"
+        android:orientation="vertical"
+        android:background="@color/incall_secondary_info_background"
+        android:animateLayoutChanges="true">
+
+        <!-- Shown when a gateway provider is used during any outgoing call. -->
+        <LinearLayout android:id="@+id/providerInfo"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/provider_info_top_bottom_padding"
+            android:paddingBottom="@dimen/provider_info_top_bottom_padding"
+            android:paddingLeft="@dimen/call_banner_side_padding"
+            android:paddingRight="@dimen/call_banner_side_padding"
+            android:gravity="right"
+            android:orientation="horizontal"
+            android:background="@android:color/transparent">
+            <TextView android:id="@+id/providerLabel"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_weight="6"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textAllCaps="true"
+                android:textColor="@color/incall_call_banner_text_color"
+                android:singleLine="true"
+                android:ellipsize="marquee" />
+            <TextView android:id="@+id/providerAddress"
+                android:layout_width="0px"
+                android:layout_height="wrap_content"
+                android:layout_weight="4"
+                android:gravity="right"
+                android:paddingLeft="8dp"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textAllCaps="true"
+                android:textColor="@color/incall_call_banner_text_color"
+                android:singleLine="true"
+                android:ellipsize="middle" />
+        </LinearLayout>
+
+        <!-- The "call state label": In some states, this shows a special
+             indication like "Dialing" or "Incoming call" or "Call ended".
+             It's unused for the normal case of an active ongoing call. -->
+        <TextView android:id="@+id/callStateLabel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="@dimen/provider_info_top_bottom_padding"
+            android:paddingBottom="@dimen/provider_info_top_bottom_padding"
+            android:paddingLeft="@dimen/call_banner_side_padding"
+            android:paddingRight="@dimen/call_banner_side_padding"
+            android:gravity="right"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="@color/incall_call_banner_text_color"
+            android:textAllCaps="true"
+            android:background="@android:color/transparent"
+            android:singleLine="true"
+            android:ellipsize="end" />
+    </LinearLayout>
+
+    <!-- Social status (currently unused) -->
+    <!-- <TextView android:id="@+id/socialStatus"
+              android:layout_below="@id/callTypeLabel"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:textAppearance="?android:attr/textAppearanceSmall"
+              android:textColor="@color/incall_call_banner_text_color"
+              android:maxLines="2"
+              android:ellipsize="end"
+              /> -->
+</RelativeLayout>
diff --git a/res/layout/secondary_call_info.xml b/res/layout/secondary_call_info.xml
new file mode 100644
index 000000000..0e6e65f81
--- /dev/null
+++ b/res/layout/secondary_call_info.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<!-- XML resource file for secondary call info, which will be used by CallCard.
+     See also call_card.xml.
+
+     This should look similar to primary call info (primary_call_info.xml), but
+     to optimize the view usage, the structure is different. -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <!-- Contact photo for call_info #2 -->
+    <ImageView android:id="@+id/secondaryCallPhoto"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:gravity="top|center_horizontal"
+        android:scaleType="centerCrop"
+        android:contentDescription="@string/onHold" />
+
+    <!-- Overlaps secondary photo when the secondary call is in HOLD state.
+
+         TODO: We could do better. See equivalent in primary xml. -->
+    <View android:id="@+id/dim_effect_for_secondary_photo"
+         android:layout_alignParentLeft="true"
+         android:layout_alignParentTop="true"
+         android:layout_width="match_parent"
+         android:layout_height="match_parent"
+         android:background="@drawable/clickable_dim_effect"
+         android:visibility="gone" />
+
+    <!-- Name (or the phone number, if we don't have a name to display). -->
+    <TextView android:id="@+id/secondaryCallName"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/call_banner_height"
+        android:gravity="top|left"
+        android:paddingLeft="@dimen/call_banner_side_padding"
+        android:paddingRight="@dimen/call_banner_side_padding"
+        android:paddingTop="@dimen/call_banner_top_bottom_padding"
+        android:paddingBottom="@dimen/call_banner_top_bottom_padding"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/incall_call_banner_text_color"
+        android:singleLine="true"
+        android:background="@color/incall_call_banner_background" />
+
+    <!-- Call status of the background call, usually the string "On hold". -->
+    <TextView android:id="@+id/secondaryCallStatus"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/call_banner_height"
+        android:layout_gravity="top|right"
+        android:gravity="top|right"
+        android:paddingLeft="@dimen/call_banner_side_padding"
+        android:paddingRight="@dimen/call_banner_side_padding"
+        android:paddingTop="@dimen/call_banner_top_bottom_padding"
+        android:paddingBottom="@dimen/call_banner_top_bottom_padding"
+        android:text="@string/onHold"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="@color/incall_call_banner_text_color"
+        android:textAllCaps="true"
+        android:singleLine="true" />
+</FrameLayout>
diff --git a/res/layout/sim_ndp.xml b/res/layout/sim_ndp.xml
index 64b33734f..f2a543039 100644
--- a/res/layout/sim_ndp.xml
+++ b/res/layout/sim_ndp.xml
@@ -4,9 +4,9 @@
      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.
@@ -20,7 +20,7 @@
         android:layout_height="match_parent"
         android:paddingLeft="20dip"
         android:paddingRight="20dip">
-    
+
     <LinearLayout
             android:id="@+id/entry_panel"
             android:orientation="vertical"
@@ -41,15 +41,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:scrollHorizontally="true" />
-            
+
         <Button android:id="@+id/ndp_unlock"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/sim_ndp_unlock_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingLeft="20dip"
-                android:paddingRight="20dip"
-                android:layout_centerHorizontal="true" />
+                android:paddingRight="20dip" />
 
         <!-- Dismiss button.  (Not present in some products; see
              sim_network_unlock_allow_dismiss in config.xml.) -->
@@ -59,8 +58,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingLeft="20dip"
-                android:paddingRight="20dip"
-                android:layout_centerHorizontal="true" />
+                android:paddingRight="20dip" />
 
     </LinearLayout>
 
@@ -81,5 +79,5 @@
             android:colorBackground="#80808080"
             android:text="@string/requesting_unlock" />
     </LinearLayout>
-    
+
 </RelativeLayout>
diff --git a/res/mipmap-hdpi/ic_launcher_contacts.png b/res/mipmap-hdpi/ic_launcher_contacts.png
index d73031991..e0136f666 100644
Binary files a/res/mipmap-hdpi/ic_launcher_contacts.png and b/res/mipmap-hdpi/ic_launcher_contacts.png differ
diff --git a/res/mipmap-mdpi/ic_launcher_contacts.png b/res/mipmap-mdpi/ic_launcher_contacts.png
index c79ae14e9..3d490c388 100644
Binary files a/res/mipmap-mdpi/ic_launcher_contacts.png and b/res/mipmap-mdpi/ic_launcher_contacts.png differ
diff --git a/res/mipmap-xhdpi/ic_launcher_contacts.png b/res/mipmap-xhdpi/ic_launcher_contacts.png
index ca3aa6374..dde3cbb8d 100644
Binary files a/res/mipmap-xhdpi/ic_launcher_contacts.png and b/res/mipmap-xhdpi/ic_launcher_contacts.png differ
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 1c544b815..6ae8c32cc 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Privaat nommer"</string>
     <string name="payphone" msgid="1931775086311769314">"Betaalfoon"</string>
     <string name="onHold" msgid="9035493194749959955">"Hou aan"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Huidige oproep"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Lyn is besig"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Netwerk besig"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Geen reaksie nie, uitgetel"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Bediener onbereikbaar"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nommer onbereikbaar"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Verkeerde gebruikernaam of wagwoord"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Geskakel van buite netwerk"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Geskakel van buite netwerk"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Bedienerfout. Probeer later weer."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Geen sein"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-grens oorskry"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio af"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Geen SIM of SIM-fout"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Geen SIM of SIM-fout"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Buite diensarea"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Uitgaande oproepe word beperk deur FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Jy kan nie uitgaande oproepe maak terwyl oproepblokkeer aan is nie."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Jy kan nie uitgaande oproepe maak terwyl oproepblokkeer aan is nie."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Alle oproepe word deur toegangbeheer beperk."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Noodoproepe word beperk deur toegangbeheer."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Gewone oproepe word beperk deur toegangbeheer."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Foon gesluit tot kragsiklus."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Oproep verlore."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Oproep onderskep."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: herrangskik."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Diensopsie verwerp."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: herprobeer-bevel."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Toegang onsuksesvol."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Voorgespring."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Net noodoproepe is moontlik."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Ongeldige nommer"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Ongeldige nommer"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferensie-oproep"</string>
     <string name="call_lost" msgid="317670617901479594">"Oproep is verlore."</string>
-    <string name="retry" msgid="8462986804300767852">"Herprobeer"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Oproep verlore"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-kode begin"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-kode loop tans…"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Bedraade kopfoon"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Stuur die volgende tone?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Stuur tone"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Stuur luitone"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Stuur"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Ja"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Nee"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Vervang die wilde karakter met"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Vervang die plekhouerkarakter met"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Vermiste stemboodskapnommer"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Geen stemboodskapnommer is op die SIM-kaart gestoor nie."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Voeg nommer by"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Laai tans…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Sleutel PIN-kode in om SIM-kaart te ontsluit."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM ontsluit"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Nuwe SIM PIN-kode"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Voer nuwe SIM PIN-kode weer in om te bevestig"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Die SIM-PIN\'s wat jy ingesleutel het stem nie ooreen nie. Probeer asseblief weer."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Voer PUK-kode in om SIM-kaart te ontsluit"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Verkeerde PUK-kode!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Gaan voort"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Jou SIM-kaart is oopgesluit. Jou foon sluit tans oop…"</string>
     <string name="label_ndp" msgid="780479633159517250">"SIM-netwerk ontsluit PIN"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Ontsluit"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Versoek tans netwerkontsluiting…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Netwerkaanvraag onsuksesvol ontsluit."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Netwerkontsluiting suksesvol."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM-oproepinstellings"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA-oproepinstellings"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Toegangspuntname"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Bykomende net-CDMA-oproepinstellings"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Netwerkdiensinstellings"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Beller-ID"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Laai tans instellings..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Nommer versteek in uitgaande oproepe"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Nommer wat vertoon in uitgaande oproepe"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Gebruik verstek beheerinstellings om my nommer te vertoon in uitgaande oproepe"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Nommer wanneer besig"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Stuur aan na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Gedeaktiveer"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Jou draer ondersteun nie die deaktivering van oproepaanstuur wanneer jou foon beset is nie."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Jou diensverskaffer ondersteun nie die deaktivering van oproepaanstuur wanneer jou foon beset is nie."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Stuur aan wanneer nie beantwoord nie"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Nommer wanneer onbeantwoord"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Stuur aan na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Gedeaktiveer"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Jou draer ondersteun nie die deaktivering van oproepaanstuur wanneer jou foon nie geantwoord word nie."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Jou diensverskaffer ondersteun nie deaktivering van oproepaanstuur wanneer jou foon nie antwoord nie."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Stuur aan wanneer onbereikbaar"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Nommer wanneer onbereikbaar"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Stuur aan na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Gedeaktiveer"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Jou draer ondersteun nie die deaktiveer van oproepaanstuur wanneer jou foon onbereikbaar is nie."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Jou diensverskaffer ondersteun nie die deaktivering van oproepaanstuur wanneer jou foon onbereikbaar is nie."</string>
     <string name="updating_title" msgid="6146755386174019046">"Belinstellings"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Oproepinstellingsfout"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Lees tans instellings…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Stel tans instellings terug…"</string>
     <string name="response_error" msgid="6674110501330139405">"Onverwagte antwoord van netwerk."</string>
     <string name="exception_error" msgid="7027667130619518211">"Netwerk- of SIM-kaartfout."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Bewerkings word net vir belbeperking-nommers toegelaat."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Skakel asseblief die radio aan voor jy na hierdie instellings kyk."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Die instelling op jou foonprogram se belperking-nommers is aangeskakel. As gevolg hiervan werk sommige oproepverwante kenmerke nie."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Skakel die radio aan voordat jy na hierdie instellings kyk."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Aktiveer"</string>
     <string name="disable" msgid="7274240979164762320">"Deaktiveer"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Versteek nommer"</item>
     <item msgid="1108394741608734023">"Wys nommer"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Stoor stemboodskapnommer"</string>
     <string name="vm_changed" msgid="380744030726254139">"Stemboodskapnommer verander."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Verandering van stemboodskapsnommer onsuksesvol."\n"Kontak asseblief jou draer as die probleem voortduur."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Verandering van aanstuurnommer onsuksesvol."\n"Kontak asseblief jou draer as hierdie probleem voortduur."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Kon nie die stemboodskapnommer verander nie."\n" Kontak jou diensverskaffer indien hierdie probleem voortduur."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Kon nie die aanstuurnommer verander nie."\n"Kontak jou diensverskaffer indien hierdie probleem voortduur."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Kon nie die huidige aanstuur-instellings opspoor en stoor nie."\n"Skakel oor na nuwe diensverskaffer in elk geval?"</string>
     <string name="no_change" msgid="3186040086622435212">"Geen veranderinge is gemaak nie."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Kies stemboodskapdiens"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Deursoek netwerke"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Fout het voorgekom terwyl netwerke gesoek is."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registreer op <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Jou SIM-kaart laat nie \'n verbinding na hierdie netwerk toe nie."</string>
-    <string name="connect_later" msgid="500090982903469816">"Kan nie tans aan hierdie netwerk koppel nie. Probeer later weer."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Jou SIM-kaart laat nie \'n verbinding na hierdie netwerk toe nie."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Kan nie nou aan hierdie netwerk koppel nie. Probeer later weer."</string>
     <string name="registration_done" msgid="495135664535876612">"Geregistreer op die netwerk."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Kies \'n netwerkoperateur"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Kies \'n netwerkoperateur"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Soek alle beskikbare netwerke"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Kies outomaties"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Kies voorkeurnetwerk outomaties"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Outomatiese registrasie..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Kies outomaties"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Kies voorkeurnetwerk outomaties"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Outomatiese registrasie..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Netwerkmodus"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Verander die netwerkbedryfsmodus"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Voorkeurnetwerk-modus"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Voorkeurnetwerk-modus: net EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Voorkeurnetwerk-modus: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Net EvDo"</item>
     <item msgid="454610224530856274">"CDMA sonder EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo outomaties"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA outomaties"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo outomaties"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA outomaties"</item>
     <item msgid="5189164180446264504">"Net WCDMA"</item>
     <item msgid="5714714953966979187">"Net GSM"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA verkies"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA verkies"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data geaktiveer"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Dataswerwing"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Verbind met datadienste tydens swerwing"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Verbind met datadienste tydens swerwing"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Jy het dataverbinding verloor, want jy het jou tuisnetwerk verlaat met dataswerwing afgeskakel."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Jy het dataverbinding verloor omdat jy wegbeweeg het van jou tuisnetwerk af sonder om dataswerwing weer aan te skakel."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Laat dataswerwing toe? Dit kan baie duur wees!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM//UMTS-opsies"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA-opsies"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Datagebruik"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Draer-databeleid"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Data in huidige tydperk gebruik"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Datagebruiksperiode"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Datatempobeleid"</string>
@@ -230,7 +206,6 @@
     <skip />
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Datatempo verminder na <xliff:g id="USED">%1$d</xliff:g> Kb/s as datagebruiklimiet oorskry word"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Meer inligting oor jou draer se mobielenetwerk-datagebruikbeleid"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Seluitsending-SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Seluitsending-SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Seluitsending-SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Seluitsending-SMS geaktiveer"</string>
@@ -271,15 +246,6 @@
     <item msgid="1858401628368130638">"Koreaans"</item>
     <item msgid="1933212028684529632">"Chinees"</item>
     <item msgid="1908428006803639064">"Hebreeus"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Tale"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Plaaslike weer"</string>
@@ -309,9 +275,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Werksgeleenthede"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Werksgeleenthede geaktiveer"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Werksgeleenthede gedeaktiveer"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Medies, gesondheid en hospitaal"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Medies, gesondheid en hospitaal geaktiveer"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Medies, gesondheid en hospitaal gedeaktiveer"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Medies, gesondheid en hospitaal"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Medies, gesondheid en hospitaal geaktiveer"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Medies, gesondheid en hospitaal gedeaktiveer"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Tegnologienuus"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Tegnologienuus geaktiveer"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Tegnologienuus gedeaktiveer"</string>
@@ -326,35 +292,17 @@
     <item msgid="8912042051809329533">"Net WCDMA"</item>
     <item msgid="8776934131146642662">"Net GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA word verkies)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Gebruik slegs 2G-netwerke"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Spaar battery"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Stelselkeuse"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Verander die cdma-swerfmodus"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Verander die CDMA-swerfmodus"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Stelselkeuse"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Net tuis"</item>
     <item msgid="1205664026446156265">"Outomaties"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA-swerfmodus"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Verander die cdma-swerfmodus"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA-swerfmodus"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Net tuisnetwerke"</item>
-    <item msgid="8174642753290624634">"Geaffilieerde netwerke"</item>
-    <item msgid="2241951431403168661">"Enige netwerk"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA-intekening"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA-netwerkvoorkeure"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Nog nie geïmplementeer nie!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA-netwerkvoorkeure"</string>
@@ -363,21 +311,11 @@
     <item msgid="6143696847467859795">"Net CDMA"</item>
     <item msgid="2683555124647197574">"Net EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA-intekening"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Wissel tussen RUIM/SIM en NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"intekening"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktiveer toestel"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Stel datadiens op"</string>
@@ -394,18 +332,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Bestuur vaste skakelnommers"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Verander PIN vir FDN-toegang"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Bestuur lys van foonnommers"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Stemprivaatheid"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Stemprivaatheid"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Aktiveer verbeterde privaatheidsmodus"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY-modus"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Aktiveer TTY-modus"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY-modus"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Stel TTY-modus"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Outoherprobeer"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Aktiveer outoherprobeer-modus"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Outoherprobeer"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Aktiveer outoherprobeer-modus"</string>
     <string name="menu_add" msgid="1882023737425114762">"Voeg kontak by"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Verander kontak"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Vee kontak uit"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Sleutel PIN2 in"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Voer PIN2 in"</string>
     <string name="name" msgid="7329028332786872378">"Naam"</string>
     <string name="number" msgid="7905950798349903858">"Nommer"</string>
     <string name="save" msgid="4094274636321939086">"Stoor"</string>
@@ -418,56 +354,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Vee belbeperking-nommer uit"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Verwyder belbeperking-nommer…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Belbeperking-nommer uitgevee."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN nie opgedateer nie: jy het \'n verkeerde PIN ingevoer."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN nie opgedateer nie: nommer mag nie meer as 20 syfers wees nie."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN is nie opgedateer nie omdat jy \'n verkeerde PIN ingevoer het."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN is nie opgedateer nie, omdat die getal nie 20 syfers kan oorskry nie."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN is nie bygewerk nie. Die PIN2 was verkeerd of die foonnommer is verwerp."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lees tans van SIM-kaart af…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Geen kontakte op jou SIM-kaart nie."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Kies kontakte om in te voer"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Skakel asseblief vliegtuigmodus af om kontakte in te voer vanaf SIM-kaart."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Skakel vliegtuigmodus af om kontakte in te voer vanaf die SIM-kaart."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Aktiveer/deaktiveer SIM-PIN"</string>
     <string name="change_pin" msgid="9174186126330785343">"Verander SIM-PIN"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Ou PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Nuwe PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Bevestig nuwe PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Die ou PIN wat jy ingesleutel het is verkeerd. Probeer asseblief weer."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Die PIN\'s wat jy ingesleutel het stem nie ooreen nie. Probeer asseblief weer."</string>
+    <string name="badPin" msgid="8955102849303984935">"Die ou PIN wat jy ingevoer het, is verkeerd. Probeer weer."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Die PIN\'s wat jy ingevoer het, stem nie ooreen nie. Probeer weer."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Sleutel \'n PIN wat 4 to 8 nommers lank is, in."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Deaktiveer SIM-PIN"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Aktiveer SIM-PIN"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Wag asseblief…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"SIM-PIN geaktiveer"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM-PIN gedeaktiveer"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Die PIN wat jy ingesleutel het is verkeerd"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"SIM-PIN suksesvol verander"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM-PIN geaktiveer"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM-PIN gedeaktiveer."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Die PIN wat jy ingevoer het, is verkeerd."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"SIM-PIN suksesvol verander."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Wagwoord verkeerd, SIM is gesluit! PUK2 versoek."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Ou PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nuwe PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Bevestig nuwe PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Die PUK2 wat jy ingevoer het is verkeerd. Probeer asseblief weer."</string>
-    <string name="badPin2" msgid="515218795152422178">"Die ou PIN2 wat jy ingesleutel het is verkeerd. Probeer asseblief weer."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Die PIN2\'s wat jy ingesleutel het stem nie ooreen nie. Probeer asseblief weer."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Die PUK2 wat jy ingevoer het, is verkeerd. Probeer asseblief weer."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Die ou PIN2 wat jy ingevoer het, is verkeerd. Probeer asseblief weer."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Die PIN2\'s wat jy ingevoer het, stem nie ooreen nie. Probeer asseblief weer."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Sleutel \'n PIN2 wat 4 to 8 nommers lank is, in."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Sleutel \'n 8-nommer-PUK2 in."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 suksesvol verander"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 suksesvol verander"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Sleutel PUK2-kode in"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Wagwoord verkeerd, verander asseblief PIN2 en probeer weer!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Wagwoord verkeerd, SIM is gesluit! PUK2 versoek."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Wagwoord verkeerd. Verander PIN2 en probeer weer!"</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Wagwoord verkeerd, SIM is gesluit. PUK2 word versoek."</string>
     <string name="doneButton" msgid="2859593360997984240">"Klaar"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferensie-oproep <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Terug na oproep"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Gaan voort sonder SIM-kaart"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Geen SIM-kaart gevind nie. Sit asseblief \'n SIM-kaart in die foon."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Maak toe"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Ontsluit"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Bevestig tans PIN…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Stemboodskapnommer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Bel"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Probeer weer"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferensie-oproep"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Inkomende oproep"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Cdma-oproepwag"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Oproep beëindig"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Hou aan"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Lui af"</string>
@@ -477,7 +407,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Gemiste oproepe"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> gemiste oproepe"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Gemiste oproep van <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Huidige oproep (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Oproep aan die gang"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Hou aan"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Inkomende oproep"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nuwe stemboodskap"</string>
@@ -486,13 +416,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Stemboodskapnommer onbekend"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Geen diens nie"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Gekose netwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nie beskikbaar nie"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Lui af"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Bel terug"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Boodskap"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Om \'n oproep te maak, skakel eers vliegtuigmodus af."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nie geregistreer op netwerk nie."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobiele netwerk nie beskikbaar nie."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Oproep nie gestuur nie, geen geldige nommer ingevoer nie."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Oproep nie gestuur nie."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Begin MMI-volgorde…"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Begin tans kenmerkode-proses..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nieondersteunde diens."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Kan nie oproepe wissel nie."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Kan nie oproep verdeel nie."</string>
@@ -504,18 +436,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Noodoproep"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Skakel tans radio aan…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Buite diensarea, probeer tans weer…"</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Oproep nie gestuur nie, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is nie \'n noodnommer nie!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Oproep nie gestuur nie, bel asseblief \'n noodnommer!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Oproep nie gestuur nie. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is nie \'n noodnommer nie!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Oproep nie gestuur nie. Bel asseblief \'n noodnommer!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Gebruik sleutelbord om te bel"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Raak-nommerbord"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Hou aan"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Ontaanhou"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Einde"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Nommerbord"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Versteek"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Spreker"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Demp"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Voeg oproep by"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Voeg oproepe saam"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Ruil"</string>
@@ -534,36 +461,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI-teks"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"STMF-tone"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"STMF-tone"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Stel die lengte van STMF-tone in"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normaal"</item>
     <item msgid="2883365539347850535">"Lank"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Netwerkboodskap"</string>
+    <string name="network_message" msgid="4483886461245213802">"Netwerkboodskap"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktiveer jou foon"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"\'n Spesiale oproep moet gemaak word om jou foondiens te aktiveer. "\n\n"Druk \"Aktiveer\" en luister dan na die instruksies om jou foon te aktiveer."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Raak \"Aktiveer\" om \'n spesiale oproep te maak wat jou foon op jou draer se mobiele netwerk aktiveer sodat jy oproepe kan maak en aan mobiele datanetwerke kan koppel."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Slaan aktivering oor?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"As jy aktivering oorslaan, kan jy nie oproepe maak of aan mobiele datanetwerke koppel nie (hoewel jy aan Wi-Fi-netwerke kan koppel). Tot tyd en wyl jy jou foon aktiveer, word jy gevra om dit te aktiveer elke keer wat jy dit aanskakel."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Slaan oor"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktiveer"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktiveer"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Foon is geaktiveer!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Foon is geaktiveer."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Probleem met aktivering"</string>
     <string name="ota_listen" msgid="162923839877584937">"Volg die gesproke instruksies tot jy hoor dat aktivering afgehandel is."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Nommerbord"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Spreker"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Wag asseblief terwyl jou foon geprogrammeer word."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programmering onsuksesvol"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Wag terwyl jou foon geprogrammeer word."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programmering onsuksesvol"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Jou foon is nou geaktiveer. Dit kan tot 15 minute duur vir die diens om te begin."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Jou foon het nie geaktiveer nie. "\n"Jy moet dalk \'n area met beter dekking probeer (naby \'n venster, of buite). "\n\n"Probeer asseblief weer of skakel kliëntediens vir meer opsies."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Jou foon het nie geaktiveer nie. "\n"Jy moet dalk \'n area met beter dekking probeer (naby \'n venster of buite). "\n\n"Probeer weer of skakel kliëntediens vir meer opsies."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"OORMAAT SPC-MISLUKKINGS"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Terug"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Probeer weer"</string>
     <string name="ota_next" msgid="3904945374358235910">"Volgende"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Terug"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialoog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Noodterugbel-modus betree"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Noodterugbel-modus"</string>
@@ -573,87 +495,69 @@
     <item quantity="other" msgid="3122217344579273583">"Geen dataverbinding vir <xliff:g id="COUNT">%s</xliff:g> minute nie"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Die foon sal in noodterugbel-modus wees vir <xliff:g id="COUNT">%s</xliff:g> minuut. Terwyl dit in dié modus is kan geen programme gebruik word wat \'n dataverbinding benodig nie. Wil jy graag nou verlaat?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Die foon sal in noodterugbel-modus wees vir <xliff:g id="COUNT">%s</xliff:g> minute. Terwyl jy in dié modus is kan geen programme gebruik word wat \'n dataverbinding gebruik nie. Wil jy graag nou verlaat?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Die telefoon sal in Noodterugbel-modus wees vir <xliff:g id="COUNT">%s</xliff:g> minuut. Terwyl in hierdie modus kan geen programme wat \'n dataverbinding nodig het, gebruik word nie. Wil jy nou uitgaan?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Die telefoon sal in Noodterugbel-modus wees vir <xliff:g id="COUNT">%s</xliff:g> minute. Terwyl in hierdie modus kan geen programme wat \'n dataverbinding nodig het, gebruik word nie. Wil jy nou uitgaan?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Die gekose handeling is nie beskikbaar terwyl jy in noodterugbel-modus is nie. Die foon sal in dié modus wees vir <xliff:g id="COUNT">%s</xliff:g> minuut. Wil jy graag nou verlaat?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Die gekose handeling is nie beskikbaar tydens noodterugbel-modus nie. Die foon sal in dié modus wees vir <xliff:g id="COUNT">%s</xliff:g> minute. Wil jy graag nou verlaat?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Die geselekteerde aksie is nie beskikbaar terwyl in die Noodterugbelmodus is nie. Die foon sal in hierdie modus vir <xliff:g id="COUNT">%s</xliff:g> minuut wees. Wil jy nou uitgaan?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Die geselekteerde aksie is nie beskikbaar terwyl in die Noodterugbelmodus is nie. Die foon sal in hierdie modus vir <xliff:g id="COUNT">%s</xliff:g> minuut wees. Wil jy nou uitgaan?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Die gekose handeling is nie beskikbaar tydens \'n noodoproep nie"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Verlaat noodterugbel-modus"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Die gekose handeling is nie beskikbaar tydens \'n noodoproep nie."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Verlaat noodterugbel-modus"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Ja"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Nee"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Maak toe"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Stemboodskapinstellings"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;not set&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Stemboodskapdiens"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Instellings vir <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Diens"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Opstelling"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nie gestel nie&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Ander oproepinstellings"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Bel"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Bel via ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Trek regs om te antwoord"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Trek links om luitoestel stil te maak"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Trek links om af te wys"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Trek regs om te antwoord en"\n"aktiewe oproep aan te hou"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Trek regs om te antwoord en"\n"aktiewe oproep te beëindig"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Trek regs om te antwoord en"\n"die aangehoude oproep te beëindig"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Antwoord"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Wys af"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Bel via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"kontakfoto"</string>
     <string name="goPrivate" msgid="865837794424530980">"gaan privaat"</string>
     <string name="selectContact" msgid="781975788478987237">"kies kontak"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Internetoproep-instellings"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Internetoproep-rekeninge (SIP-rekeninge)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Rekeninge"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Bestuur internetoproep-rekeninge (SIP-rekeninge) en -status"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Ontvang inkomende oproepe"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Verminder batteryleeftyd"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Stel oproepopsies op"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Gebruik internetoproepe"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Gebruik internetbel (net Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Vir alle oproepe wanneer datanetwerk beskikbaar is"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Net vir internetoproepe"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Vra vir elke oproep"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Vir alle oproepe"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Outoregistrasie"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Uitgaande oproep via SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Maak oproep"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Gebruik internetoproep-rekening:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Gebruik altyd om internetoproepe te maak"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Jy kan die oproepinstellings gebruik om die verstek internetoproep-rekening te verander deur \'n ander rekening te kies onder Internetoproep-instellings"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Jy kan verander watter Internetoproep-rekening om by verstek te gebruik vanaf die Foon &gt; Instellings&gt; Internetoproep-instellings &gt; Rekeningeskerm."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Selfoonoproep"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Internetoproep"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Geen internetoproep-rekening nie"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Daar is geen internetoproep-rekeninge op hierdie foon nie. Voeg nou een by?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Daar is geen internetoproep-rekeninge op die selfoon nie. Wil jy nou een byvoeg?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Voeg by"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Voeg rekening by"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Verwyder rekening"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP-rekeninge"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Stoor tans die rekening..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Verwyder tans die rekening..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Stoor tans die rekening..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Verwyder tans die rekening..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Stoor"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Gooi weg"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Sluit die profiel"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Sluit"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Primêre"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Maak hierdie my primêre rekening"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Gebruik vir uitgaande oproepe"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Gevorderde instellings"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Primêre rekening. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Kontroleer tans status..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Registreer tans..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Probeer nog steeds..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Ontvang nie oproepe nie"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Rekeningregistrasie gestop omdat daar geen internetverbinding is nie"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Rekeningregistrasie gestaak omdat daar geen Wi-Fi-verbinding is nie"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Rekeningregistrasie het misluk"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Ontvang oproepe"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registreer tans..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Probeer nog steeds..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Ontvang nie oproepe nie."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Rekeningregistrasie is gestop omdat daar geen internetverbinding is nie."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Rekeningregistrasie is gestaak omdat daar geen Wi-Fi-verbinding is nie."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Rekeningregistrasie het misluk."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Ontvang oproepe."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Rekeningregistrasie het misluk: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); sal later probeer"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Rekeningregistrasie het misluk: verkeerde gebruikernaam of wagwoord"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Rekening registrasie onsuksesvol: kontroleer die bedienernaam"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Hierdie rekening word tans gebruik deur die <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> program"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Rekeningregistrasie het misluk: Verkeerde gebruikernaam of wagwoord"</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Rekening registrasie onsuksesvol: Kontroleer die bedienernaam."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Hierdie rekening word tans gebruik deur die <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>-program."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIP-rekeningdetails"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP-rekeningdetails"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Bediener"</string>
@@ -664,9 +568,6 @@
     <string name="port_title" msgid="5952939408078626657">"Poortnommer"</string>
     <string name="transport_title" msgid="8253139511847746640">"Vervoertipe"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Stuur lewendighou"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Stuur SIP lewendighou-boodskappe"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Outoregistrasie"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Registreer die profiel outomaties"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Stel as primêre rekening"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Gebruik vir uitgaande oproepe"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Opsionele instellings"</string>
@@ -677,12 +578,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Opsioneel&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Raak om almal te wys"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Raak om almal te versteek"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> word vereis, kan nie leeg wees nie"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Poortnommer moet tussen 1000 en 65534 wees"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> word vereis, kan nie leeg wees nie."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Poortnommer moet tussen 1 000 en 65 534 wees."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Geen internetverbinding nie"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Geen Wi-Fi-verbinding nie"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Om \'n internetoproep te maak, kontroleer eers jou internetverbinding"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Jy moet aan \'n Wi-Fi-netwerk gekoppel wees vir internetoproepe (gebruik draadloos-en-netwerkinstellings)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Om \'n internetoproep te maak, kontroleer eers jou internetverbinding."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Jy moet aan \'n Wi-Fi-netwerk gekoppel wees vir internetoproepe (gebruik Wi-Fi- en netwerkinstellings)"</string>
     <string name="no_voip" msgid="8901474054537199865">"Internetoproepe nie ondersteun nie"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Outomaties"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Stuur altyd"</string>
@@ -691,7 +592,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Ek bel jou nou-nou terug."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Ek bel jou later."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Kan nie nou praat nie. Bel my later?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Gepasmaakte boodskap..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Gepasmaakte boodskap"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Vinnige antwoorde"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Redigeer vinnige antwoorde"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -709,7 +610,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"ster"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"nul"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"huts"</string>
-    <string name="description_search_button" msgid="239929880630534731">"soek"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"bel"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"terugvee"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Luidsprekerfoon geaktiveer."</string>
@@ -719,9 +619,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Wys af"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibreer"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibreer"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Luitoon"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Altyd"</item>
     <item msgid="1595097872875714252">"Net wanneer stil"</item>
     <item msgid="1458182414036878616">"Nooit"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Foon-luitoon"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibreer wanneer lui"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Belblad-raaktone"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Luitoon"</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 6db0859f7..71872e168 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"የግል ቁጥር"</string>
     <string name="payphone" msgid="1931775086311769314">"የክፍያ ስልክ"</string>
     <string name="onHold" msgid="9035493194749959955">"ያዝናቆይ"</string>
-    <string name="ongoing" msgid="8300874342848721367">"የአሁን ጥሪ"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"መስመሩ ተይዟል"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"አውታረመረብ ተይዟል"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"ምንም ምላሽ የለም፣ ጊዜው አልቋል"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"አገልጋይ አይደረስበትም"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"ቁጥር አይደረስበትም"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"የተሳሳየ ተጠቃሚ ስም እና ይለፍ ቃል"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"ከአውታረ መረብ ውጪ  የተደወለ"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"ከአውታረ መረብ ውጪ የተደወለ"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"የአግልጋይ ስህተት፣ እባክዎ በድጋሚ ቆይተው ይሞክሩ።"</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"ምንም አመልካች የለም"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM ወሰንአልፏል"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"ሬዲዮ ጠፍቷል"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"ምንም SIM ፣ ወይም የSIM ስህተት የለም"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"ምንም SIM ፣ ወይም የSIM ስህተት የለም"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"ከአገልግሎት መስጫ ክልል ውጪ"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"ወጪ ጥሪዎች በFDN ተከልክለዋል።"</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"የጥሪ ክልከላበርቶ ወጪ ጥሪ ማድረግ አይችሉም።"</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"የጥሪ ክልከላ በርቶ ሳለ የወጪ ጥሪ ማድረግ አትችልም።"</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"ሁሉም ጥሪዎች በመድረሻ መቆጣጠሪያ የተከለከሉ ናቸው።"</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"የአደጋ ጊዜ ጥሪዎች በድረስ መቆጣጠሪያተከልክልዋል።"</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"መደበኛ ጥሪዎች በድረስ መቆጣጠሪያ ተከልክልዋል።"</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: እስከኃይል ዑዸት ስልክ ተቆልፏል።"</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA፡ጥሪ ተቋርጧል"</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA፡ጥሪ ተስተጓጉሏል"</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA:ዳግምስርዓትአስይዝ።"</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: የአገልግሎት አማራጭ አትቀበል።"</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA:ትዕዛዝ ዳግም ሞክር።"</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA፤ መዳረሻ ስኬታማ አልነበረም፡፡"</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: አስቀድሞ ያዘ።"</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"የአደጋ ጊዜ ጥሪዎች ብቻ የሚቻሉ ናቸው።"</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"ትክክል ያልሆነ ቁጠር"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"ተቀባይነት የሌለው ቁጥር"</string>
     <string name="confCall" msgid="1904840547188336828">"የስብሰባ ጥሪ"</string>
     <string name="call_lost" msgid="317670617901479594">"ጥሪ ተቋርጣል።"</string>
-    <string name="retry" msgid="8462986804300767852">"እንደገና ሞክር"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"ጥሪ ተቋርጣል"</string>
     <string name="ok" msgid="3811371167865772377">"እሺ"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"የMMI ኮድ ጀምሯል"</string>
     <string name="ussdRunning" msgid="485588686340541690">"የUSSD ኮድ አሂድ ላይ ነው..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"ባለ ገመድ የጆሮ ማዳመጫ"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"ብሉቱዝ"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"የሚከተሉትንድምፆች ላክ?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"ድምፆች በመላክ ላይ"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"ድምፆች በመላክ ላይ "\n</string>
     <string name="send_button" msgid="4106860097497818751">" ላክ"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"አዎ"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"አይ"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"የልቅ ምልክትተካ"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"የልቅ ምልክት ተካ በ"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"የድምፅመልዕክት ቁጥርአመለጠ"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"በSIM ካርዱ ላይምንም የድምፅመልዕክት ቁጥር አልከተቀመጠም።"</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"ቁጥር አክል"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"በመስቀል ላይ…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"SIM ካርድ ለማስከፈት PUK ኮድ ተይብ።"</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM ተከፍቷል"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"አዲስSIM PIN ኮድ"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"ለማረጋገጥ አዲስ SIM PIN ኮድ እንደገና ተይብ"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"ያስገቡዋቸው የSIM PINኦች  አይዛመዱም።እባክዎ እንደገና ይሞክሩ።"</string>
-    <string name="enterPuk" msgid="6144749655582862324">"SIM ካርድ ለማስከፈት PUK ኮድ ተይብ"</string>
-    <string name="badPuk" msgid="3213017898690275965">"የተሳሳተ PUK ኮድ!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"ቀጥል"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"የSIM ካርድዎ አልታገደም። ስልክዎ በመከፈት ላይነው..."</string>
     <string name="label_ndp" msgid="780479633159517250">"የSIM አውታረመረብ መክፈቻ PIN"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"ክፈት"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"አውታረመረብ ለማስከፈት በመጠየቅ ላይ..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"የአውታረ መረብ ክፈትጥየቃአል ተሳካም።"</string>
     <string name="unlock_success" msgid="6770085622238180152">"የአውታረ መረብክፈት ተሳክቷል።"</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"የGSM  ጥሪ ቅንብሮች"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA የጥሪ ቅንብሮች"</string>
     <string name="apn_settings" msgid="9043423184895642077">"የድረስ ነጥብ ስም"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"ተጨማሪCDMA ጥሪ ቅንብሮችብቻ"</string>
     <string name="labelNwService" msgid="4699970172021870983">"የአውታረ መረብአገልግሎት ቅንብሮች"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"የደዋይ ID"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"ቅንብሮች በመጫን ላይ..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"በወጪ ጥሪዎች ላይ ቁጥርተደብቋል"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"በወጪ ጥሪዎች ላይ ቁጥር ታይቷል"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"በወጪ ጥሪዎች ቁጥሬን ለማሳየት የነባሪ ከዋኝቅንብሮችን ተጠቀም"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"ቁጥሩ ሲያዝ"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"ወደ <xliff:g id="PHONENUMBER">{0}</xliff:g>በማስተላለፍ ላይ"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"ቦዝኗል"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"ስልክዎ ስራ ሲበዛበት የድምጽ ተያያዥ ሞደምዎ የጥሪ-ማስተላለፍ ማንቂያውን አይደግፍም።"</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"ስልክህ ስራ ሲበዛበት የድምጽ ተያያዥ ሞደም አቅራቢህ  የጥሪ-ማስተላለፍን  አይደግፍም።"</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"ካልተነሳ አስላልፍ"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"ቁጥሩ ሳይነሳ"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"ወደ <xliff:g id="PHONENUMBER">{0}</xliff:g>በማስተላለፍ ላይ"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"ቦዝኗል"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"ስልክዎ ስራ ሲበዛበት የድምጽ ተያያዥ ሞደምዎ የጥሪ-ማስተላለፍ ማንቂያውን አይደግፍም።"</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"ስልክህ በማይመልስበት ጊዜ የድምጽ ተያያዥ ሞደም አቅራቢህ  የጥሪ-ማስተላለፍን  አይደግፍም።"</string>
     <string name="labelCFNRc" msgid="47183615370850000">"ሳይገኝአስተላልፍ"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"ቁጥሩሳይገኝ"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"ወደ <xliff:g id="PHONENUMBER">{0}</xliff:g>በማስተላለፍ ላይ"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"ቦዝኗል"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"ስልክዎ ሳይደረስበት የድምጽ ተያያዥ ሞደምዎ የጥሪ-ማስተላለፍ ማንቂያውን አይደግፍም።"</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"ስልክህ በማይደረስበት ጊዜ የድምጽ ተያያዥ ሞደምህ  የጥሪ-ማስተላለፍን አይደግፍም።"</string>
     <string name="updating_title" msgid="6146755386174019046">"የጥሪ ቅንብሮች"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"የጥሪ ቅንብሮች ስህተት"</string>
     <string name="reading_settings" msgid="1920291699287055284">"ቅንብሮች በማንበብ ላይ..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"ቅንብሮችን በማህደር ላይ..."</string>
     <string name="response_error" msgid="6674110501330139405">"ከአውታረ መረብ ያልተጠበቀ ምላሽ"</string>
     <string name="exception_error" msgid="7027667130619518211">"አውታረ መረብ ወይም SIM ካርድ ስህተት።"</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"በቋሚ መደወያ ቁጥሮች ላይ ብቻ ክወናዎች ተፈቅደዋል።"</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"እባክዎ እነዚህን ቅንብሮች ከማየትዎ በፊት ሬዲዮዎን ያብሩ።"</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"የስልክህ መተግበሪያ የተወሰነ ስልክ ቁጥሮች ቅንብር የበራ ነው። በዚህም ውጤት መሰረት፣ ከጥሪ ጋር የተያያዙ አንዳንድ ባህሪያት እየሰሩ አይደለም።"</string>
+    <string name="radio_off_error" msgid="2304459933248513376">" እነዚህን ቅንብሮች ከማየትህ በፊት ሬዲዮኑን አብራ።"</string>
     <string name="close_dialog" msgid="2365884406356986917">"እሺ"</string>
     <string name="enable" msgid="1059008390636773574">"አንቃ"</string>
     <string name="disable" msgid="7274240979164762320">"አቦዝን"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"ቁጥር ደብቅ"</item>
     <item msgid="1108394741608734023">"ቁጥርአሳይ"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"የድምፅመልዕክት ቁጥር አስቀምጥ"</string>
     <string name="vm_changed" msgid="380744030726254139">"የድምፅ መልዕክት ቁጥርተለውጧል።"</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"የድምፅ መልዕክት ቁጠር ለውጥ አልተሳካም።"\n"እባክዎ ይህ ችግር ከቀጠለ የድምጽ ተያያዥ ሞደምዎን ያግኙ።"</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"የአስተላላፊ ቁጥር ለውጥ አልተሳካም። "\n" እባክዎ ይህ ችግር ከቀጠለ የድምጽ ተያያዥ ሞደምዎን ያግኙ።"</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"የድምጽ ፖስታ ቁጥርን መለወጥ አልተቻለም፡፡ ይህ ችግር በዚህ ከቀጠለ የድምጸ ተያያዥ ሞደም አቅራቢህን "\n"አግኝ፡፡"</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"የማስተላለፊያ ቁጥርን መለወጥ አልተቻለም፡፡ ይህ ችግር በዚህ ከቀጠለ የድምጸ ተያያዥ ሞደም አቅራቢህን "\n"አግኝ፡፡"</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"አሁን ያሉትን ማስተላለፊያ ቁጥሮች ቅንጅቶችን ሰርስሮ ማውጣትና ማስቀመጥ አልተቻለም፡፡"\n"ወደ አዲስ አቅራቢ የሆነ ሆኖ ቀይር?"</string>
     <string name="no_change" msgid="3186040086622435212">"ምንም ለውጥ አልተደረገም።"</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"የድምፅ መልዕክት አገልግሎት ምረጥ"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"አውታረመረቦች ፈልግ"</string>
     <string name="network_query_error" msgid="6828516148953325006">"አውታረ መረቦች በመፈለግ ላይ ስህተት"</string>
     <string name="register_on_network" msgid="9055203954040805084">"በ<xliff:g id="NETWORK">%s</xliff:g> ላይ በመመዝገብ ላይ..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"የSIM ካርድዎወደዚህ አውታረመረብ ተያያዥ አይፈቅድም።"</string>
-    <string name="connect_later" msgid="500090982903469816">"በዚህ ሰዓት እዚህ አውታረ መረብ ላይ ለመያያዝ አልተቻለም። እባክዎ ትንሽ ቆይተው እንደገና ይሞክሩ።"</string>
+    <string name="not_allowed" msgid="5613353860205691579">"የSIM ካርድህ ወደዚህ አውታረመረብ  ግንኙነት አይፈቅድም።"</string>
+    <string name="connect_later" msgid="2308119155752343975">"በአሁን ጊዜ ወደዚህ አውታረ መረብ ማገናኘት አልተቻለም፡፡ በኋላ እንደገና ሞክር፡፡"</string>
     <string name="registration_done" msgid="495135664535876612">"በአውታረ መረብ ላይ የተመዘገበ።"</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"የአውታረመረብ ከዋኝ ምረጥ"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"የአውታረ መረብ ከዋኝ ምረጥ"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"የሚገኙ አውታረመረቦች በሙሉ ፈልግ"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"በራስ ሰር ምረጥ"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"በራስሰር ተመራጭ አውታረ መረብ ምረጥ"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"ራስ ሰር ምዝገባ...."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"በራስ ሰር ምረጥ"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"ተመራጭ አውታረ መረብን በራስ ሰር ምረጥ"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"ራስ ሰር ምዝገባ...."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"የአውታረ መረብ ሁነታ"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"የአውታረመረቡንመከወኛ ሁነታ ለውጥ"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"ተመራጭ  የአውታረ መረብ ሁነታ"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"ተመራጭ የአውታረመረብ ፡EvDo ሁነታ  ብቻ"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"ተመራጭ የአውታረመረብ ፡LTE / CDMA ሁነታ"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE / CDMA"</item>
     <item msgid="3273348576277144124">"EvDo ብቻ"</item>
     <item msgid="454610224530856274">"CDMA  ያለ EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA/EvDo ራስ"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA ራስ"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo በራስ"</item>
+    <item msgid="7148247646407324800">"GSM / WCDMA ራስ"</item>
     <item msgid="5189164180446264504">"WCDMA ብቻ"</item>
     <item msgid="5714714953966979187">"GSM ብቻ"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA ተመራጭ"</item>
+    <item msgid="8508331239546115206">"GSM / WCDMA ተመራጭ"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE / CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"ውሂብ ነቅቷል"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"ውሂብ በእንቅስቃሴ ላይ"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"በእንቅስቃሴ ላይ ሲሆን ወደ ውሂብ አገልግሎቶች ተያያዝ"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"በእንቅስቃሴ ላይ ሲሆን ወደ ውሂብ አገልግሎቶች ተያያዝ"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"የውሂብዎ ተያያዥነት ጠፍቷል ምክንያቱም የቤትዎን አውታረመረብ በእንቅስቃሴ ላይ አጥፋተው በመተዎ ነው።"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"የውሂብ ተያያዥነት የጠፋበት ምክንያት የቤትህን አውታረ መረብ እንቅስቃሴ ውሂብ በማጥፋትህ ነው።"</string>
     <string name="roaming_warning" msgid="7820963598559553967">"የእንቅስቃሴ ላይ ውሂብ ይፈቀድ? ላቅ ያለ የእንቅስቃሴ ላይ ክፍያ ሊያክሉ ይችላሉ!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS አማራጮች"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA አማራጮች"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"የውሂብ አጠቃቀም"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"የድምጽ ተያያዥ ሞደም ውሂብ ፖሊሲ"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"የውሂብ በአሁኑ ክፍለ ጊዜ ተጠቅሟል"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"የውሂብ አጠቃቀም ክፍለ ጊዜ"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"የውሂብ ደረጃ ፖሊሲ"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"የ<xliff:g id="USED_0">%1$d</xliff:g>٪ ዙር ሄዷል "\n"ቀጣይ ክፍለ ጊዜ በ<xliff:g id="USED_1">%2$d</xliff:g> ቀናት(<xliff:g id="USED_2">%3$s</xliff:g>) ይጀምራል"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"የውሂብ አጠቃቀም ወሰን ከበለጠየውሂብ ደረጃ ወደ <xliff:g id="USED">%1$d</xliff:g>Kb/s ቀንሷል።"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"ተጨማሪ መረጃ ስለ ድምጸ ተያያዥ ሞደምዎ ተንቀሳቃሽ ስልክ አውታረ መረብዎ ውሂብ አጠቃቀም ፖሊሲ"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"የተንቀሳቃሽ ስልክ SMS ስርጭት"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"የተንቀሳቃሽ ስልክ SMS ስርጭት"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"የተንቀሳቃሽ ስልክ SMS ስርጭት"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"የ SMS ህዋስ ማሰራጫ አልነቃም"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"ኮሪያኛ"</item>
     <item msgid="1933212028684529632">"ቻይናዊ"</item>
     <item msgid="1908428006803639064">"እብራይስጥ"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">" ቋንቋዎች"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">" የአካባቢው  አየር ሁኔታ"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"የቅጥር ዕድሎች"</string>
     <string name="eo_enable" msgid="8623559062015685813">"የቅጥር ዕድሎች ነቅተዋል"</string>
     <string name="eo_disable" msgid="3863812478090907609">"የቅጥር ዕድሎች አልነቃም"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"ሕክምና፣ጤናእናሆስፒታል"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"ሕክምና፣ጤና እና ሆስፒታል ነቅቷል"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"ሕክምና፣ጤናእናሆስፒታል አልነቃም"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"ሕክምና፣ጤና እና ሆስፒታል"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"ሕክምና፣ጤና እና ሆስፒታል ነቅተዋል"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"ሕክምና፣ ጤና እና ሆስፒታል አልነቃም"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"የቴክኖሎጂ ዜና"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"የቴክኖሎጂ ዜና ነቅቷል"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"የቴክኖሎጂ ዜና አልነቃም"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"WCDMA ብቻ"</item>
     <item msgid="8776934131146642662">"GSM ብቻ"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA ይመረጣል)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"የ2G  አውታረመረቦችን ብቻ ተጠቀም"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"ባትሪ ይቆጥባል"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"የሥርዓት ምርጫ"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"የCDMA በእንቅስቃሴ ላይሁነታ  ለውጥ"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"የCDMA በእንቅስቃሴ ላይ ሁኔታ ለውጥ"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"የሥርዓት ምርጫ"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"መነሻ ብቻ"</item>
     <item msgid="1205664026446156265">"ራስ ሰር"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">" CDMA  እንቅስቃሴሁነታ"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"የCDMA በእንቅስቃሴ ላይሁነታ  ለውጥ"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">" CDMA  እንቅስቃሴሁነታ"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"መነሻ አውታረመረቦች ብቻ"</item>
-    <item msgid="8174642753290624634">"ተባባሪ አውታረመረቦች"</item>
-    <item msgid="2241951431403168661">"ማንኛውም አውታረመረብ"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"የCDMA ደንበኝነት ምዝገባ"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA የአውታረ መረብ አማራጮች"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"ገና አልተተገበረም!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA የአውታረ መረብ አማራጮች"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"CDMA  ብቻ"</item>
     <item msgid="2683555124647197574">"EvDo ብቻ"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"የCDMA ምዝገባ"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"በRUIM/SIM እና NV መካከል ለውጥ"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"ምዝገባ"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"መሣሪያ አግብር"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"የውሂብ አግልግሎት አዋቅር"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"የቋሚ መደወያቁጥሮችአደራጅ"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"ለFDN ድረስ PIN ለውጥ"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"የስልክ ቁጥር ዝርዝር አደራጅ"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"የድምፅብሕትውነት"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"የድምፅ ብቸኝነት"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"የተሻሻለውን የብሕትውነት ሁነታ አስችል"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY ሁነታ"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"TTY ሁነታ አስችል"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY ሁነታ"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY  ሁነት አዘጋጅ"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"ራስዳግም ሞክር"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"ራስ ድጋሚ አስጀምር ሁነታ አስችል"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"ራስ ዳግም ሞክር"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"ራስ ድጋሚ አስጀምር ሁናቴ አስችል"</string>
     <string name="menu_add" msgid="1882023737425114762">"እውቅያዎች አክል"</string>
     <string name="menu_edit" msgid="7143003705504672374">"እውቅያ አርትዕ"</string>
     <string name="menu_delete" msgid="3977150783449642851">"እውቅያ ሰርዝ"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"PIN2 አስገባ"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"ፒን2 ተይብ"</string>
     <string name="name" msgid="7329028332786872378">"ስም"</string>
     <string name="number" msgid="7905950798349903858">"ቁጥር"</string>
     <string name="save" msgid="4094274636321939086">"አስቀምጥ"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"በቋሚ መደወያ ቁጥር ሰርዝ"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"በቋሚ መደወያ ቁጥር በመሰረዝ ላይ..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"ቋሚ መደወያ ቁጥር ተሰርዟል።"</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN አልነቃም፡ የተሳሳተ PIN አስገብተዋል።"</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN አልነቃም፡ ቁጥር ከ 20 አሀዝ መብለጥ አይችልም።"</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"የተሳሳተ ፒን ስላስገባህ FDN አልዘመነም፡፡"</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"ቁጥሩ ከ20 አሀዞች በላይ መብለጥ ስለማይችል FDN አልዘመነም፡፡"</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN አልዘመነም። ፒን2 ትክክል አልነበረም፣ ወይም የስልክ ቁጥሩ ተቀባይነት አላገኘም።"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"ከSIM ካርድ ላይ በማንበብ ላይ..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"በ SIM ካርድዎ ላይ ዕውቂያዎች የሉም።"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"ለማስገባት ዕውቂያዎች ምረጥ"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"ከሲም ካርድ ላይ ዕውቂያዎችን ለማስመጣት፣ የአይሮፕላን ሁኔታን እባክህ አጥፋ፡፡"</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"ከሲም ካርድ ላይ ዕውቂያዎችን ለማስመጣት፣ የአይሮፕላን ሁኔታን መጀመሪያ  አጥፋ፡፡"</string>
     <string name="enable_pin" msgid="5422767284133234860">"SIM PIN አንቃ/አቦዝን"</string>
     <string name="change_pin" msgid="9174186126330785343">"የSIM PIN ለውጥ"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"የድሮ PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"አዲስPIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"አዲስ PIN አረጋግጥ"</string>
-    <string name="badPin" msgid="4154316827946559447">"የተየቡት የድሮ PIN ትክክል አይደለም። እባክዎ እንደገና ይሞክሩ።"</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"ያስገቡዋቸው PINኦች  አይዛመዱም።እባክዎ እንደገና ይሞክሩ።"</string>
+    <string name="badPin" msgid="8955102849303984935">"የተየበከው የድሮ ፒን ትክክል አይደለም። እባክህ እንደገና ሞክር።"</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"ያስገባኸው ፒኖች አይዛመዱም። እንደገና ሞክር።"</string>
     <string name="invalidPin" msgid="5981171102258684792">"ከ4 እስከ 8 ቁጥሮች የያዘ PIN ተይብ"</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"የSIM PIN አቦዝን"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"SIM PIN አንቃ"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"እባክዎ ይጠብቁ…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"SIM PIN ነቅቷል"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM PIN ቦዝኗል"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"የተየቡት  PIN  የተሳሳተ ነበር።"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"SIM PIN በተሳካ ተለውጧል"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM PIN ነቅቷል"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM ፒን  ቦዝኗል"</string>
+    <string name="pin_failed" msgid="2298841192582192277">"የተየብከው PIN የተሳሳተ ነበር።"</string>
+    <string name="pin_changed" msgid="4365538014588501049">"SIM PIN በተሳካ ተለውጧል"</string>
     <string name="puk_requested" msgid="3898394204193202803">"የተሳሳተይለፍ ቃል፣SIM ተቆልፏል! PUK2 ይጠየቃል።"</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"የድሮ PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"አዲስPIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"አዲስ PIN አረጋግጥ"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"የተየቡት PUK2 ኮድ ትክክል አይደለም።እባክዎ እንደገና ይሞክሩ።"</string>
-    <string name="badPin2" msgid="515218795152422178">"የተየቡት የድሮ PIN2 ትክክል አይደለም። እባክዎ እንደገና ይሞክሩ።"</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"ያስገቡት PIN2 አይዛመድም። እባክዎ እንደገና ይሞክሩ።"</string>
+    <string name="badPuk2" msgid="4851734468010000418">"የተየብክው PUK2 ኮድ ትክክል አይደለም።እንደገና ሞክር።"</string>
+    <string name="badPin2" msgid="1041576234483629991">"የተየብከው የድሮ PIN2 ትክክል አይደለም።እባክህ እንደገና ሞክር።"</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"ያስገባኸው PIN2 አይዛመድም። እንደገና ሞክር።"</string>
     <string name="invalidPin2" msgid="8237110107480395938">"ከ4 እስከ 8 ቁጥሮች የሆኑPIN2 ተይብ።"</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"8 ቁጥሮች የሆኑ PUK2  ተይብ።"</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 በተሳካ ተለውጧል"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 በተሳካ ተለውጧል"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"የPUK2 ኮድ ተይብ"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"የተሳሳተ የይለፍ ቃል፣ እባክዎ  PIN2 ይለውጡ እና ድጋሚ ይሞክሩ!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"የተሳሳተይለፍ ቃል፣SIM ተቆልፏል! PUK2 ተጠይቋል።"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"የተሳሳተ የይለፍ ቃል፣ ፒን2 ለውጥ እና ድጋሚ ሞክር!"</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"የተሳሳተ ይለፍ ቃል፣ SIM ተቆልፏል! PUK2 ይጠየቃል።"</string>
     <string name="doneButton" msgid="2859593360997984240">"ተከናውኗል"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"የስብሰባ ጥሪ<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"ወደ ጥሪ ተመለስ"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"ያለSIM ካርድ ቀጥል"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"ምንም SIM ካርድ አልተገኘም።እባክዎ ወደ ስልኩ SIM ካርድ ያስገቡ።"</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"አጥፋ"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"ክፈት"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"PIN በማረጋገጥ ላይ…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"የድምፅ መልዕክት ቁጥር"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"በመደወል ላይ"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"እንደገና በመሞከር ላይ"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"የስብሰባ ጥሪ"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"ገቢ ጥሪ"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"CDMA ጥሪ በመጠበቅ ላይ"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"ጥሪ አብቅቷል"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"ያዝናቆይ"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"በመዝጋት ላይ"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"ያመለጡ ጥሪዎች"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ያመለጡ ጥሪዎች"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"ከ<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> ያመለጠ ጥሪ"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"የአሁኑ ጥሪ (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"እየተካሄደ ያለ ጥሪ"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"ያዝናቆይ"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"ገቢ ጥሪ"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"አዲስ የድምፅ መልዕክት"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"የማይታወቅ የድምፅ መልዕክት ቁጥር"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"ምንም አገልግሎት የለም"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"የተመረጠ አውታረመረብ(<xliff:g id="OPERATOR_NAME">%s</xliff:g>) የለም"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"ዝጋ"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"መልሰህ ደውል"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"መልዕክት"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"ለመደወል፣ መጀመሪያየአውሮፕላኑን ሁነታ አጥፋ።"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"በአውታረ መረቡ ላይ አልተመዘገበም።"</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"የተንቀሳቃሽ አደራጅ የለም።"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"ጥሪ አልተላከም፣ ትክክለኛ ቁጥር አልገባም።"</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"ጥሪ አልተላከም።"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"የMMI sequence…"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"የኮድቅደም ተከተልባህሪይ ማስጀመር..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"የማይደገፍ አገልግሎት።"</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"ጥሪዎችን ለመቀያየር አልተቻለም።"</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"ጥሪዎችን ለመለየት አልተቻለም።"</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"የአደጋ ጊዜ ጥሪ"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"ሬዲዮ ክፈት"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"ከአገልግሎት መስጫ ክልል ውጪ፣ ድጋሚ በመሞከር ላይ..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"ጥሪ አልተላከም፣<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> የአደጋ ጊዜ ቁጥር አይደለም!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"ጥሪ አልተላከም፣እባክዎ የአደጋ ጊዜ ቁጥር ይደውሉ።"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"ጥሪ አልተላከም፣ <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> የአደጋ  ቁጥር አይደለም!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"ጥሪ አልተላከም፣ እባክህ የአደጋ ጊዜ ቁጥር ደውል።"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ለመደወል የሰሌዳ ቁልፍ ተጠቀም"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"የድምፅ ቁልፍ ሰሌዳን ንካ"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"ያዝ"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"አትያዝ"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"መጨረሻ"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"የመደወያ ሰሌዳ"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"ደብቅ"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"ድምጽ ማጉያ"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"ድምፀ-ከል አድርግ"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"ብሉቱዝ"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"ጥሪ ያክሉ"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ጥሪዎችን አዋህድ"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"ማገላበጥ"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI ፅሁፍ"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"የDTMF ድምፅ"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"የDTMF ድምጾች"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"የDTMF  ድምፆች ርዝመት አዘጋጅ"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"መደበኛ"</item>
     <item msgid="2883365539347850535">"ረጅም"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"የአውታረ መረብ መልዕክት"</string>
+    <string name="network_message" msgid="4483886461245213802">"የአውታረ መረብ መልዕክት"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"ስልክዎን ያግብሩ"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"የስልክዎን አገለግሎት ለማግበር ልዩ ጥሪ ያስፈልጋል።"\n\n"  \"አግብር\" ከተጫኑ በኋላ ስልክዎን ለማግበር የቀረቡትን መመሪያዎች ያዳምጡ።"</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"በስልክዎ ልዩ ጥሪ ለማድረግ ስልክዎን በድምጽ ተያያዥ ሞደም ተንቀሳቃሽ ስልክ አውታረ መረብ ላይ የሚያገብረውን  የስልክዎን \"አግብር\" ይንኩ፣ ጥሪዎችን ማድረግ እና ወደ ተንቀሳቃሽ ስልክ ውሂብ አውታረመረብ መገናኘት ይችላሉ።"</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"አግብር ይዝለል?"</string>
-    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"ማግበር ካዘለሉ፣ ጥሪ ማድረግ ወይም ተንቀሳቃሽ ስልክ ውሂብ አውታረ መረብ(በWi-Fi አውታረ መረቦች ማያያዝ ቢችሉም እንኳ) ማያያዝ አይችሉም። ስልክዎን እስኪያገብሩ ድረስ፣ ባበሩት ቁጥር እንዲያገብሩት ይጠየቃሉ።"</string>
+    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"ማግበር ካዘለሉ፣ ጥሪ ማድረግ ወይም ተንቀሳቃሽ ስልክ ውሂብ አውታረ መረብ(በWi-Fi አውታረ መረቦች ማያያዝ ቢችሉም እንኳን ) ማያያዝ አይችሉም። ስልክዎን እስኪያገብሩ ድረስ፣ ባበሩት ቁጥር እንዲያገብሩት ይጠየቃሉ።"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"ዝለል"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"አግብር"</string>
     <string name="ota_activate" msgid="1368528132525626264">"አግብር"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"ስልክ አግብርዋል!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"ስልክ አግብረሃል!"</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"ከአግብር ጋር ያለ ችግር"</string>
     <string name="ota_listen" msgid="162923839877584937">"አግብር መጠናቀቁን እስኪሰሙ የተነገሩትን መመሪያዎች ይከተሉ።"</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"ቁልፍ ሰሌዳ"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"ድምጽ ማጉያ"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"እባክዎ ስልክዎ ፍርግም የተደረገእስኪሆን ድረስ ይቆዩ።"</string>
-    <string name="ota_failure" msgid="8600027551822478181">"መፈርገም አልተሳካም"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"ስልክህ ፍርግም የተደረገ እስኪሆን ድረስ ቆይ።"</string>
+    <string name="ota_failure" msgid="4311299546379674378">"መፈርገም አልተሳካም"</string>
     <string name="ota_successful" msgid="1880780692887077407">"አሁን ስልክዎ አግብሯል።አገልግሎቱ ለመጀመር እስከ 15 ደቂቃዎች ሊፈጅ ይችላል።"</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"ስልክዎ አላገበረም።"\n" ጥሩ ሽፋን ያለበት አካባቢ ማግኘት ያስፈልግዎታል(መስኮት፣ ወይም ውጪ አካባቢ)።"\n\n"ለበለጠ አማራጮች የደንበኞች አገልግሎት ይደውሉ ወይም እንደገና ይሞክሩ።"</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"ስልክህ አላገበረም።"\n" ጥሩ ሽፋን ያለበት አካባቢ ማግኘት ያስፈልግሃል (መስኮት፣ ወይም ውጪ አካባቢ)።ለበለጠ አማራጮች የደንበኞች አገልግሎት ደውል ወይም "\n\n"እንደገና ሞክር።"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ከልክ ያለፈ የSPC  መታወክ"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"ተመለስ"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"በድጋሚ ሞክር"</string>
     <string name="ota_next" msgid="3904945374358235910">"በመቀጠል"</string>
-    <string name="ota_back" msgid="2190038043403850052">"ተመለስ"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"የአደጋጊዜ ተዘዋዋሪ ጥሪ ሁነታ ገብቷል"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"የአደጋጊዜ ተዘዋዋሪጥሪ ሁነታ"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"ለ <xliff:g id="COUNT">%s</xliff:g> ደቂቃ ምንም የውሂብ ተያያዥነት የለም"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"ለ<xliff:g id="COUNT">%s</xliff:g> ደቂቃ ስልኩ የአደጋ ጊዜ ተዘዋዋሪ ጥሪ ሁነታ ላይ ይሆናል። በዚህ ሁነታ ላይ ሲሆን ምንም ትግበራዎች በውሂብ ተያየዥነት መጠቀም አይቻልም።አሁን መውጣት ፈለጉ?"</item>
-    <item quantity="other" msgid="3231879566243957821">"ለ<xliff:g id="COUNT">%s</xliff:g>ደቂቃ ስልኩ የአደጋ ጊዜ ተዘዋዋሪ ጥሪ ሁነታ ላይ ይሆናል። በዚህ ሁነታ ላይ ሲሆን ምንም ትግበራዎች በውሂብ ተያየዥ መጠቀም አይቻልም።አሁን መውጣት ፈለጉ?"</item>
+    <item quantity="one" msgid="8060210887681426682">"ለ<xliff:g id="COUNT">%s</xliff:g> ደቂቃ ስልኩ በየአደጋ ጥሪ ሁናቴ ውስጥ ይሆናል፡፡ በዚህ ሁናቴ ውስጥ ምንም መተግበሪያዎች የውሂብ ግንኙነት በመጠቀም መጠቀም አይቻልም፡፡ አሁን መውጣት ትፈልጋለህ?"</item>
+    <item quantity="other" msgid="8617116564023933114">"ለ<xliff:g id="COUNT">%s</xliff:g>ደቂቃዎች ስልኩ በየአደጋ ጥሪ ሁናቴ ውስጥ ይሆናል፡፡ በዚህ ሁናቴ ውስጥ ምንም መተግበሪያዎች የውሂብ ግንኙነት በመጠቀም መጠቀም አይቻልም፡፡ አሁን መውጣት ትፈልጋለህ?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"የተመረጠው ርምጃ በአደጋ ተዘዋዋሪ ጥሪ ሁነታ ጊዜ የለም።ስልኩ በዚህ ሁነታ ለ<xliff:g id="COUNT">%s</xliff:g> ደቂቃ ይሆናል።አሁን መውጣት ፈለጉ?"</item>
-    <item quantity="other" msgid="3489076611710869904">"የተመረጠው ርምጃ በአደጋ  ተዘዋዋሪ ጥሪ ሁነታ ጊዜ የለም።ስልኩ በዚህ ሁነታ ለ<xliff:g id="COUNT">%s</xliff:g>ደቂቃዎች ይሆናል።አሁን መውጣት ፈለጉ?"</item>
+    <item quantity="one" msgid="2585506997024726599">"የአደጋ ጥሪ ሁናቴ በሚሆንበት ጊዜ የተመረጠው እርምጃ አይገኝም፡፡ ስልኩ ለ<xliff:g id="COUNT">%s</xliff:g> ደቂቃ በዚህ ሁናቴ ውስጥ ይሆናል፡፡ አሁን መውጣት ትፈልጋለህ?"</item>
+    <item quantity="other" msgid="6115622137771382224">"የአደጋ ጥሪ ሁናቴ በሚሆንበት ጊዜ የተመረጠው እርምጃ አይገኝም፡፡ ስልኩ ለ<xliff:g id="COUNT">%s</xliff:g> ደቂቃዎች በዚህ ሁናቴ ውስጥ ይሆናል፡፡ አሁን መውጣት ትፈልጋለህ?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"የተመረጠው ርምጃ በአደጋ ጥሪ ጊዜ ለክንውን ሊገኝ አይችልም።"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"የአደጋ ጊዜ ተዘዋዋሪ ጥሪ ሁነታ ወጥቷል"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"የተመረጠው እርምጃ በአደጋ ጥሪ ጊዜ ለክንውን ሊገኝ አይችልም።"</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"የአደጋ ጊዜ ተዘዋዋሪ ጥሪ ሁኔታ ወጥቷል"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"አዎ"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"አይ"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"እንቢበል"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"የድምፅመልዕክት ቅንብሮች"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;አልተዘጋጀም&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"የድምፅመልዕክት አገልግሎት"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"የ<xliff:g id="PROVIDER_NAME">%s</xliff:g> ቅንብሮች"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"አገልግሎት"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"አዋቅር"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;አልተዘጋጀም &gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"ሌላ ጥሪ ቅንብሮች"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"ደውል"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"በ^1"\n<b>"^2"</b>"በኩል መደወል"</string>
-    <string name="slide_to_answer" msgid="255903188611244476">"ለመመለስ ወደ ቀኝ ጎትት"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"መጥሪያን ፀጥ ለማድረግ ወደ ግራ ጎትት"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"ለማውረድ ወደ ግራ ጎትት"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"ለመመለስ ወደ ቀኝ ጎትት እና "\n" ገባሪ ጥሪ ጨርስ"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"ለመመለስ ወደ ቀኝ ጎትት እና "\n" ገባሪ ጥሪ ጨርስ"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"ለመመለስ ወደ ቀኝ ጎትት እና"\n" በቆይ ላይ ያለ ጥሪ ጨርስ"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"መልስ"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"ውድቅ"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"በ<xliff:g id="PROVIDER_NAME">%s</xliff:g> በኩል በመደወል ላይ"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"የዕውቂያ ፎቶ"</string>
     <string name="goPrivate" msgid="865837794424530980">"ወደ ብሕታዊነት ሂድ"</string>
     <string name="selectContact" msgid="781975788478987237">"ዕውቂያ ምረጥ"</string>
     <string name="sip_settings" msgid="6699045718560859691">"የበይነ መረብ ጥሪ ቅንብሮች"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"የበይነ መረብ ጥሪ (SIP) መለያ"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"መለያዎች"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"የበይነ መረብ ጥሪ (SIP) መለያዎች እና ሁኔታዎችን አደራጅ"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"ገቢ ጥሪዎች ተቀበል"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"የባትሪ ህይወት ይቀንሳል"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"የጥሪ አማራጮችን አዋቅር"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"የበየነ መረብ ጥሪ ተጠቀም"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"የበይነመረብ ጥሪ(Wi-Fi ብቻ) ተጠቀም"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"ለሁሉም ጥሪዎች የውሂብ አውታረመረብ ሲኖር"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"ለበይነ መረብ ጥሪዎች ብቻ"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"ለእያንዳንዱ ጥሪ ጠይቅ"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"ለሁሉም ጥሪዎች"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"ራስ-ምዝገባ"</string>
-    <string name="call_priority" msgid="8374917577270504387">"በSIP በኩል ወጪ ጥሪ"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"ጥሪ አድርግ"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"የበየነ መረብ ጥሪ መለያ ተጠቀም፡"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"ሁልጊዜ የበይነመረብ ጥሪዎችን ለማድረግ ተጠቀም"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"በበይነ መረብ ቅንብሮች ስር የተለየ መለያ  ለመጠቀም በመምረጥ የትኛው በየነመረብ ጥሪ መለያ የጥሪ ቅንብሮችን ለመለወጥ በነባሪ ጥሪ ሲደረግ  መጠቀም ይችላሉ፣"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"የትኛውን የበየነ መረብ የመደወያ መለያ ለመጠቀም በነባሪ ከስልኩ&gt; ቅንብሮች  &gt; የበየነ መረብ ቅንብሮች  &gt; የመለያዎች ማሳያ መለወጥ ትችላለህ፡፡"</string>
     <string name="pstn_phone" msgid="8782554491484326429">"የተንቀሳቃሽ ስልክ ጥሪ"</string>
     <string name="internet_phone" msgid="1147922660195095810">"የበይነመረብ  ጥሪ"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"ምንም የበይነ መረብ ጥሪ መለያ"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"በዚህ ስልክ ላይ ምንም የበይነመረብ መለያዎች የሉም። አሁን አንድ ይታከል?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"በዚህ ስልክ ላይ ምንም የበየነ መረብ መደወያ መለያዎች የሉም፡፡ አሁን አንድ ማከል ትፈልጋለህ?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"አክል"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"መለያ አክል"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"መለያ አስወግድ"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP መለያዎች"</string>
-    <string name="saving_account" msgid="7468818916695729968">"መለያውን በማስቀመጥ ላይ.."</string>
-    <string name="removing_account" msgid="5569334415898924904">"መለያውን በማስወገድ ላይ..."</string>
+    <string name="saving_account" msgid="52903398217017954">"መለያውን በማስቀመጥ ላይ.."</string>
+    <string name="removing_account" msgid="7183999896088628100">"መለያውን በማስወገድ ላይ..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"አስቀምጥ"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"አስወግድ"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"መገለጫውን ዝጋ"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"ይሁን"</string>
     <string name="close_profile" msgid="6886968271423155284">"ዝጋ"</string>
-    <string name="primary_account" msgid="2229538308291934245">"ቀዳሚ"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"ይህን የኔን ቀዳሚ መለያ አድርግ"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"ለወደ ውጪ ጥሪዎች ይጠቅማል"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"የላቁ ቅንብሮች"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"ቀዳሚ መለያ፡<xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"ሁኔታን በመመልከት ላይ..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"በመመዝገብ ላይ...."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"አሁንም በመሞከር ላይ..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"ጥሪዎች አይቀበልም"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"የበይነመረብ ተያያዥነት ስለሌለ የመለያ ምዝገባ ቆሟል"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"ምንም የWi-Fi  ተያያዥ ስለሌለ የመለያ ምዝገባ ቆሟል"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"የመለያ ምዝገባ ስኬታማ አልነበረም"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"ጥሪዎች በመቀበል ላይ"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"በመመዝገብ ላይ...."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"አሁንም በመሞከር ላይ..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"ጥሪዎች አይቀበልም"</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"የበይነመረብ ግኑኝነት ስለሌለ የመለያ ምዝገባ ቆሟል፡፡"</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"ምንም የWi-Fi ተያያዥ ስለሌለ የመለያ ምዝገባ ቆሟል"</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"የመለያ ምዝገባ ስኬታማ አልነበረም"</string>
+    <string name="registration_status_done" msgid="884630717456439280">"ጥሪዎች በመቀበል ላይ"</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"የመለያ ምዝገባ ስኬታማ አልነበረም፤ (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>)፣ ኋላ ላይ እንደገና ይሞከራል"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"የመለያ ምዝገባ ስኬታማ አልነበረም፤ የተሳሳተ ተጠቃሚ ስም ወይም ይለፍ ቃል"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"የመለያ ምዝገባ ስኬታማ አልነበረም፤ የአገልጋዩን ስም ትክክለኛነት አረጋግጥ"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"ይህ መለያ በአሁኑ ጊዜ በ<xliff:g id="ACCOUNT_OWNER">%s</xliff:g> ትግበራ ጥቅም ላይ ነው።"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"የመለያ ምዝገባ ስኬታማ አልነበረም፤ የተሳሳተ ተጠቃሚ ስም ወይም ይለፍ ቃል፡፡"</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"የመለያ ምዝገባ ስኬታማ አልነበረም፤ የአገልጋዩን ስም ትክክለኛነት አረጋግጥ፡፡"</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"ይህ መለያ በአሁኑ ጊዜ በ <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>ትግበራ ጥቅም ላይ ነው።"</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIP መለያ ዝርዝሮች"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP መለያ ዝርዝሮች"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"አገልጋይ"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"ወደብ ቁጥር"</string>
     <string name="transport_title" msgid="8253139511847746640">"የማጓጓዣ አይነት"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"keep-alive ላክ"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"የ SIP keep-alive መልዕክቶች ላክ"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"ራስ-ምዝገባ"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"መገለጫውን በራስ ሰር መዝግብ"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"እንደ ቀዳሚ መለያ አዘጋጅ"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"ለወደ ውጪ ጥሪዎች ይጠቅማል"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"አማራጭ ቅንብሮች"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;አማራጭ&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ ሁሉን ለማሳየት ንካ"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"ሁሉንም ለመደበቅ ▽ ንካ"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ይጠበቃል፣ ባዶ ቦታ መተው አልተቻለም።"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"የወደብ ቁጥር በ1000 እና 65534 ውስጥ መሆን አለበት።"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>ይጠይቃል፣ ባዶ ቦታ መተው አልተቻለም።"</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"የወደብ ቁጥር በ1000 እና 65534 ውስጥ መሆን አለበት።"</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"ምንም በይነ መረብ ተያያዥ የለም"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"ምንምWi-Fi ትይይዝ የለም"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"የበይነ መረብ ጥሪ ለማድረግ፣ የበይነ መረብ መጀመሪያ ተያያዥነት ይመልከቱ"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"ለአውታረ መረብ(የገመድ አልባ &amp; አውታረ መረብ ቅንብሮችን ይጠቀሙ) ጥሪዎች ወደ Wi-Fi አውታረ መረብ መያያዝ አለብዎ።"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"የበይነ መረብ ጥሪ ለማድረግ፣ የበይነ መረብ መጀመሪያ ተያያዥነት ተመልከት"</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"ለአውታረ መረብ(የገመድ አልባ &amp; አውታረ መረብ ቅንጅቶችን ተጠቀም) ጥሪዎች ወደ Wi-Fi አውታረ መረብ ማገናኘት አለብሀ።"</string>
     <string name="no_voip" msgid="8901474054537199865">"የበይነ መረብ ጥሪ አይደገፍም"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"ራስ ሰር"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"ሁልጊዜ ላክ"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"ወዲያው መልሼ እደውላለሁ።"</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"ኋላ እደውላለሁ።"</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"አሁን ማውራት አልችልም። ትንሽ ቆይተው ይደውሉ?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"ብጁ መልዕክት..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"ብጁ መልዕክት"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"ፈጣን ምላሾች"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"ፈጣን ምላሾች አርትዕ"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"ኮከብ"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"ዜሮ"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"ፓውንድ"</string>
-    <string name="description_search_button" msgid="239929880630534731">"ፈልግ"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ደውል"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"የኋሊት ደምሳሽ"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"የስልክ ድምፅ ማጉያ ነቅቷል።"</string>
@@ -715,9 +615,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"አትቀበል"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"ንዘር"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"ንዘር"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"የደውል ቅላጼ"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"ዘወትር"</item>
-    <item msgid="1595097872875714252">"ፀጥታ ሲሆን ብቻ"</item>
-    <item msgid="1458182414036878616">"በፍፁም"</item>
+    <item msgid="1595097872875714252">"በፀጥታ ሲሆን ብቻ"</item>
+    <item msgid="1458182414036878616">"በፍጹም"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"የስልክ ጥሪ ድምፅ"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"በሚደወልበት ጊዜ ንዘር"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"የመደወያ ሰሌዳ ድምፆች ዳስ"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"የደውል ቅላጼ"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index aae36bc63..e96e27d41 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"رقم خاص"</string>
     <string name="payphone" msgid="1931775086311769314">"هاتف الدفع"</string>
     <string name="onHold" msgid="9035493194749959955">"معلقة"</string>
-    <string name="ongoing" msgid="8300874342848721367">"الاتصال الحالي"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"الخط مشغول"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"الشبكة مشغولة"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"ليس هناك استجابة، انقضت المهلة المحددة"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"لا يمكن الوصول إلى الخادم"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"الرقم لا يمكن الوصول إليه"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"اسم المستخدم غير صحيح أو كلمة المرور غير صحيحة"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"تم الاتصال من خارج الشبكة"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"تم الاتصال من خارج الشبكة"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"خطأ بالخادم: إعادة المحاولة لاحقًا."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"لا إشارة"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"تم تعدي حد ACM"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"تم إيقاف اللاسلكي"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"لا توجد بطاقة SIM أو يوجد خطأ في بطاقة SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"لا تتوفر بطاقة SIM أو حدث خطأ في البطاقة"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"خارج نطاق الخدمة"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"يتم تقييد المكالمات الصادرة بواسطة FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"لا يمكنك إجراء مكالمات صادرة أثناء تشغيل حظر المكالمات."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"لا يمكنك إجراء مكالمات صادرة أثناء تشغيل حظر المكالمات."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"تم تقييد كل المكالمات بواسطة التحكم في الدخول."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"تم تقييد مكالمات الطوارئ بواسطة التحكم في الدخول."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"تم تقييد المكالمات العادية بواسطة التحكم في الدخول."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: تم تأمين الهاتف حتى دورة الطاقة."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: تم قطع الاتصال."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: تم اعتراض الاتصال."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: إعادة طلب."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: رفض خيار الخدمة."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: إعادة محاولة الطلب."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: لم يتم الدخول بنجاح."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: له الأولوية."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"لا يمكن إجراء سوى مكالمات الطوارئ فقط."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"رقم غير صالح"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"الرقم غير صالح"</string>
     <string name="confCall" msgid="1904840547188336828">"مكالمة جماعية"</string>
     <string name="call_lost" msgid="317670617901479594">"تم فقد الاتصال."</string>
-    <string name="retry" msgid="8462986804300767852">"إعادة المحاولة"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"تم فقد الاتصال"</string>
     <string name="ok" msgid="3811371167865772377">"موافق"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"بدأ رمز MMI"</string>
     <string name="ussdRunning" msgid="485588686340541690">"جارٍ تشغيل رمز USSD..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"سماعة رأس سلكية"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"بلوتوث"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"هل تريد إرسال النغمات التالية؟"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"إرسال النغمات"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"إرسال النغمات"\n</string>
     <string name="send_button" msgid="4106860097497818751">"إرسال"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"نعم"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"لا"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"استبدال حرف البدل بـ"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"استبدال حرف البدل بـ"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"رقم البريد الصوتي مفقود"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"لم يتم تخزين رقم بريد صوتي على بطاقة SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"إضافة رقم"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"جارٍ التحميل…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"اكتب رقم التعريف الشخصي لإلغاء تأمين بطاقة SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"تم إلغاء تأمين بطاقة SIM"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"كود رقم تعريف شخصي جديد لبطاقة SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"اكتب رقم التعريف الشخصي الجديد لبطاقة SIM مرة أخرى للتأكيد"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"أرقام التعريف الشخصي التي كتبتها غير مطابقة. الرجاء المحاولة مرة أخرى."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"اكتب الرمز PUK لإلغاء تأمين بطاقة SIM"</string>
-    <string name="badPuk" msgid="3213017898690275965">"رمز PUK غير صحيح!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"متابعة"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"تم إلغاء حظر بطاقة SIM. جارٍ إلغاء تأمين الهاتف..."</string>
     <string name="label_ndp" msgid="780479633159517250">"رقم التعريف الشخصي لإلغاء تأمين شبكة SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"إلغاء تأمين"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"جارٍ طلب إلغاء تأمين الشبكة..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"لم ينجح طلب إلغاء تأمين الشبكة."</string>
     <string name="unlock_success" msgid="6770085622238180152">"نجح إلغاء تأمين الشبكة."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"إعدادات اتصال نظام GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"إعدادات اتصال CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"الدخول إلى أسماء النقاط"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"إعدادات اتصال CDMA الإضافية فقط"</string>
     <string name="labelNwService" msgid="4699970172021870983">"إعدادات خدمة الشبكة"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"معرف المتصل"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"جارٍ تحميل الإعدادات…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"الرقم مخفي في المكالمات الصادرة"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"الرقم المعروض في المكالمات الصادرة"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"استخدام إعدادات المشغل الافتراضية لعرض رقمي في المكالمات الصادرة"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"الرقم عندما يكون مشغولاً"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"إعادة التوجيه إلى <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"معطّل"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"لا يتيح مشغل شبكة الجوال تعطيل إعادة توجيه الاتصال عندما يكون هاتفك مشغولاً."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"لا يتيح مشغل شبكة الجوال تعطيل إعادة توجيه الاتصال عندما يكون هاتفك مشغولاً."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"إعادة التوجيه عند عدم الرد"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"الرقم عندما لا يتم الرد"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"إعادة التوجيه إلى <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"معطّل"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"لا يتيح مشغل شبكة الجوال تعطيل إعادة توجيه الاتصال عند عدم رد هاتفك."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"لا يتيح مشغل شبكة الجوال تعطيل إعادة توجيه الاتصال عند عدم رد هاتفك."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"إعادة التوجيه عندما لا يمكن الوصول"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"الرقم عندما لا يمكن الوصول"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"إعادة التوجيه إلى <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"معطّل"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"لا يتيح مشغل شبكة الجوال تعطيل إعادة توجيه الاتصال عند عدم التمكن من الوصول إلى هاتفك."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"لا يتيح مشغل شبكة الجوال تعطيل إعادة توجيه الاتصال عند عدم التمكن من الوصول إلى هاتفك."</string>
     <string name="updating_title" msgid="6146755386174019046">"إعدادات الاتصال"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"خطأ في إعدادات الاتصال"</string>
     <string name="reading_settings" msgid="1920291699287055284">"جارٍ قراءة الإعدادات..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"جارٍ إعادة الإعدادات..."</string>
     <string name="response_error" msgid="6674110501330139405">"رد غير متوقع من الشبكة."</string>
     <string name="exception_error" msgid="7027667130619518211">"خطأ في الشبكة أو في بطاقة SIM"</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"غير مسموح سوى بعمليات التشغيل على أرقام الاتصال الثابت فقط."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"الرجاء تشغيل اللاسلكي قبل عرض هذه الإعدادات."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"تم تشغيل إعداد أرقام الاتصال الثابتة بالتطبيق المثبت على هاتفك. ونتيجة لذلك، لن تعمل بعض الميزات المرتبطة بالمكالمات."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"شغّل اللاسلكي قبل عرض هذه الإعدادات."</string>
     <string name="close_dialog" msgid="2365884406356986917">"موافق"</string>
     <string name="enable" msgid="1059008390636773574">"تمكين"</string>
     <string name="disable" msgid="7274240979164762320">"تعطيل"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"إخفاء الرقم"</item>
     <item msgid="1108394741608734023">"إظهار الرقم"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"حفظ رقم البريد الصوتي"</string>
     <string name="vm_changed" msgid="380744030726254139">"تم تغيير رقم البريد الصوتي."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"تم تغيير رقم البريد الصوتي بنجاح."\n"الرجاء الاتصال بمشغل شبكة الجوال إذا استمرت المشكلة."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"لم ينجح تغيير رقم إعادة التوجيه."\n"الرجاء الاتصال بمشغل شبكة الجوال إذا استمرت المشكلة."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"تعذر تغيير رقم البريد الصوتي."\n"يمكنك الاتصال بمشغل شبكة الجوال إذا استمرت هذه المشكلة في الظهور."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"تعذر تغيير رقم إعادة التوجيه."\n"اتصل بمشغل شبكة الجوّال إذا استمرت هذه المشكلة في الظهور."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"تتعذر عملية استعادة إعدادات إعادة توجيه الأرقام الحالية وحفظها."\n"هل تريد الانتقال إلى الموزع الجديد على أي حال؟"</string>
     <string name="no_change" msgid="3186040086622435212">"لم يتم إجراء أية تغييرات."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"اختيار خدمة البريد الصوتي"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"بحث في الشبكات"</string>
     <string name="network_query_error" msgid="6828516148953325006">"حدث خطأ أثناء البحث عن شبكات."</string>
     <string name="register_on_network" msgid="9055203954040805084">"جارٍ التسجيل على <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"لا تسمح بطاقة SIM بالاتصال بهذه الشبكة."</string>
-    <string name="connect_later" msgid="500090982903469816">"يتعذر الاتصال بهذه الشبكة حاليًا. الرجاء المحاولة مرة أخرى لاحقًا."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"لا تسمح بطاقة SIM بالاتصال بهذه الشبكة."</string>
+    <string name="connect_later" msgid="2308119155752343975">"يتعذر الاتصال بهذه الشبكة في الوقت الحالي. حاول مرة أخرى لاحقًا."</string>
     <string name="registration_done" msgid="495135664535876612">"مسجل على الشبكة."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"تحديد مشغل شبكة"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"اختر مشغل شبكة جوال"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"البحث عن كل الشبكات المتاحة"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"تحديد تلقائي"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"تحديد الشبكة المفضلة تلقائيًا"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"التسجيل التلقائي..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"اختيار تلقائي"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"اختيار الشبكة المفضلة تلقائيًا"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"التسجيل التلقائي..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"وضع الشبكة"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"تغيير وضع تشغيل الشبكة"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"وضع الشبكة المفضل"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"وضع الشبكة المفضل: EvDo فقط"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"وضع الشبكة المفضل: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"EvDo فقط"</item>
     <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo تلقائي"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA تلقائي"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo تلقائي"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA تلقائي"</item>
     <item msgid="5189164180446264504">"WCDMA فقط"</item>
     <item msgid="5714714953966979187">"نظام GSM فقط"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA المفضلة"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA المفضلة"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"تم تمكين البيانات"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"تجوال البيانات"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"اتصال بخدمات البيانات عند التجوال"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"اتصال بخدمات البيانات عند التجوال"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"لقد فقدت اتصال البيانات نظرًا لأنك أوقفت تشغيل تجوال البيانات بشبكتك الرئيسية."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"لقد فقدت اتصال البيانات نظرًا لأنك أوقفت تشغيل تجوال البيانات بشبكتك الرئيسية."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"هل تريد السماح بتجوال البيانات؟ قد يكلفك ذلك رسوم تجوال مرتفعة!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"خيارات نظام GSM/النظام العالمي لاتصالات الجوال عن بعد (UMTS)"</string>
     <string name="cdma_options" msgid="4016822858172249884">"خيارات CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"استخدام البيانات"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"سياسة بيانات مشغل شبكة الجوال"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"البيانات المستخدمة في المدة الحالية"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"مدة استخدام البيانات"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"سياسية معدل البيانات"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"انقضت نسبة <xliff:g id="USED_0">%1$d</xliff:g>٪ من الدورة"\n"تبدأ الفترة التالية خلال <xliff:g id="USED_1">%2$d</xliff:g> يوم (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"تخفيض معدل البيانات إلى <xliff:g id="USED">%1$d</xliff:g> كيلوبايت/ثانية إذا تم تعدي حد البيانات"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"مزيد من المعلومات حول سياسة استخدام بيانات شبكة جوال مشغل شبكة الجوال"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"الرسائل القصيرة SMS لبث الخلية"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"الرسائل القصيرة SMS لبث الخلية"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"الرسائل القصيرة SMS لبث الخلية"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"تم تمكين الرسائل القصيرة SMS لبث الخلية"</string>
@@ -305,9 +280,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"فرص وظائف"</string>
     <string name="eo_enable" msgid="8623559062015685813">"تم تمكين فرص الوظائف"</string>
     <string name="eo_disable" msgid="3863812478090907609">"تم تعطيل فرص الوظائف"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"طبي، الصحة والمستشفى"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"تم تمكين الطبي والصحة والمستشفى"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"تم تعطيل الطبي والصحة والمستشفى"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"طبي والصحة والمستشفى"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"تم تمكين الطبي والصحة والمستشفى"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"تم تعطيل الطبي والصحة والمستشفى"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"أخبار التكنولوجيا"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"تم تمكين أخبار التكنولوجيا"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"تم تعطيل أخبار التكنولوجيا"</string>
@@ -322,35 +297,17 @@
     <item msgid="8912042051809329533">"WCDMA فقط"</item>
     <item msgid="8776934131146642662">"نظام GSM فقط"</item>
     <item msgid="4684679567848300935">"GSM/WCDA ‏(WCDMA المفضل)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"استخدام شبكات 2G فقط"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"لحفظ البطارية"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"تحديد النظام"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"تغيير وضع التجوال عبر CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"تغيير وضع التجوال عبر CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"تحديد النظام"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"الرئيسية فقط"</item>
     <item msgid="1205664026446156265">"تلقائي"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"وضع التجوال عبر CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"تغيير وضع التجوال عبر CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"وضع التجوال CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"الشبكات المنزلية فقط"</item>
-    <item msgid="8174642753290624634">"الشبكات التابعة"</item>
-    <item msgid="2241951431403168661">"أي شبكة"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"اشتراك CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"تفضيلات شبكة CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"لم ينفذ بعد!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"تفضيلات شبكة CDMA"</string>
@@ -359,21 +316,11 @@
     <item msgid="6143696847467859795">"CDMA فقط"</item>
     <item msgid="2683555124647197574">"EvDo فقط"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"اشتراك CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"تغيير بين RUIM/SIM وNV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"الاشتراك"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"بطاقة RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"تنشيط الجهاز"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"إعداد خدمة البيانات"</string>
@@ -390,18 +337,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"إدارة أرقام الاتصال الثابتة"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"تغيير رقم التعريف الشخصي للدخول إلى FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"إدارة قائمة أرقام الهاتف"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"خصوصية الصوت"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"خصوصية الصوت"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"تمكين وضع الخصوصية المحسن"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"وضع TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"تمكين وضع TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"وضع TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"تعيين وضع TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"إعادة المحاولة تلقائيًا"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"تمكين وضع إعادة المحاولة التلقائي"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"إعادة المحاولة تلقائيًا"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"تمكين وضع إعادة المحاولة التلقائي"</string>
     <string name="menu_add" msgid="1882023737425114762">"إضافة جهة اتصال"</string>
     <string name="menu_edit" msgid="7143003705504672374">"تعديل جهة الاتصال"</string>
     <string name="menu_delete" msgid="3977150783449642851">"حذف جهة الاتصال"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"أدخل رقم التعريف الشخصي PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"اكتب رقم تعريف شخصي PIN2"</string>
     <string name="name" msgid="7329028332786872378">"الاسم"</string>
     <string name="number" msgid="7905950798349903858">"الرقم"</string>
     <string name="save" msgid="4094274636321939086">"حفظ"</string>
@@ -414,56 +359,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"حذف رقم الاتصال الثابت"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"جارٍ حذف رقم الاتصال الثابت..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"تم حذف رقم الاتصال الثابت."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"لم يتم تحديث FDN: لقد أدخلت رقم تعريف شخصي غير صحيح."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"لم يتم تحديث FDN: لا يمكن للرقم أن يتعدى 20 رقمًا"</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"لم يتم تحديث FDN لأنك كتبت رقم تعريف شخصي غير صحيح."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"لم يتم تحديث FDN لأن العدد لا يمكن أن يتجاوز 20 رقمًا."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"لم يتم تحديث FDN. رقم PIN2 غير صحيح، أو تم رفض رقم الهاتف."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"جارٍ القراءة من بطاقة SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"ليس هناك جهات اتصال على بطاقة SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"حدد جهات اتصال لاستيرادها"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"لاستيراد جهات الاتصال من بطاقة SIM، الرجاء إيقاف وضع الطائرة."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"لاستيراد جهات اتصال من بطاقة SIM، الرجاء إيقاف وضع الطائرة أولاً."</string>
     <string name="enable_pin" msgid="5422767284133234860">"تمكين/تعطيل رقم التعريف الشخصي لبطاقة SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"تغيير رقم التعريف الشخصي لبطاقة SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"رقم التعريف الشخصي لبطاقة SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"رقم التعريف الشخصي القديم"</string>
     <string name="newPinLabel" msgid="207488227285336897">"رقم التعريف الشخصي الجديد"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"تأكيد رقم التعريف الشخصي الجديد"</string>
-    <string name="badPin" msgid="4154316827946559447">"رقم التعريف الشخصي القديم الذي كتبته غير صحيح. الرجاء المحاولة مرة أخرى."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"أرقام التعريف الشخصي التي أدخلتها غير مطابقة. الرجاء المحاولة مرة أخرى لاحقًا."</string>
+    <string name="badPin" msgid="8955102849303984935">"رقم التعريف الشخصي القديم الذي كتبته غير صحيح. حاول مرة أخرى."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"أرقام التعريف الشخصي PIN2 التي كتبتها غير متطابقة. حاول مرة أخرى."</string>
     <string name="invalidPin" msgid="5981171102258684792">"اكتب رقم التعريف الشخصي المكون من 4 إلى 8 أرقام."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"تعطيل رقم التعريف الشخصي لبطاقة SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"تمكين رقم التعريف الشخصي لبطاقة SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"يُرجى الانتظار…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"تم تمكين رقم التعريف الشخصي لبطاقة SIM"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"تم تعطيل رقم التعريف الشخصي لبطاقة SIM"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"رقم التعريف الشخصي الذي كتبته غير صحيح"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"تم تغيير رقم التعريف الشخصي لبطاقة SIM بنجاح"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"تم تمكين رقم التعريف الشخصي لبطاقة SIM."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"تم تعطيل رقم التعريف الشخصي لبطاقة SIM."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"رقم التعريف الشخصي الذي كتبته ليس صحيحًا."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"تم تغيير رقم التعريف الشخصي لبطاقة SIM بنجاح."</string>
     <string name="puk_requested" msgid="3898394204193202803">"كلمة المرور غير صحيحة، تم تأمين بطاقة SIM! رقم PUK2 مطلوب."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"رقم التعريف الشخصي PIN2 القديم"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"رقم تعريف شخصي PIN2 جديد"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"تأكيد رقم التعريف الشخصي PIN2 الجديد"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"رقم PUK2 الذي كتبته غير صحيح. الرجاء المحاولة مرة أخرى."</string>
-    <string name="badPin2" msgid="515218795152422178">"رقم التعريف الشخصي PIN2 الذي كتبته غير صحيح. الرجاء المحاولة مرة أخرى."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"أرقام التعريف الشخصي PIN2 التي أدخلتها غير مطابقة. الرجاء المحاولة مرة أخرى لاحقًا."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"رقم PUK2 الذي كتبته غير صحيح. حاول مرة أخرى."</string>
+    <string name="badPin2" msgid="1041576234483629991">"رقم التعريف الشخصي PIN2 القديم الذي كتبته غير صحيح. الرجاء المحاولة مرة أخرى."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"أرقام التعريف الشخصي PIN2 التي كتبتها غير متطابقة. حاول مرة أخرى."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"اكتب رقم التعريف الشخصي PIN2 المكون من 4 إلى 8 أرقام."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"اكتب PUK2 يتكون من 8 أحرف."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"تم تغيير رقم التعريف الشخصي PIN2 بنجاح"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"تم تغيير رقم التعريف الشخصي PIN2 بنجاح."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"اكتب رمز PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"كلمة المرور غير صحيحة، الرجاء تغيير رقم التعريف الشخصي PIN2 وإعادة المحاولة!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"كلمة المرور غير صحيحة، تم تأمين بطاقة SIM! رقم PUK2 مطلوب."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"كلمة المرور غير صحيحة.غيّر رقم التعريف الشخصي PIN2 وأعد المحاولة."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"كلمة المرور غير صحيحة، تم تأمين بطاقة SIM. رقم PUK2 مطلوب."</string>
     <string name="doneButton" msgid="2859593360997984240">"تم"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"مكالمة جماعية <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"رجوع إلى المكالمة"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"متابعة بدون بطاقة SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"لم يتم العثور على بطاقة SIM. الرجاء إدراج بطاقة SIM في الهاتف."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"استبعاد"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"إلغاء تأمين"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"جارٍ مصادقة رقم التعريف الشخصي…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"رقم البريد الصوتي"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"طلب"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"جارٍ إعادة المحاولة"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"مكالمة جماعية"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"مكالمة واردة"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"انتظار مكالمات Cdma"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"تم إنهاء الاتصال"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"معلقة"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"إنهاء المكالمة"</string>
@@ -473,7 +412,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"المكالمات الفائتة"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> من المكالمات الفائتة"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"مكالمة فائتة من <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"المكالمة الحالية (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"مكالمة حالية"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"معلقة"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"مكالمة واردة"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"بريد صوتي جديد"</string>
@@ -482,13 +421,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"رقم البريد الصوتي غير معروف"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"لا خدمة"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"الشبكة المحددة (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) غير متاحة"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"قطع الاتصال"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"معاودة الاتصال"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"رسالة"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"لإجراء مكالمة، أوقف تشغيل وضع الطائرة أولاً."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"غير مسجل على الشبكة."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"شبكة الجوال غير متاحة."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"لم يتم إرسال الاتصال، لم يتم إدخال رقم صالح."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"لم يتم إرسال الاتصال."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"جارٍ بدء تسلسل MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"جارٍ بدء تسلسل رمز الميزة..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"خدمة غير معتمدة."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"يتعذر تبديل المكالمات."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"يتعذر فصل المكالمة."</string>
@@ -500,18 +441,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"مكالمة الطوارئ"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"جارٍ تشغيل اللاسلكي..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"خارج نطاق الخدمة، جارٍ إعادة المحاولة..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"لم يتم إرسال المكالمة، <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ليس رقم طوارئ!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"لم يتم إرسال الاتصال، الرجاء طلب رقم طوارئ!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"لم يتم إرسال المكالمة. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ليس رقم طوارئ."</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"لم يتم إرسال الاتصال. اطلب رقم طوارئ."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"استخدام لوحة المفاتيح للطلب"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"المس لوحة مفاتيح النغمات"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"تعليق"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"إلغاء التعليق"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"الانتهاء"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"لوحة الاتصال"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"إخفاء"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"مكبر الصوت"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"كتم الصوت"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"بلوتوث"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"إضافة مكالمة"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"دمج المكالمات"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"تبديل"</string>
@@ -530,36 +466,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"نص مؤشر التجوال المحسن (ERI)"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"نغمات DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"نغمات DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"تعيين طول نغمات DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"عادي"</item>
     <item msgid="2883365539347850535">"طويلة"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"رسالة الشبكة"</string>
+    <string name="network_message" msgid="4483886461245213802">"رسالة الشبكة"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"تنشيط الهاتف"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"يلزم إجراء اتصال خاص لتنشيط خدمة الهاتف. "\n\n"بعد الضغط على \"تنشيط\"، استمع إلى الإرشادات المقدمة لتنشيط هاتفك."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"المس \"تنشيط\" لإجراء مكالمة خاصة تؤدي إلى تنشيط هاتفك على شبكة الجوال لمشغل شبكة الجوال، كي تتمكن من إجراء الاتصالات والاتصال بشبكات بيانات الجوال."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"هل تريد تخطي التنشيط؟"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"إذا تخطيت التنشيط، فلن تتمكن من إجراء مكالمات أو الاتصال بشبكات بيانات الجوال (ومع ذلك، يمكنك الاتصال بشبكات Wi-Fi). إلى أن تنشط هاتفك، ستتم مطالبتك بتنشيطه في كل مرة تشغله فيها."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"تخطٍ"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"تنشيط"</string>
     <string name="ota_activate" msgid="1368528132525626264">"تنشيط"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"تم تنشيط الهاتف!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"تم تنشيط الهاتف."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"مشكلة في التنشيط"</string>
     <string name="ota_listen" msgid="162923839877584937">"اتبع الإرشادات المنطوقة حتى تسمع ما يفيد بانتهاء التنشيط."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"لوحة المفاتيح"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"مكبر الصوت"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"الرجاء الانتظار حتى تتم برمجة هاتفك."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"لم تنجح البرمجة"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"انتظر حتى تتم برمجة هاتفك."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"لم تنجح البرمجة"</string>
     <string name="ota_successful" msgid="1880780692887077407">"تم تنشيط هاتفك الآن. قد يستغرق بدء الخدمة ما يصل إلى 15 دقيقة."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"لم يتم تنشيط الهاتف. "\n"ربما يلزمك البحث عن منطقة بها تغطية أفضل (بجانب نافذة أو بالخارج). "\n\n"حاول مرة أخرى أو اتصل بخدمة العملاء للحصول على مزيد من الخيارات."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"لم يتم تنشيط الهاتف. "\n"ربما يلزمك البحث عن منطقة بها تغطية أفضل (بجانب نافذة أو بالخارج). "\n\n"حاول مرة أخرى أو اتصل بخدمة العملاء للحصول على مزيد من الخيارات."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"إخفاقات في المواصفات الزائدة"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"رجوع"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"حاول مرة أخرى"</string>
     <string name="ota_next" msgid="3904945374358235910">"التالي"</string>
-    <string name="ota_back" msgid="2190038043403850052">"رجوع"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"تم الدخول إلى وضع هاتف معاودة الاتصال بالطوارئ"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"وضع هاتف معاودة الاتصال بالطوارئ"</string>
@@ -569,87 +500,69 @@
     <item quantity="other" msgid="3122217344579273583">"لا اتصال بيانات لمدة <xliff:g id="COUNT">%s</xliff:g> دقيقة"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"سيكون الهاتف في وضع معاودة الاتصال بالطوارئ لمدة <xliff:g id="COUNT">%s</xliff:g> دقيقة. لا يمكن استخدام التطبيقات التي تستخدم اتصال البيانات أثناء تشغيل هذا الوضع. هل تريد الخروج الآن؟"</item>
-    <item quantity="other" msgid="3231879566243957821">"سيكون الهاتف في وضع معاودة الاتصال بالطوارئ لمدة <xliff:g id="COUNT">%s</xliff:g> دقيقة. لا يمكن استخدام التطبيقات التي تستخدم اتصال البيانات أثناء تشغيل هذا الوضع. هل تريد الخروج الآن؟"</item>
+    <item quantity="one" msgid="8060210887681426682">"سيكون الهاتف في وضع معاودة الاتصال بالطوارئ لمدة <xliff:g id="COUNT">%s</xliff:g> دقائق. لا يمكن استخدام تطبيقات أثناء استخدام هذا الوضع. هل تريد الخروج الآن؟"</item>
+    <item quantity="other" msgid="8617116564023933114">"سيكون الهاتف في وضع معاودة الاتصال بالطوارئ لمدة <xliff:g id="COUNT">%s</xliff:g> دقائق. لا يمكن استخدام تطبيقات تستخدم اتصال البيانات أثناء استخدام هذا الوضع. هل تريد الخروج الآن؟"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"لا يتوفر الإجراء المحدد أثناء تشغيل وضع هاتف معاودة الاتصال بالطوارئ. سيظل الهاتف في هذا الوضع لمدة <xliff:g id="COUNT">%s</xliff:g> دقيقة. هل تريد الخروج الآن؟"</item>
-    <item quantity="other" msgid="3489076611710869904">"لا يتوفر الإجراء المحدد أثناء تشغيل وضع هاتف معاودة الاتصال بالطوارئ. سيظل الهاتف في هذا الوضع لمدة <xliff:g id="COUNT">%s</xliff:g> دقيقة. هل تريد الخروج الآن؟"</item>
+    <item quantity="one" msgid="2585506997024726599">"الإجراء المحدد ليس متاحًا أثناء استخدام وضع معاودة الاتصال بالطوارئ. سيظل الهاتف في هذا الوضع لمدة <xliff:g id="COUNT">%s</xliff:g> دقائق. هل تريد الخروج الآن؟"</item>
+    <item quantity="other" msgid="6115622137771382224">"الإجراء المحدد ليس متاحًا أثناء استخدام وضع معاودة الاتصال بالطوارئ. سيظل الهاتف في هذا الوضع لمدة <xliff:g id="COUNT">%s</xliff:g> دقائق. هل تريد الخروج الآن؟"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"الإجراء المحدد لا يتوفر أثناء إجراء مكالمة طوارئ."</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"الخروج من وضع هاتف معاودة الاتصال بالطوارئ"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"الإجراء المحدد ليس متاحًا أثناء إجراء اتصال بالطوارئ."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"الخروج من وضع معاودة الاتصال بالطوارئ"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"نعم"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"لا"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"استبعاد"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"إعدادات البريد الصوتي"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;غير معين&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"خدمة البريد الصوتي"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"إعدادات \"<xliff:g id="PROVIDER_NAME">%s</xliff:g>\""</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"الخدمة"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"الإعداد"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;لم يتم التعيين&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"إعدادات الاتصال الأخرى"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"طلب"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"الاتصال عبر ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"اسحب لليسار للإجابة"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"اسحب لليمين لجعل الرنين صامتًا"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"اسحب لليمين للرفض"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"سحب لليسار للرد "\n"وتعليق المكالمة النشطة"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"اسحب لليسار للرد "\n"وإنهاء المكالمة النشطة"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"سحب لليسار للرد و"\n"وإنهاء المكالمة المعلقة"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"إجابة"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"رفض"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"الاتصال عبر <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"صورة جهة الاتصال"</string>
     <string name="goPrivate" msgid="865837794424530980">"انتقال إلى مكالمة خاصة"</string>
     <string name="selectContact" msgid="781975788478987237">"تحديد جهة اتصال"</string>
     <string name="sip_settings" msgid="6699045718560859691">"إعدادات الاتصال عبر الإنترنت"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"حسابات الاتصال عبر الإنترنت (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"الحسابات"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"إدارة حسابات وحالات الاتصال عبر الإنترنت (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"تلقي المكالمات الواردة"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"يقلل من عمر البطارية"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"تهيئة خيارات الاتصال"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"استخدام الاتصال عبر الإنترنت"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"استخدام الاتصال عبر الإنترنت (Wi-Fi فقط)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"لكل المكالمات عند توفر شبكة البيانات"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"فقط للمكالمات عبر الإنترنت"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"المطالبة لكل اتصال"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"لكل المكالمات"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"التسجيل التلقائي"</string>
-    <string name="call_priority" msgid="8374917577270504387">"مكالمة صادرة عبر SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"إجراء اتصال"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"استخدام حساب الاتصال عبر الإنترنت:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"الاستخدام دومًا لإجراء مكالمات عبر الإنترنت"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"يمكنك استخدام إعدادات الاتصال لتغيير حساب الاتصال عبر الإنترنت الذي يتم استخدامه افتراضيًا عند إجراء مكالمات، من خلال تحديد حساب مختلف ضمن إعدادات الاتصال عبر الإنترنت"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"يمكنك تغيير حساب مكالمات الإنترنت الذي تريد استخدامه افتراضيًا من الهاتف &gt; إعدادات &gt; إعدادات مكالمات لإنترنت &gt; شاشة الحسابات."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"اتصال عبر هاتف خلوي"</string>
     <string name="internet_phone" msgid="1147922660195095810">"مكالمة عبر الإنترنت"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"ليس هناك حساب اتصال عبر الإنترنت"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"لا توجد حسابات اتصال عبر الإنترنت على هذا الهاتف. هل تريد إضافة حساب الآن؟"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"لا توجد حسابات مكالمات الإنترنت على هذا الهاتف. هل تريد إضافة حساب الآن؟"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"إضافة"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"إضافة حساب"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"إزالة الحساب"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"حسابات SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"جارٍ حفظ الحساب..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"جارٍ إزالة الحساب..."</string>
+    <string name="saving_account" msgid="52903398217017954">"جارٍ حفظ الحساب..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"جارٍ إزالة الحساب..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"حفظ"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"تجاهل"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"إغلاق الملف الشخصي"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"موافق"</string>
     <string name="close_profile" msgid="6886968271423155284">"إغلاق"</string>
-    <string name="primary_account" msgid="2229538308291934245">"أساسي"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"جعل هذا حسابي الأساسي"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"مستخدمة للمكالمات الصادرة"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"الإعدادات المتقدمة"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"حساب أساسي. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"جارٍ فحص الحالة..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"جارٍ التسجيل..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"ما زالة المحاولة مستمرة..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"عدم استلام مكالمات"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"توقف تسجيل الحساب نظرًا لعدم توفر اتصال بالإنترنت"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"توقف تسجيل الحساب نظرًا لعدم توفر اتصال Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"لم يتم تسجيل الحساب بنجاح"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"استلام مكالمات"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"جارٍ التسجيل..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"لا تزال المحاولة مستمرة..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"عدم استلام مكالمات."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"توقف تسجيل الحساب نظرًا لعدم توفر اتصال بالإنترنت."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"توقف تسجيل الحساب نظرًا لعدم توفر اتصال Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"لم يتم تسجيل الحساب بنجاح."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"جارٍ استلام مكالمات."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"لم يتم تسجيل الحساب بنجاح: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>)؛ ستتم المحاولة لاحقًا"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"لم يتم تسجيل الحساب بنجاح: اسم المستخدم أو كلمة المرور غير صحيحة"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"لم يتم تسجيل الحساب بنجاح: تحقق من اسم الخادم"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"هذا الحساب قيد الاستخدام حاليًا من خلال تطبيق <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"لم يتم تسجيل الحساب بنجاح: اسم مستخدم غير صحيح أو كلمة مرور غير صحيحة."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"لم يتم تسجيل الحساب بنجاح: تحقق من اسم الخادم."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"هذا الحساب قيد الاستخدام حاليًا من خلال تطبيق <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"تفاصيل حساب SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"تفاصيل حساب SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"الخادم"</string>
@@ -660,9 +573,6 @@
     <string name="port_title" msgid="5952939408078626657">"رقم المنفذ"</string>
     <string name="transport_title" msgid="8253139511847746640">"نوع النقل"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"إرسال رسالة للتحقق من الاتصال"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"إرسال رسائل عبر SIP للتحقق من الاتصال"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"التسجيل التلقائي"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"تسجيل الملف الشخصي تلقائيًا"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"تعيين كحساب أساسي"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"مستخدمة للمكالمات الصادرة"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"الإعدادات الاختيارية"</string>
@@ -673,12 +583,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;اختياري&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ المس لإظهار الكل"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ المس لإخفاء الكل"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"حقل <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> مطلوب، لا يمكن تركه فارغًا"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"يجب أن يكون رقم المنفذ ما بين 1000 و65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> مطلوب ولا يمكن تركه فارغًا."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"يجب أن يكون رقم المنفذ ما بين 1000 و65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"لا يوجد اتصال بالإنترنت"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"ليس هناك اتصال Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"لإجراء اتصالٍ عبر الإنترنت، تحقق من الاتصال بالإنترنت أولاً"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"يجب الاتصال بشبكة Wi-Fi لإجراء مكالمات عبر الإنترنت (استخدم إعدادات اللاسلكي والشبكة)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"لإجراء مكالمة إنترنت، تحقق من اتصالك بالإنترنت أولاً."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"يلزمك الاتصال بشبكة Wi-Fi لإجراء مكالمات عبر الإنترنت (استخدم إعدادات اللاسلكي والشبكة)."</string>
     <string name="no_voip" msgid="8901474054537199865">"الاتصال عبر الإنترنت غير معتمد"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"تلقائي"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"الإرسال دائمًا"</string>
@@ -687,7 +597,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"سأعاود الاتصال بك."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"سأتصل بك لاحقًا."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"لا يمكنني التحدث الآن. اتصل بي لاحقًا."</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"تخصيص رسالة..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"رسالة مخصصة"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"الردود السريعة"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"تعديل الردود السريعة"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +615,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"نجمة"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"صفر"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"رنين"</string>
-    <string name="description_search_button" msgid="239929880630534731">"بحث"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"طلب"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"مسافة للخلف"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"تم تمكين مكبر صوت الهاتف."</string>
@@ -713,11 +622,16 @@
     <string name="description_target_answer" msgid="7205604197797472471">"رد"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"إرسال رسائل قصيرة SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"رفض"</string>
-    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"اهتزاز"</string>
-    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"اهتزاز"</string>
+    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"الاهتزاز"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"الاهتزاز"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"نغمة الرنين"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
-    <item msgid="468237575962916558">"دومًا"</item>
+    <item msgid="468237575962916558">"دائمًا"</item>
     <item msgid="1595097872875714252">"فقط عندما يكون صامتًا"</item>
-    <item msgid="1458182414036878616">"مطلقًا"</item>
+    <item msgid="1458182414036878616">"أبدًا"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"نغمة رنين الهاتف"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"اهتزاز عند الرنين"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"نغمات لمس لوحة الطلب"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"نغمة الرنين"</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 2f1e2aabf..41b95607d 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Прыватны нумар"</string>
     <string name="payphone" msgid="1931775086311769314">"Таксафон"</string>
     <string name="onHold" msgid="9035493194749959955">"У чаканні"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Гэты выклік"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Лінія занятая"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Сетка занятая"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Няма адказу, тайм-аўт"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Сервер недаступны"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Колькасць недаступная"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Няправільнае імя ці пароль"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Выклікаецца з-за межаў сеткі"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Выклік з-за межаў сеткі"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Памылка сервера. Паспрабуйце пазней."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Няма сігналу"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Ліміт ACM перавышаны"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Радыё выключанае"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Няма SIM-карты ці памылка чытання SIM- карты"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Няма SIM-карты або памылка яе чытання"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Па-за зонай абслугоўвання"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Выходныя выклікі абмежаваныя FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Вы не можаце рабіць выходныя выклікі, калі ўключана забарона выклікаў."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Вы не можаце рабіць выходныя выклікi, калі ўключана забарона выклікаў."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Усе выклікі абмежаваныя кантролем доступу."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Экстраныя выклікі абмежаваныя кантролем доступу."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Звычайныя выклікі абмежаваныя кантролем доступу."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: тэлефон заблакаваны да наступнага цыклу зарадкі."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Выклік абарваны."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: выклік перахоплены."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: пераўпарадкаванне."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: адмова параметру абслугоўвання."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: паўтарыць парадак."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Няўдалы доступ."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: перапынена."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Магчымы толькі выклікі служб экстранай дапамогі."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Несапраўдны нумар"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Несапраўдны нумар"</string>
     <string name="confCall" msgid="1904840547188336828">"Канферэнц-выклік"</string>
     <string name="call_lost" msgid="317670617901479594">"Выклік быў страчаны."</string>
-    <string name="retry" msgid="8462986804300767852">"Паўтарыць"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Выклік страчаны"</string>
     <string name="ok" msgid="3811371167865772377">"ОК"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Пачалося выкананне MMI кода"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Запускаецца USSD-код..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Правадная гарнітура"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Адправіць наступныя тоны?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Адпраўка сігналаў"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Адпраўка сігналаў"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Адправіць"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Так"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Не"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Змяніць сімвал ​​на"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Замяніце выпадковы сімвал:"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Адсутнічае нумар галасавой пошты"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"На SIM-карце няма нумару галасавой пошты."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Дадаць нумар"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Загрузка..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Увядзіце PIN-код, каб разблакаваць SIM-карту."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM-карта разблакаваная"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Новы PIN-код SIM-карты"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Зноў увядзіце PIN-код SIM-карты для пацверджання"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"PIN-коды SIM-карты, якія вы ўвялі, не супадаюць. Паспрабуйце яшчэ раз."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Увядзіце PUK-код, каб разблакаваць SIM-карту."</string>
-    <string name="badPuk" msgid="3213017898690275965">"Няправільны код PUK!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Працягнуць"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Ваша SIM-карта была разблакаваная. Ваш тэлефон разблакоўваецца..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN-код разблакавання сеткі SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Разблакаваць"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Запыт разблакавання сеткі..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Запыт разблакавання сеткі няўдалы."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Сетка паспяхова разблакавана."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Налады выклікаў GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Налады выклікаў CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Назвы кропак доступу"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Дадатковыя налады толькі для выклікаў CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Налады сеткавых паслуг"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"АВН"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Загрузка налад..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Нумар схаваны з выходных выклікаў"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Нумар, якi паказваецца ў выходных выкліках"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Выкарыстоўваць налады па змаўчаннi, каб аператар мог адлюстроўваць мой нумар у выходных выкліках"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Нумар, калі занята"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Пераадрасацыя на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Адключана"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Ваш аператар не падтрымлівае адключэнне пераадрасацыі выклікаў, калі тэлефон заняты."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Ваш аператар не падтрымлівае адключэнне перанакіравання выклікаў, калі тэлефон заняты."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Пераадрасацыя, калі няма адказу"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Нумар, калі няма адказу"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Пераадрасацыя на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Адключана"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Ваш аператар не падтрымлівае адключэнне пераадрасацыі выклікаў, калі тэлефон не адказвае."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Ваш аператар не падтрымлівае адключэнне перанакіравання выклікаў, калі тэлефон не адказвае."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Пераадрасоўваць, калі недаступны"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Нумар, калі недаступны"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Пераадрасацыя на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Адключана"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Ваш аператар не падтрымлівае адключэнне пераадрасацыі выклікаў, калі тэлефон недаступны."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Ваш аператар не падтрымлівае адключэнне пераадрасацыi выклікаў, калі тэлефон недаступны."</string>
     <string name="updating_title" msgid="6146755386174019046">"Налады выклікаў"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Памылка налад выкліку"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Чытанне налад..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Вяртанне налад..."</string>
     <string name="response_error" msgid="6674110501330139405">"Нечаканы адказ ад сеткі."</string>
     <string name="exception_error" msgid="7027667130619518211">"Памылка сеткі ці SIM-карты."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Аперацыі дапускаюцца толькі для дазволеных нумароў."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Перш чым праглядаць гэтыя параметры, уключыце радыё"</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Уключаны дазволеныя нумары. У выніку некаторыя функцыі адносна званкоў не працуюць."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Перад праглядам гэтых параметраў уключыце радыё."</string>
     <string name="close_dialog" msgid="2365884406356986917">"ОК"</string>
     <string name="enable" msgid="1059008390636773574">"Уключыць"</string>
     <string name="disable" msgid="7274240979164762320">"Адключыць"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Схаваць нумар"</item>
     <item msgid="1108394741608734023">"Паказаць нумар"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Захаваць нумар галасавой пошты"</string>
     <string name="vm_changed" msgid="380744030726254139">"Нумар галасавой пошты змяніўся."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Змена нумару галасавой пошты не выканана."\n"Звяжыцеся са сваім аператарам, калі праблема застаецца."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Змена нумару перанакіравання не выканана."\n"Звяжыцеся са сваім аператарам, калі праблема застаецца."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Не атрымалася змяніць нумар галасавой пошты."\n"Калі праблема не вырашыцца, звярніцеся да свайго аператара."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Не атрымалася змяніць нумар для пераадрасацыi."\n"Калі гэтая праблема не вырашыцца, звярніцеся да свайго аператара."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Немагчыма атрымаць і захаваць бягучыя налады пераадрасацыі нумару."\n"Усё роўна пераключыць на новага пастаўшчыка?"</string>
     <string name="no_change" msgid="3186040086622435212">"Змены не выкананы."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Выберыце службу галасавой пошты"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Шукаць сеткі"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Памылка падчас пошуку сетак."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Рэгістрацыя ў сетцы <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Ваша SIM-карта не дазваляе падключэнне да гэтай сеткі."</string>
-    <string name="connect_later" msgid="500090982903469816">"Зараз немагчыма падлучыцца да гэтай сеткі. Паспрабуйце пазней."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Ваша SIM-карта не дазваляе падключацца да гэтай сеткі."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Зараз немагчыма падключыцца да гэтай сеткі. Паўтарыце спробу пазней."</string>
     <string name="registration_done" msgid="495135664535876612">"Зарэгістраваны ў сетцы."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Выбраць аператара сеткі"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Выберыце аператара сеткі"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Пошук усіх даступных сетак"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Выбіраць аўтаматычна"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Аўтаматычна выбіраць пераважную сетку"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Аўтаматычная рэгістрацыя..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Выбраць аўтаматычна"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Аўтаматычна выбраць прыярытэтную сетку"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Аўтаматычная рэгістрацыя..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Сеткавы рэжым"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Змяніць рэжым работы сеткі"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Пераважны сеткавы рэжым"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Пераважны рэжым сеткі: толькі EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Пераважны рэжым сеткі: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Толькі EVDO"</item>
     <item msgid="454610224530856274">"CDMA без EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA/EVDO аўтаматычна"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA аўтаматычна"</item>
+    <item msgid="648505122852496166">"Аўтаматычны выбар CDMA/EvDo"</item>
+    <item msgid="7148247646407324800">"Аўтаматычны выбар GSM/WCDMA"</item>
     <item msgid="5189164180446264504">"Толькі WCDMA"</item>
     <item msgid="5714714953966979187">"Толькі GSM"</item>
-    <item msgid="4775796025725908913">"GSM/WCDMA пажадана"</item>
+    <item msgid="8508331239546115206">"Пажадана GSM/WCDMA"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Дадзеныя ўключаныя"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Перадача дадзеных у роўмінгу"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Злучацца з паслугамі перадачы дадзеных ў роўмінгу"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Злучацца з паслугамі перадачы дадзеных у роўмінгу"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Вы страцілі падключэнне перадачы дадзеных, таму што вы пакінулі хатнюю сетку з адключаным параметрам перадачы дадзеных у роўмінгу."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Падлучэнне для перадачы дадзеных страчана, таму што вы выйшлі з зоны пакрыцця сваёй сеткі, а перадача дадзеных у роўмінгу адключана."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Дазволіць перадачу дадзеных у роўмінгу? Гэта можа прывесці да значных дадатковых выплат."</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Параметры GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Параметры CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Выкарыстанне дадзеных"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Палітыка дадзеных аператара"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Выкарыстанне дадзеных у бягучы перыяд"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Перыяд выкарыстання дадзеных"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Палітыка хуткасці перадачы дадзеных"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>?? цыклу прайшло"\n"Наступны перыяд пачнецца праз <xliff:g id="USED_1">%2$d</xliff:g> д. (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Хуткасць перадачы дадзеных зніжаецца да <xliff:g id="USED">%1$d</xliff:g> Кб/с, калі абмежаванне выкарыстання дадзеных перавышанае"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Больш падрабязная інфармацыя аб палітыцы выкарыстання дадзеных у сетцы вашага мабільнага аператара"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Перадача SMS на сотавыя"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Перадача SMS на сотавыя"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Перадача SMS на сотавыя"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Перадача SMS на сотавыя ўключана"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Карэйская"</item>
     <item msgid="1933212028684529632">"Кітайская"</item>
     <item msgid="1908428006803639064">"Іўрыт"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Мовы"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Мясцовае надвор\'е"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Магчымасці працаўладкавання"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Магчымасці працаўладкавання ўключаны"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Магчымасці працаўладкавання адключаныя"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Медыцына, здароўе і бальніцы"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Медыцына, здароўе і бальніцы ўключаныя"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Медыцына, здароўе і бальніцы адключаны"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Медыцына, здароўе і бальніцы"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Уключаны раздзел \"Медыцына, здароўе і бальніцы\""</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Адключаны раздзел \"Медыцына, здароўе і бальніцы\""</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Навіны тэхналогій"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Навіны тэхналогій уключаны"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Навіны тэхналогій адключаны"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"Толькі WCDMA"</item>
     <item msgid="8776934131146642662">"Толькі GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (пажадана WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Карыстацца толькі сеткамі 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Эканоміць батарэю"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Выбар сістэмы"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Змена рэжыму роўмінгу CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Змяніць рэжым роўмінгу CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Выбар сістэмы"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Толькі галоўная"</item>
     <item msgid="1205664026446156265">"Аўтаматычна"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Рэжым роўмінгу CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Змяніць рэжым роўмінгу CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Рэжым роўмінгу CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Толькі хатнія сеткі"</item>
-    <item msgid="8174642753290624634">"Звязаныя сеткі"</item>
-    <item msgid="2241951431403168661">"Любая сетка"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Падпіска CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Параметры сеткі CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Яшчэ не ўведзена."</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Параметры сеткі CDMA"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"Толькі CDMA"</item>
     <item msgid="2683555124647197574">"Толькі EVDO"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Рэгістрацыя CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Пераключацца паміж RUIM/SIM і NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"падпіска"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Актывацыя прылады"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Налады службы перад. дадзеных"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Кіраванне зафіксаванымі нумарамі"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Змяніць PIN-код для доступу FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Кіраванне спісам тэлефонных нумароў"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Прыватнасць голасу"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Палiтыка прыватнасцi Voice"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Уключыць пашыраны рэжым прыватнасці"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Рэжым TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Уключыць рэжым TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY рэжым"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Задаць рэжым TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Аўтаматычны паўтор"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Уключыць рэжым аўтаматычнага паўтарэння"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Аўтаматычны паўтор"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Уключыць рэжым аўтаматычнага паўтору"</string>
     <string name="menu_add" msgid="1882023737425114762">"Дадаць кантакт"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Рэдагаваць кантакт"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Выдаліць кантакт"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Увядзіце PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Увядзіце код PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Імя"</string>
     <string name="number" msgid="7905950798349903858">"Нумар"</string>
     <string name="save" msgid="4094274636321939086">"Захаваць"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Выдаліць дазволены нумар"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Выдаленне дазволенага нумару..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Дазволены нумар выдалены."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Дазволены нумар не абноўлены: вы ўвялі няправільны PIN-код."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"Дазволены нумар не абноўлены: даўжыня нумару не можа перавышаць 20 знакаў."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN не быў абноўлены, таму што вы набралі няправільны PIN-код."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN не абноўлены, таму што нумар не можа бвць больш за 20 знакаў."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Cпiс дазволеных нумароў не адноўлены. PIN2 ўведзены няправiльна, або нумар быў адхiлены."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Чытанне з SIM-карты..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"На вашай SIM-карце няма кантактаў."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Выберыце кантакты для імпарту"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Каб імпартаваць кантакты з SIM-карты, адключыце рэжым палёту."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Каб імпартаваць кантакты з SIM-карты, спачатку адключыце рэжым палёту."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Уключэнне/адключэнне PIN-коду SIM-карты"</string>
     <string name="change_pin" msgid="9174186126330785343">"Змена PIN-коду SIM-карты"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN-код SIM-карты:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Стары PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Новы PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Пацвердзіць новы PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Стары PIN-код уведзены няправільна. Паспрабуйце яшчэ раз."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Уведзеныя PIN-коды не супадаюць. Паспрабуйце яшчэ раз."</string>
+    <string name="badPin" msgid="8955102849303984935">"Стары PIN-код, які вы ўвялі, няправільны. Паспрабуйце яшчэ раз."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"PIN-коды, якія вы ўвялі, не супадаюць. Паспрабуйце яшчэ раз."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Увядзіце PIN-код, які змяшчае ад 4 да 8 лічбаў."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Адключыць PIN-код SIM-карты"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Уключыць PIN-код SIM-карты"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Пачакайце..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"PIN-код SIM-карты ўключаны"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN-код SIM-карты адключаны"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Вы набралі няправільны PIN-код"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"PIN-код SIM-карты паспяхова зменены"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN-код SIM-карты актываваны."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN-код SIM-карты адключаны."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Вы набралі няправільны PIN-код."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"PIN-код SIM-карты паспяхова зменены."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Пароль няправільны, SIM заблакаваная! Патрабуецца PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Стары PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Новы PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Пацвердзіць новы PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"PUK2 уведзены няправільна. Паспрабуйце яшчэ раз."</string>
-    <string name="badPin2" msgid="515218795152422178">"Стары код PIN2 уведзены няправільна. Паспрабуйце яшчэ раз."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Уведзеныя коды PIN2 не супадаюць. Паспрабуйце яшчэ раз."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Код PUK2 уведзены няправільна. Паспрабуйце яшчэ раз."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Стары код PIN2 уведзены няяправільна. Паспрабуйце яшчэ раз."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Коды PIN2, якія вы ўвялі, не супадаюць. Паспрабуйце яшчэ раз."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Увядзіце PUK2, які ўключае 4-8 лічбаў."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Увядзіце PUK2, які складаецца з 8 лічбаў."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 паспяхова зменены"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"Код PIN2 паспяхова зменены."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Увядзіце PUK2-код"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Няправільны пароль, змяніце PIN2 і паспрабуйце яшчэ раз!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Пароль няправільны, SIM-карта заблакаваная! Патрабуецца PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Няправільны пароль. Змяніце код PIN2 і паспрабуйце яшчэ раз."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Няправiльны пароль. SIM-карта заблакавана. Патрабуецца код PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Гатова"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Канферэнц-выклік <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Вярнуцца да выкліку"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Працягваць без SIM-карты"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"SIM-карта не знойдзена. Устаўце SIM-карту ў тэлефон."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Адхіліць"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Разблакаваць"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Праверка PIN-коду..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Нумар галасавой пошты"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Набор"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Паўторная спроба..."</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Канферэнц-выклік"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Уваходны выклік"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Чаканне выкліку CDMA"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Выклік скончаны"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"У чаканні"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Завяршэнне"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Прапушчаныя выклікі"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Прапушчаных выклікаў: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Прапушчаны выклік ад <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Бягучы выклік (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Бягучы выклік"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"У чаканні"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Уваходны выклік"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Новая галасавая пошта"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Невядомы нумар галасавой пошты"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Не абслугоўваецца"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Выбраная сетка (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) недаступная"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Скончыць размову"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Адказаць"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Паведамленне"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Каб зрабіць выклік, спачатку выключыце рэжым \"У самалёце\"."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Не зарэгістраваны ў сетцы."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Мабільная сетка недаступная."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Выклік не адпраўлены. Уведзены несапраўдны нумар."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Выклік не дасланы."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Пачатак паслядоўнасці MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Пачынаецца ідэнтыфікацыйная паслядоўнасць..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Паслуга не падтрымліваецца."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Немагчыма пераключыць выклікі."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Немагчыма аддзяліць выклік."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Экстраны выклік"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Уключэнне радыё..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Па-за зонай абслугоўвання, спрабую зноў..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Выклік не адпраўлены, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не з\'яўляецца экстраным нумарам."</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Выклік не адпраўлены, набярыце нумар службы экстранай дапамогі"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Выклік не зроблены. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не з\'яўляецца экстраным нумарам."</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Выклік не зроблены. Набярыце экстраны нумар."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Выкарыстоўвайце клавіятуру, каб набраць нумар"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Танальны рэжым клавіятуры"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Утрымліваць"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Зняць утрыманне"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Скончыць"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Кнопкі набору"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Схаваць"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Дынамік"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Выключыць гук"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Дадаць выклік"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Аб\'яднаць выклікі"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Пераключыць"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Тэкст ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Тоны DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Сігналы DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Задаць даўжыню тонаў DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Звычайны"</item>
     <item msgid="2883365539347850535">"Доўгі"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Сеткавае паведамленне"</string>
+    <string name="network_message" msgid="4483886461245213802">"Паведамленне сеткі"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Актываваць тэлефон"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Каб актываваць абслугоўванне вашага тэлефона, трэба выканаць спецыяльны выклік. "\n\n"Націсніце \"Актываваць\" і слухайце інструкцыі, неабходныя для актывацыі тэлефона."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Націсніце \"Актываваць\", каб размясціць спецыяльны выклік, які актывуе тэлефон у мабільнай сетцы вашага аператара, каб вы маглі рабіць выклікі і падлучацца да мабільных сетак перадачы дадзеных."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Прапусціць актывацыю?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Калі прапусціць актывацыю, вы не зможаце здзяйсняць званкі або падлучэнні да мабільных сетак перадачы дадзеных (хаця вы зможаце падлучыцца да Wi-Fi). Кожны раз пры ўключэнні тэлефона вам будзе прапанавана актываваць яго."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Прапусціць"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Актываваць"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Актываваць"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Тэлефон актываваны"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Тэлефон актываваны."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Праблема з актывацыяй"</string>
     <string name="ota_listen" msgid="162923839877584937">"Выконвайце гукавыя інструкцыі, пакуль не пачуеце, што актывацыя завершаная."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Клавіятура"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Дынамік"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Пачакайце, пакуль ваш тэлефон праграмуецца."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Праграмаванне не выканана"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Пачакайце, пакуль ваш тэлефон праграмуецца."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Няўдалае праграмаванне"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Цяпер тэлефон актываваны. Запуск службы можа заняць да 15 хвілін."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Ваш тэлефон не актываваны. "\n"Магчыма, вам спатрэбіцца знайсці вобласць з лепшым пакрыццём (каля акна ці на вуліцы). "\n\n"Паспрабуйце яшчэ раз ці звярнiцеся ў цэнтр абслугоўвання кліентаў, каб атрымаць дадатковую інфармацыю."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Ваш тэлефон не актываваны. "\n"Магчыма, вам спатрэбіцца знайсці вобласць з лепшым пакрыццём (каля акна ці на вуліцы). "\n\n"Паўтарыце спробу ці звярнiцеся ў цэнтр абслугоўвання кліентаў, каб атрымаць дадатковую інфармацыю."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ПАМЫЛКІ ПЕРАВЫШЭННЯ SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Назад"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Паспрабаваць яшчэ раз"</string>
     <string name="ota_next" msgid="3904945374358235910">"Далей"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Назад"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"У рэжыме аварыйнага зваротнага выкліку"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Рэжым аварыйнага зваротнага выкліку"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"Няма злучэння для перадачы дадзеных на працягу <xliff:g id="COUNT">%s</xliff:g> хв."</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Тэлефон будзе знаходзіцца ў рэжыме аварыйнага зваротнага выкліку на працягу <xliff:g id="COUNT">%s</xliff:g> хв. У гэтым рэжыме нельга запускаць прыкладанні, якія выкарыстоўваюць перадачу дадзеных. Выйсці?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Тэлефон будзе знаходзіцца ў рэжыме аварыйнага зваротнага выкліку на працягу <xliff:g id="COUNT">%s</xliff:g> хв. У гэтым рэжыме нельга запускаць прыкладанні, якія выкарыстоўваюць перадачу дадзеных. Выйсці?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Тэлефон будзе ў рэжыме экстранага выкліку на працягу наступнай колькасці хвілін: <xliff:g id="COUNT">%s</xliff:g>. У гэтым рэжыме нельга выкарыстоўваць прыкладанні, якія карыстаюцца злучэннем для перадачы дадзеных. Выйсці зараз?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Тэлефон будзе ў рэжыме экстранага выкліку на працягу наступнай колькасці хвілін: <xliff:g id="COUNT">%s</xliff:g>. У гэтым рэжыме нельга запускаць прыкладанні, якія карыстаюцца злучэннем для перадачы дадзеных. Выйсці зараз?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Выбранае дзеянне недаступнае ў рэжыме экстранага выкліку. Тэлефон будзе ў гэтым рэжыме на працягу <xliff:g id="COUNT">%s</xliff:g> хв. Выйсці зараз?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Выбранае дзеянне недаступнае ў рэжыме экстранага выкліку. Тэлефон будзе ў гэтым рэжыме на працягу <xliff:g id="COUNT">%s</xliff:g> хв. Выйсці зараз?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Выбранае дзеянне недаступнае падчас экстранага выкліку. Тэлефон будзе ў гэтым рэжыме на працягу <xliff:g id="COUNT">%s</xliff:g> хв. Выйсці зараз?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Выбранае дзеянне недаступнае падчас экстранага выкліку. Тэлефон будзе ў гэтым рэжыме на працягу наступнай колькасці хвілін: <xliff:g id="COUNT">%s</xliff:g>. Выйсці зараз?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Выбранае дзеянне недаступнае падчас экстранага выкліку"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Выхад з рэжыму аварыйнага зваротнага выкліку"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Выбранае дзеянне недаступнае падчас экстранага выкліку."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Выхад з рэжыму экстранага выкліку"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Так"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Не"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Скасаваць"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Налады галасавой пошты"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;не зададзена&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Галасавая пошта"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Налады аператара <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Служба"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Налады"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Не заданы&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Іншыя налады выкліку"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Набраць"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Выклік праз ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Каб адказаць, перацягніце направа"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Перацягніце ўлева, каб прымусова сцішыць сігнал выкліку"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Перацягніце налева, каб адхіліць"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Перацягніце направа, каб адказваць і"\n"ўтрымліваць актыўны выклік"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Перацягніце направа, каб адказаць і"\n"завяршыць актыўны выклік"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Перацягніце направа, каб адказаць i"\n"завяршыць выклік на ўтрыманні"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Адказаць"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Адхіліць"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Званкі праз правайдара <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"фатаграфія кантакта"</string>
     <string name="goPrivate" msgid="865837794424530980">"перайсці да прыватнай гаворкі"</string>
     <string name="selectContact" msgid="781975788478987237">"выбраць кантакт"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Налады iнтэрнэт-выклікаў"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Уліковыя запісы iнтэрнэт-тэлефаніі (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Уліковыя запісы"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Кіраваць уліковымі запісамі iнтэрнэт-тэлефаніі (SIP) і станам"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Прыём уваходных выклікаў"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Зніжае тэрмін службы батарэі"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Налада функцый апрацоўкі выклікаў"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Выкарыстанне iнтэрнэт-тэлефаніі"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Выкарыстанне iнтэрнэт-тэлефаніі (толькі Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Для ўсіх выклікаў, калі маецца сетка перадачы дадзеных"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Толькі для iнтэрнэт-выклікаў"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Пытацца для кожнага выкліку"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Для ўсіх выклікаў"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Аўтаматычная рэгістрацыя"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Выходны выклік праз SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Размясціць выклік"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Выкарыстоўваць уліковы запіс iнтэрнэт-тэлефаніі:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Заўсёды выкарыстоўваць, каб рабіць iнтэрнэт-выклікі"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Вы можаце выкарыстоўваць налады выклікаў, каб змяніць уліковы спіс iнтэрнэт-тэлефаніі, які выкарыстоўваецца па змаўчанні пры размяшчэнні выклікаў, выбраўшы іншы ўліковы запіс у наладах iнтэрнэт-выклікаў"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Вы можаце змяніць уліковы запіс iнтэрнэт-тэлефаніі, які выкарыстоўваецца па змаўчанні, у раздзеле \"Тэлефон &gt; Налады &gt; Налады iнтэрнэт-тэлефаніі\", на экране \"Ўліковыя запісы\"."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Выклік з сотавага тэлефона"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Інтэрнэт-выклік"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Няма ўліковага запісу iнтэрнэт-тэлефаніі"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"На гэтым тэлефоне няма ўліковых запісаў iнтэрнэт-тэлефаніі. Дадаць зараз?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"На гэтым тэлефоне няма выклікаў праз уліковыя запісы iнтэрнэт-тэлефаніі. Дадаць такі ўліковы запіс зараз?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Дадаць"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Дадаць уліковы запіс"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Выдаліць уліковы запіс"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Уліковыя запісы SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Захаванне ўліковага запісу..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Выдаленне ўліковага запісу"</string>
+    <string name="saving_account" msgid="52903398217017954">"Захаванне ўліковага запісу..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Выдаленне ўліковага запісу..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Захаваць"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Адхіліць"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Закрыць профіль"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"ОК"</string>
     <string name="close_profile" msgid="6886968271423155284">"Закрыць"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Першасны"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Зрабіць гэты ўліковы запіс маім першасным ўліковым запісам"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Выкарыстоўваецца для выходных выклікаў"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Адмысловыя налады"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Першасны ўліковы запіс. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Правяраецца стан..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Рэгістрацыя..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Усё яшчэ спрабую..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Не прымаць выклікі"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Рэгістрацыя ўліковага запісу спыненая, таму што няма падключэння да Інтэрнэту"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Рэгістрацыя ўліковага запісу спыненая, таму што няма падключэння да сеткі Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Няўдалая рэгістрацыя ўліковага запісу"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Прыём выклікаў"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Рэгістрацыя..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Спроба рэгістрацыі..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Выклікі не прымаюцца."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Рэгістрацыя ўліковага запісу спынена, таму што няма падключэння да Інтэрнэту."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Рэгістрацыя ўліковага запісу спынена, таму што няма падлучэння да Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Няўдалая рэгістрацыя ўліковага запісу."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Прыём выклікаў."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Няўдалая рэгістрацыя ўліковага запісу: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Спроба будзе паўтораная пазней"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Рэгістрацыя ўліковага запісу няўдалая: няправільнае імя карыстальніка або пароль"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Рэгістрацыя ўліковага запісу няўдалая: праверце імя сервера"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Гэты ўліковы запіс зараз выкарыстоўваецца прыкладаннем карыстальнiка <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Няўдалая рэгістрацыя ўліковага запісу: няправільнае імя карыстальніка або пароль."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Няўдалая рэгістрацыя ўліковага запісу: праверце імя сервера."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Гэты ўліковы запіс зараз выкарыстоўваецца прыкладаннем <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Інфармацыя ўліковага запісу SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Інфармацыя ўліковага запісу SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Сервер"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Нумар порта"</string>
     <string name="transport_title" msgid="8253139511847746640">"Тып транспарту"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Адправіць Keep-Alive"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Адпраўляць паведамленні Keep-Alive SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Аўтаматычная рэгістрацыя"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Рэгістраваць профіль аўтаматычна"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Усталяваць у якасці першаснага ўліковага запісу"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Выкарыстоўваецца для выходных выклікаў"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Дадатковыя налады"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"Дадатковы"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"... Націсніце, каб паказаць усё"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"... Дакраніцеся, каб схаваць усё"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"Поле <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> з\'яўляецца абавязковым, не можа быць пустым"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Нумар порта павінен быць у межах 1000 і 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Поле <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> з\'яўляецца абавязковым для запаўнення, яго нельга пакідаць пустым."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Порт павінен мець нумар ад 1000 да 65534"</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Няма падключэння да Інтэрнэту"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Няма падключэння да Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Каб зрабіць iнтэрнэт-выклік, спачатку праверце падключэнне да Інтэрнэту"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Вы павінны быць падключаны да сеткі Wi-Fi, каб рабіць iнтэрнэт-выклікі (выкарыстанне бесправадной сеткі і налад сеткі)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Каб зрабіць iнтэрнэт-выклік, спачатку праверце падключэнне да Інтэрнэту."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Каб рабіць iнтэрнэт-выклікі, вы павінны падключыцца да сеткі Wi-Fi (скарыстайцеся раздзелам \"Бесправадныя сеткі i налады\")."</string>
     <string name="no_voip" msgid="8901474054537199865">"Інтэрнэт-тэлефанія не падтрымліваецца"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Аўтаматычна"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Заўсёды адсылаць"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Я ператэлефаную."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Я патэлефаную пазней."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Не магу размаўляць. Набяры пазней."</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Паведамленне па змаўчаннi"</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Карыстальніцкае паведамленне"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Хуткія адказы"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Рэдагаваць хуткія адказы"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"зорка"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"нуль"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"фунт"</string>
-    <string name="description_search_button" msgid="239929880630534731">"пошук"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"набор"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"забой"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Уключаная гучная сувязь."</string>
@@ -715,9 +615,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Адхіліць"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вібрацыя"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вібрацыя"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Рынгтон"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Заўсёды"</item>
-    <item msgid="1595097872875714252">"Толькі ў рэжыме без гуку"</item>
+    <item msgid="1595097872875714252">"Толькі ў бязгучным рэжыме"</item>
     <item msgid="1458182414036878616">"Ніколі"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Мелодыя тэлефона"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вібрацыя падчас званка"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Набор гукаў сэнсарнай панэлі"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Рынгтон"</string>
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 52c3c731a..9296a8070 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Частен номер"</string>
     <string name="payphone" msgid="1931775086311769314">"Импулсен телефон"</string>
     <string name="onHold" msgid="9035493194749959955">"Задържане на обаждането"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Текущо обаждане"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Линията е заета"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Мрежата е заета"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Няма отговор – времето за изчакване изтече"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Няма връзка със сървъра"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Няма достъп до номера"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Неправилно потребителско име или парола"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Обаждане извън мрежата"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Обаждане извън мрежата"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Грешка в сървъра. Опитайте отново по-късно."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Няма сигнал"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Надвишено ограничение за ACM"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Радиото е изкл."</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Няма SIM карта или грешка на SIM картата"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Няма SIM карта или грешка в SIM картата"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Район без покритие"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Изходящите обаждания са ограничени от FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Изходящите ви обаждания са ограничени."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Не можете да провеждате изходящи обаждания, докато има забрана за обаждания."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Всички обаждания са ограничени от контрола за достъп."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Спешните обаждания са ограничени от контрола за достъп."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Нормалните обаждания са ограничени от контрола за достъп."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Телефонът е заключен до следващия цикъл на захранване."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Обаждането пропадна."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Обаждането прекъсна."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: Пренареждане."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Отказване на опция за услуга."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: Повторен опит за нареждане."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Достъпът не бе успешен."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Прекъснато."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Възможни са само спешни обаждания."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Невалиден номер"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Невалиден номер"</string>
     <string name="confCall" msgid="1904840547188336828">"Конферентно обаждане"</string>
     <string name="call_lost" msgid="317670617901479594">"Разговорът се загуби."</string>
-    <string name="retry" msgid="8462986804300767852">"Повторен опит"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Загубено обаждане"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI кодът бе стартиран"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD кодът се изпълнява…"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Слушалки с кабел"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Да се изпратят ли следните мелодии? "\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Мелодиите се изпращат"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Мелодиите се изпращат"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Изпращане"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Да"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Не"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Замяна на заместващия символ с:"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Замяна на заместващия символ със:"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Липсващ номер на гласова поща"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"На SIM картата няма съхранен номер за гласова поща."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Добавяне на номер"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Зарежда се…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Въведете PIN код, за да отблокирате SIM картата."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM картата е отключена"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Нов PIN за SIM карта"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Въведете пак новия PIN код за SIM картата, за да потвърдите"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Въведените от вас PIN кодове за SIM картата не са идентични. Моля, опитайте отново."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Въведете PUK код, за да отблокирате SIM картата"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Грешен PUK код!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Напред"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"SIM картата ви е отблокирана. Телефонът ви се отключва…"</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN за отключване на SIM мрежа"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Отключване"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Изпраща се заявка за отключване на мрежата..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Заявката за отключване на мрежата не бе успешна."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Отключването на мрежата бе успешно."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Настройки за обаждане с GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Настройки за обаждане в CDMА"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Имена на точки за достъп"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Допълнителни настройки само за обаждане в CDMА"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Настройки на мрежата за услуги"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Идентификация на обаждането"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Настройките се зареждат…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Скриване на номера при изходящи обаждания"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Показване на номера при изходящи обаждания"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Използване на стандартните ннастройки на оператора за извеждане на номера ми при изходящи обаждания"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Показва номер, при заета мрежа"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Пренасочва се към <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Деактивирано"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Операторът ви не поддържа деактивиране на пренасочване на обаждането по време на разговор."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Операторът ви не поддържа деактивиране на пренасочването на обаждания по време на разговор."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Пренасочване, когато няма отговор"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Показва номер, когато няма отговор"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Пренасочва се към <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Деактивирано"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Операторът ви не поддържа деактивиране на пренасочване на обаждането, когато телефонът ви не отговаря."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Операторът ви не поддържа деактивиране на пренасочването на обаждания, когато телефонът ви не отговаря."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Пренасочване, когато няма връзка"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Показва номер, когато няма достъп"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Пренасочва се към <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Деактивирано"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Операторът ви не поддържа деактивиране на пренасочване на обаждането, когато няма връзка с телефона."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Операторът ви не поддържа деактивиране на пренасочването на обаждания, когато няма връзка с телефона."</string>
     <string name="updating_title" msgid="6146755386174019046">"Настройки за обаждане"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Грешка в настройките за обаждане"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Извършва се четене на настройки…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Настройките се променят в първоначалното състояние…"</string>
     <string name="response_error" msgid="6674110501330139405">"Неочакван отговор от мрежата."</string>
     <string name="exception_error" msgid="7027667130619518211">"Грешка в мрежата или SIM картата."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Действията са разрешени само за фиксирани номера за набиране."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Моля, включете радиото, преди да разгледате настройките."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Настройката „Фиксирани номера за набиране“ на приложението ви Телефон е включена. В резултат на това някои функции, свързани с обажданията, не работят."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Включете радиото, преди да разгледате тези настройки."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Активиране"</string>
     <string name="disable" msgid="7274240979164762320">"Деактивиране"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Скриване на номера"</item>
     <item msgid="1108394741608734023">"Номерът да се показва"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Запазване на номера на гласовата поща"</string>
     <string name="vm_changed" msgid="380744030726254139">"Номерът за гласова поща бе променен."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Промяната на номера за гласовата поща не бе успешна."\n"Моля, свържете се с оператора си, ако проблемът не се отстрани."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Промяната на номера за пренасочване не бе успешна."\n"Моля, свържете се с оператора си, ако проблемът не се отстрани."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Номерът за гласовата поща не можа да се промени."\n"Свържете се с оператора си, ако проблемът не се отстрани."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Пренасочващият номер не можа да се промени."\n"Свържете се с оператора си, ако проблемът не се отстрани."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Текущите настройки за пренасочващи номера не можаха да бъдат извлечени и запазени."\n"Искате ли да превключите към новия доставчик?"</string>
     <string name="no_change" msgid="3186040086622435212">"Не бяха направени промени."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Избор на услугата за гласова поща"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Търсене на мрежи"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Грешка при търсенето на мрежи."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Извършва се регистрация на <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"SIM картата ви не позволява връзка към тази мрежа."</string>
-    <string name="connect_later" msgid="500090982903469816">"В момента няма връзка към тази мрежа. Моля, опитайте по-късно."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"SIM картата ви не позволява връзка с тази мрежа."</string>
+    <string name="connect_later" msgid="2308119155752343975">"В момента не може да се осъществи връзка с тази мрежа. Опитайте отново по-късно."</string>
     <string name="registration_done" msgid="495135664535876612">"Регистрация в мрежа."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Избиране на мрежов оператор"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Избиране на мрежов оператор"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Търсене на всички налични мрежи"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Да се избира автоматично"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Автоматичен избор на предпочитана мрежа"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Извършва се автоматична регистрация..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Автоматичен избор"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Автоматичен избор на предпочитана мрежа"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Регистрира се автоматично..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Режим на мрежата"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Промяна на операционния режим на мрежата"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Предпочитан режим на мрежата"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Предпочитан режим на мрежата: Само EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Предпочитан режим на мрежата: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Само EvDo"</item>
     <item msgid="454610224530856274">"CDMA без EvDo"</item>
-    <item msgid="8928247118825616081">"Авт. CDMA / EvDo"</item>
-    <item msgid="8595462903294812666">"Авт. GSM / WCDMA"</item>
+    <item msgid="648505122852496166">"Авт. CDMA/EvDo"</item>
+    <item msgid="7148247646407324800">"Авт. GSM/WCDMA"</item>
     <item msgid="5189164180446264504">"Само WCDMA"</item>
     <item msgid="5714714953966979187">"Само GSM"</item>
-    <item msgid="4775796025725908913">"Предпочита се GSM / WCDMA"</item>
+    <item msgid="8508331239546115206">"Предпочита се GSM/WCDMA"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Данните са активирани"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Роуминг на данни"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Свързване с услуги за данни при роуминг"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Свързване с услуги за данни при роуминг"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Изгубихте връзката за данни, защото сте оставили домашната си мрежа с изключен роуминг."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Изгубихте връзката за данни, защото сте излезли от домашната си мрежа при изключен роуминг."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Да се разреши ли роуминг на данни? Това може да доведе до висока такса за роуминг!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Опции за GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Опции на CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Използване на данни"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Правила за данните на оператора"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Използвани данни за текущия период"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Период за използване на данни"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Правила за скоростта на данните"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ от цикъла са изтекли"\n"Следващият период започва след <xliff:g id="USED_1">%2$d</xliff:g> дни (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Намаляване на скоростта на данните до <xliff:g id="USED">%1$d</xliff:g> Кб/сек, ако се превиши съответното ограничение"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Още информация за правилата за използване на данни на оператора ви"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS с клетъчно предаване"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS с клетъчно предаване"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS с клетъчно предаване"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS съобщението с клетъчно предаване е активирано"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"корейски"</item>
     <item msgid="1933212028684529632">"китайски"</item>
     <item msgid="1908428006803639064">"иврит"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Езици"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Времето в района"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Възможности за работа"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Възможностите за работа са активирани"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Възможностите за работа са деактивирани"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Лекар, здравна помощ и болница"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"„Лекар, здравна помощ и болница“ е активирано"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"„Лекар, здравна помощ и болница“ е деактивирано"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Лекар, здравна помощ и болница"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"„Лекар, здравна помощ и болница“ е активирано"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"„Лекар, здравна помощ и болница“ е деактивирано"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Технологични новини"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Технологични новини са активирани"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Технологичните новини са деактивирани"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"Само WCDMA"</item>
     <item msgid="8776934131146642662">"Само GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (предпочита се WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Да се използват само 2G мрежи"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Запазва батерията"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Избор на система"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Промяна на режима на роуминг на cdma"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Промяна на режима на роуминг на CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Избор на система"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Само „Начало“"</item>
     <item msgid="1205664026446156265">"Автоматично"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Режим на роуминг на CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Промяна на режима на роуминг на cdma"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Режим на роуминг на CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Само домашни мрежи"</item>
-    <item msgid="8174642753290624634">"Партньорски мрежи"</item>
-    <item msgid="2241951431403168661">"Всяка мрежа"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Абонамент за CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Предпочитания за мрежата на CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Още не е внедрено!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Предпочитания за мрежата на CDMA"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"Само CDMA"</item>
     <item msgid="2683555124647197574">"Само EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Абонамент за CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Промяна между RUIM/SIM и NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"абонамент"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Активиране на устройството"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Настройка на услугата за данни"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Управление на фиксираните номера за набиране"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Промяна на PIN за достъп до FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Управление на списъка с телефонни номера"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Гласова поверителност"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Гласова поверителност"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Активиране на разширен режим на поверителност"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Режим TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Активиране на режим TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Режим TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Задаване на режим TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Автоматичен повторен опит"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Активиране на режим „Авт. повторен опит“"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Автоматичен нов опит"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Активиране на режим „Автоматичен нов опит“"</string>
     <string name="menu_add" msgid="1882023737425114762">"Добавяне на контакт"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Редактиране на контакт"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Изтриване на контакта"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Въвеждане на PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Въведете PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Име"</string>
     <string name="number" msgid="7905950798349903858">"Номер"</string>
     <string name="save" msgid="4094274636321939086">"Запазване"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Изтриване на фиксирани номера за набиране"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Фиксираните номера за набиране се изтриват…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Фиксираните номера за набиране са изтрити."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN не е актуализирано – въвели сте неправилен PIN."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN не е актуализирано – номерът не може да надвишава 20 цифри."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN не бе актуализирано, защото сте въвели неправилен ПИН."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN не бе актуализирано, защото номерът не може да надвишава 20 цифри."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN не е актуализирано. PIN2 бе неправилен или телефонният номер бе отхвърлен."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Извършва се четене на данни от SIM картата…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Няма контакти в SIM картата ви."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Избиране на контакти за импортиране"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"За да импортирате контакти от SIM картата, моля, изключете самолетния режим."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"За да импортирате контакти от SIM картата, първо изключете самолетния режим."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Активиране/деактивиране на PIN за SIM карта"</string>
     <string name="change_pin" msgid="9174186126330785343">"Промяна на PIN за SIM карта"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN код за SIM карта:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Стар PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Нов PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Потвърждаване на новия PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Въведеният от вас стар PIN не е правилен. Моля, опитайте отново."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Въведените от вас PIN кодове не са идентични. Моля, опитайте отново."</string>
+    <string name="badPin" msgid="8955102849303984935">"Въведеният от вас стар ПИН не е правилен. Опитайте отново."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Въведените от вас ПИН кодове не са идентични. Опитайте отново."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Въведете PIN с четири до осем цифри."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Деактивиране на PIN кода за SIM карта"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Активиране на PIN за SIM карта"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Моля, изчакайте…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"PIN кодът за SIM картата бе активиран"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN кодът за SIM картата бе деактивиран"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Въведеният от вас PIN не беше правилен"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"PIN кодът за SIM картата бе променен успешно"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"ПИН кодът за SIM картата бе активиран."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"ПИН кодът за SIM картата бе деактивиран."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Въведеният ПИН не e правилен."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"ПИН кодът за SIM картата бе променен успешно."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Паролата не е правилна. SIM картата е заключена! Въведете PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Стар PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Нов PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Потвърждаване на новия PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Въведеният от вас PUK2 код не е правилен. Моля, опитайте отново."</string>
-    <string name="badPin2" msgid="515218795152422178">"Въведеният от вас стар PIN2 не е правилен. Моля, опитайте отново."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Въведените от вас PIN2s не са идентични. Моля, опитайте отново."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Въведеният от вас PUK2 код не е правилен. Опитайте отново."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Въведеният от вас стар PIN2 не е правилен. Опитайте отново."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Въведените от вас PIN2 кодове не са идентични. Опитайте отново."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Въведете PIN2 с четири до осем цифри."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Въведете PUK2 код с осем цифри."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 бе променен успешно"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 бе променен успешно."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Въвеждане на PUK2 код"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Паролата не е правилна. Моля, променете PIN2 и опитайте отново!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Паролата не е правилна. SIM картата е заключена! Въведете PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Паролата не е правилна. Променете PIN2 и опитайте отново."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Паролата не е правилна. SIM картата е заключена. Въведете PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Готово"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Конферентно обаждане<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Назад към обаждането"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Продължаване без SIM карта"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Не е намерена SIM карта. Моля, поставете SIM карта в телефона."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Отхвърляне"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Отключване"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"PIN кодът се удостоверява…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Номер за гласова поща"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Набиране"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Извършва се повторен опит"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Конферентно обаждане"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Вх. обаждане"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Изчакващо обаждане в Cdma"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Обаждането завърши"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Задържане на обаждането"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Приключване на разговора"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропуснати обаждания"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> пропуснати обаждания"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Пропуснато обаждане от <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Текущо обаждане от (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Текущо обаждане"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Задържане на обаждането"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Входящо обаждане"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Нова гласова поща"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Неизвестен номер за гласова поща"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Няма покритие"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Избраната мрежа (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) не е налична"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Затваряне"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Обратно обаждане"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Съобщение"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Първо изключете самолетния режим, за да може да осъществите обаждане."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Няма регистрация в мрежата."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Няма мобилна мрежа."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Обаждането не е изпратено, не е въведен валиден номер."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Обаждането не е изпратено."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Стартира се последователността MMI…"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Стартира на кодовата последователност на функцията…"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Неподдържана услуга."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Обажданията не могат да се превключат."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Обаждането не може да се отдели."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Спешно обаждане"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Радиото се включва…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Район без покритие, извършва се повторен опит..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Обаждането не е изпратено, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не е номер за спешен номер!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Обаждането не е изпратено, моля наберете спешен номер!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Обаждането не е извършено. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не е спешен номер!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Обаждането не е извършено. Наберете спешен номер!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Използвайте клавиатурата за набиране"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Сензорна тонална цифрова клавиатура"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Задържане"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Отмяна на задържането"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Край"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Клавиатура за набиране"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Скриване"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Говорител"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Без звук"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Добавяне на обаждане"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Обединяване на обаждания"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Размяна"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Текст на ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF мелодии"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF мелодии"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Настройване на дължината на мелодиите DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Нормална"</item>
     <item msgid="2883365539347850535">"Продължително"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Мрежово съобщение"</string>
+    <string name="network_message" msgid="4483886461245213802">"Мрежово съобщение"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Активиране на вашия телефон"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"За активиране на телефонните услуги трябва да направите специално обаждане. "\n\n"След като натиснете „Активиране“, чуйте предоставените инструкции за тази цел."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Докоснете „Активиране“, за да активирате телефона си в мобилната мрежа на оператора си. Така ще можете да осъществявате обаждания и да се свързвате с мобилни мрежи от данни."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Да се пропусне ли активацията?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ако пропуснете активирането, не може да осъществявате обаждания или свързване към мобилни мрежи с данни (възможно е свързване към мрежи с Wi-Fi). Докато не активирате телефона си, от вас ще се иска да го правите при всяко включване."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Пропускане"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Активиране"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Активиране"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Телефонът е активиран!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Телефонът е активиран."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Проблем с активацията"</string>
     <string name="ota_listen" msgid="162923839877584937">"Следвайте устните инструкции, докато чуете, че активацията е завършена."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Цифрова клавиатура"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Говорител"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Моля, изчакайте докато телефонът ви се програмира."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Програмирането не бе успешно"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Изчакайте, докато телефонът ви се програмира."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Програмирането не бе успешно"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Телефонът ви вече е активиран. Стартирането на услугата може да отнеме до 15 минути."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Телефонът ви не се активира. "\n"Потърсете място с по-добро покритие (близо до прозорец или навън). "\n\n"Опитайте отново или се обадете за отдела за обслужване на клиенти за още опции."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Телефонът ви не се активира. "\n"Намерете място с по-добро покритие (близо до прозорец или навън). "\n\n"Опитайте отново или се обадете за отдела за обслужване на клиенти за още опции."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ПРЕКАЛЕНО МНОГО ГРЕШКИ В SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Назад"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Опитайте отново"</string>
     <string name="ota_next" msgid="3904945374358235910">"Следващ"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Назад"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Влизане в режим на обратно обаждане при спешност"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Режим на обратно обаждане при спешност"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"Няма връзка за данни в продължение на <xliff:g id="COUNT">%s</xliff:g> минути"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Телефонът ще бъде в режим на обратно обаждане при спешност в продължение на <xliff:g id="COUNT">%s</xliff:g> минути. През това време не може да се използват приложения за връзка с данни. Искате ли да излезете сега?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Телефонът ще бъде в режим на обратно обаждане при спешност в продължение на <xliff:g id="COUNT">%s</xliff:g> минути. През това време не може да се използват приложения за връзка с данни. Искате ли да излезете сега?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Телефонът ще бъде в режим на спешно обратно обаждане в продължение на <xliff:g id="COUNT">%s</xliff:g> минута. През това време не може да се използват приложения за връзка с данни. Искате ли да излезете сега?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Телефонът ще бъде в режим на спешно обратно обаждане в продължение на <xliff:g id="COUNT">%s</xliff:g> минути. През това време не може да се използват приложения за връзка с данни. Искате ли да излезете сега?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Избраното действие не е налично в режим на обратно обаждане при спешност. Телефонът ще бъде в този режим в продължение на <xliff:g id="COUNT">%s</xliff:g> минута. Искате ли да излезете сега?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Избраното действие не е налично в режим на обратно обаждане при спешност. Телефонът ще бъде в този режим в продължение на <xliff:g id="COUNT">%s</xliff:g> минути. Искате ли да излезете сега?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Избраното действие не е налично в режим на обратно спешно обаждане. Телефонът ще бъде в този режим в продължение на <xliff:g id="COUNT">%s</xliff:g> минута. Искате ли да излезете сега?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Избраното действие не е налично в режим на спешно обратно обаждане. Телефонът ще бъде в този режим в продължение на <xliff:g id="COUNT">%s</xliff:g> минути. Искате ли да излезете сега?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Избраното действието не е налично по време на спешно обаждане"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Излизане от режим на обратно обаждане при спешност"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Избраното действие не е налично по време на спешно обаждане."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Излиза се от режим на спешно обратно обаждане"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Да"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Не"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Отхвърляне"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Настройки на гласовата поща"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;не е зададен&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Услуга за гласова поща"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Настройки за „<xliff:g id="PROVIDER_NAME">%s</xliff:g>“"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Услуга"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Настройка"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Не е зададено&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Други настройки за обаждане"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Набиране"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Обаждане чрез ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Плъзнете надясно за отговор"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Плъзнете наляво за заглушаване на звъненето"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Плъзнете наляво за отказ"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Плъзнете надясно за отговор и"\n"задържане на активно обаждане"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Плъзнете надясно за отговор и"\n"край на активно обаждане"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Плъзнете надясно за отговор и"\n"край на задържано обаждане"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Отговор"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Отхвърляне"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Обаждане чрез <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"снимка на контакта"</string>
     <string name="goPrivate" msgid="865837794424530980">"към частно"</string>
     <string name="selectContact" msgid="781975788478987237">"избиране на контакта"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Настройки за интернет обаждания"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Профили за интернет обаждания (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Профили"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Управление на профилите и състоянието на интернет обажданията (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Получаване на входящи обаждания"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Намалява живота на батерията"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Конфигуриране на опциите за обаждане"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Използване на интернет обаждания"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Използване на интернет обаждания (само при Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"За всички обаждания, когато е налице мрежа за данни"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Само за интернет обаждания"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Да се пита за всяко обаждане"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"За всички обаждания"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Автоматична регистрация"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Изходящо обаждане чрез SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Провеждане на обаждане"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Използване на профил за интернет обаждания:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Да се използва винаги за провеждане на интернет обаждания"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Можете да използвате настройките за обаждане, за да промените кой профил да се използва по подразбиране за интернет обаждания, като изберете друг в „Настройки за интернет обаждания“"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Можете да промените кой профил да се използва по подразбиране за интернет обаждания от екрана „Телефон“ &gt; „Настройки“ &gt; „Настройки за интернет обаждания“ &gt; „Профили“."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Обаждане по клетъчен телефон"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Интернет обаждане"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Няма профил за интернет обаждания"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Няма профили за интернет обаждания на този телефон. Искате ли да добавите сега?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Няма профили за интернет обаждания на този телефон. Искате ли да добавите сега?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Добавяне"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Добавяне на профил"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Премахване на профила"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Профили за SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Профилът се запазва..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Профилът се премахва..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Профилът се запазва..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Профилът се премахва..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Запазване"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Отхвърляне"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Затваряне на потребителския профил"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Затваряне"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Основен"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Нека това да бъде основният ми профил"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Използва се за изходящи обаждания"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Разширени настройки"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Основен профил. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Състоянието се проверява..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Извършва се регистрация..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Още се опитва..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Не се получават обаждания"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Регистрацията на профила спря, защото няма връзка с интернет"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Регистрацията на профила спря, защото няма връзка с Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Регистрацията на профила не бе успешна"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Получават се обаждания"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Регистрира се..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Още се опитва..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Не се получават обаждания."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Регистрирането на профила спря, защото няма връзка с интернет."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Регистрирането на профила спря, защото няма връзка с Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Профилът не бе регистриран успешно."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Получават се обаждания."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Регистрацията на профила не бе успешна: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Ще се опита по-късно"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Регистрацията на профила не бе успешна: Неправилно потребителско име или парола"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Регистрацията на профила не бе успешна: Проверете името на сървъра"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Този профил понастоящем се използва от приложението „<xliff:g id="ACCOUNT_OWNER">%s</xliff:g>“"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Профилът не бе регистриран успешно: Неправилно потребителско име или парола."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Профилът не бе регистриран успешно: Проверете името на сървъра."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Този профил понастоящем се използва от приложението <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Подробности за профила за SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Подробности за профила за SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Сървър"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Номер на порта"</string>
     <string name="transport_title" msgid="8253139511847746640">"Тип транспорт"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Изпращане на съобщение за проверка на връзката"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Изпращане на съобщения от SIP за проверка на връзката"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Автоматична регистрация"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Автоматично регистриране на потребителския профил"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Задаване като основен профил"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Използва се за изходящи обаждания"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Незадължителни настройки"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;По избор&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Докоснете за показване на всички"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Докоснете за скриване на всички"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"„<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>“ е задължително, трябва да се попълни"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Номерът на порта трябва да бъде между 1000 и 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"„<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>“ е задължително и трябва да се попълни."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Номерът на порта трябва да бъде между 1000 и 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Няма връзка с интернет"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Няма връзка с Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"За да проведете интернет обаждане, първо проверете връзката си с интернет"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"За интернет обаждания трябва да сте свързани с Wi-Fi мрежа (използвайте настройките за кабелна и безжична мрежа)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"За да проведете интернет обаждане, първо проверете връзката си с интернет."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"За интернет обаждания трябва да сте свързани с Wi-Fi мрежа (използвайте настройките за кабелна и безжична мрежа)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Интернет обажданията не се поддържат"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Автоматично"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Да се изпращат винаги"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Ще ви се обадя веднага обратно."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Ще ви се обадя по-късно."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Сега не мога да говоря. По-късно?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Персонализирано съобщение..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Персонализирано съобщение"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Бързи отговори"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Редактиране на бързи отговори"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"звездичка"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"нула"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"диез"</string>
-    <string name="description_search_button" msgid="239929880630534731">"търсене"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"набиране"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Високоговорителят бе активиран."</string>
@@ -715,9 +615,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Отхвърлям"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вибриране"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вибриране"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Мелодия"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Винаги"</item>
     <item msgid="1595097872875714252">"Само при тих режим"</item>
     <item msgid="1458182414036878616">"Никога"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Мелодия на телефона"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вибриране при звънене"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Тонове при набиране"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Мелодия"</string>
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 00490cb98..deb011f89 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Número privat"</string>
     <string name="payphone" msgid="1931775086311769314">"Telèfon de monedes"</string>
     <string name="onHold" msgid="9035493194749959955">"En espera"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Trucada actual"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Línia ocupada"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Xarxa ocupada"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"No hi ha resposta, s\'ha esgotat el temps d\'espera"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"No es pot accedir al servidor"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"No es pot contactar amb aquest número"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nom d\'usuari o contrasenya incorrectes"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Trucada des de fora de la xarxa"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Trucada des de fora de la xarxa"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Error del servidor. Torna-ho a provar més tard."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Sense senyal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Límit d\'ACM superat"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Ràdio desactivada"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Cap SIM o error de la SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Cap SIM o error de la SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Fora de l\'àrea de servei"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"FDN restringeix les trucades de sortida."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"No podeu fer trucades de sortida mentre la restricció de trucades estigui activa."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"No pots fer trucades de sortida mentre la restricció de trucades estigui activada."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Totes les trucades estan restringides pel control d\'accés."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Les trucades d\'emergència estan restringides pel control d\'accés."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Les trucades normals estan restringides pel control d\'accés."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: telèfon bloquejat fins el següent cicle d\'energia."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: trucada descartada."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: trucada interceptada."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: torna a ordenar."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: rebuig d\'opció de servei."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: ordre de reintents."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: s\'ha produït un error en accedir-hi."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: invalidat."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Només es poden fer trucades d\'emergència."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Número no vàlid"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Número no vàlid"</string>
     <string name="confCall" msgid="1904840547188336828">"Trucada de conferència"</string>
     <string name="call_lost" msgid="317670617901479594">"S\'ha perdut la trucada."</string>
-    <string name="retry" msgid="8462986804300767852">"Torna-ho a provar"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Trucada perduda"</string>
     <string name="ok" msgid="3811371167865772377">"D\'acord"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Codi MMI iniciat"</string>
     <string name="ussdRunning" msgid="485588686340541690">"S\'està executant el codi USSD..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Auricular amb cable"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Voleu enviar els codis següents?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"S\'estan enviant els tons"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"S\'estan enviant els tons"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Envia"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Sí"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"No"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Substitueix el caràcter comodí per"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Substitueix el caràcter comodí per"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Falta el número de correu de veu"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"No hi ha cap número de correu de veu emmagatzemat a la targeta SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Afegeix número"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"S\'està carregant…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Escriviu el codi PIN per desbloquejar la targeta SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM desbloquejada"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Codi PIN de la SIM nou"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Torneu a escriure el codi PIN de la SIM per confirmar-lo"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Els PIN de la SIM que heu escrit no coincideixen. Torneu-ho a provar."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Escriviu el codi PUK per desbloquejar la targeta SIM"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Codi PUK incorrecte"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Continua"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"La targeta SIM s\'ha desbloquejat. El telèfon s\'està desbloquejant..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN de desbloqueig de xarxa SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Desbloqueja"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"S\'està sol·licitant el desbloqueig de la xarxa..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Sol·licitud de desbloqueig de xarxa incorrecta."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Desbloqueig de la xarxa correcte."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Configuració de trucades GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Configuració de trucades CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Noms de punts d\'accés"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Configuració addicional de trucades només CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Configuració del servei de xarxa"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Identificació de trucada"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Carregant la configuració..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Número amagat en trucades sortints"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Número mostrat a les trucades de sortida"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Utilitza la configuració predeterminada de l\'operador per mostrar el meu número a les trucades de sortida"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Número quan comunica"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"S\'està desviant a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Desactivat"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"El teu operador no permet desactivar la desviació de trucades quan el telèfon està ocupat."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"El teu operador no permet desactivar la desviació de trucades quan el telèfon està ocupat."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Desvia quan no hi hagi resposta"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Número quan no hi ha resposta"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"S\'està desviant a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Desactivat"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"El teu operador no permet desactivar la desviació de trucades quan el telèfon no respon."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"El teu operador no permet desactivar la desviació de trucades quan el telèfon no respon."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Desvia quan no s\'hi pugui connectar"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Número quan no es pugui establir la connexió"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"S\'està desviant a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Desactivat"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"El teu operador no permet desactivar la desviació de trucades quan el telèfon no pot establir la trucada."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"El teu operador de telefonia mòbil no permet desactivar la desviació de trucades quan el telèfon no pot establir la trucada."</string>
     <string name="updating_title" msgid="6146755386174019046">"Configuració de trucada"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Error de configuració de trucada"</string>
     <string name="reading_settings" msgid="1920291699287055284">"S\'està llegint la configuració…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"S\'està tornant la configuració als valors originals…"</string>
     <string name="response_error" msgid="6674110501330139405">"Resposta inesperada de la xarxa."</string>
     <string name="exception_error" msgid="7027667130619518211">"Error de xarxa o de targeta SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Les operacions només es permeten a números de marcatge fixos."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Activeu la ràdio abans de visualitzar aquesta configuració."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"La configuració dels números de marcatge fix de l\'aplicació Telèfon està activada. En conseqüència, algunes funcions relacionades amb les trucades no funcionen."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Activa la ràdio abans de visualitzar aquesta configuració."</string>
     <string name="close_dialog" msgid="2365884406356986917">"D\'acord"</string>
     <string name="enable" msgid="1059008390636773574">"Activa"</string>
     <string name="disable" msgid="7274240979164762320">"Desactiva"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Amaga el número"</item>
     <item msgid="1108394741608734023">"Mostra el número"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Desa el número del correu de veu"</string>
     <string name="vm_changed" msgid="380744030726254139">"Número del correu de veu canviat."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"No s\'ha pogut canviar el número del correu de veu."\n"Contacteu amb l\'operador si el problema continua."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"No s\'ha pogut canviar el número de desviament de trucades."\n"Contacteu amb l\'operador si el problema continua."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"No s\'ha pogut canviar el número de bústia de veu."\n"Contacta amb el teu operador de telefonia mòbil si el problema continua."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"No s\'ha pogut canviar el número de desviació."\n"Contacta amb el teu operador de telefonia mòbil si el problema continua."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"No s\'ha pogut recuperar ni desar la configuració actual del número de desviació."\n"Vols canviar al proveïdor nou igualment?"</string>
     <string name="no_change" msgid="3186040086622435212">"No s\'ha fet cap canvi."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Trieu un servei de correu de veu"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Cerca xarxes"</string>
     <string name="network_query_error" msgid="6828516148953325006">"S\'ha produït un error en cercar xarxes."</string>
     <string name="register_on_network" msgid="9055203954040805084">"S\'està registrant a <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"La targeta SIM no permet connectar-se a aquesta xarxa."</string>
-    <string name="connect_later" msgid="500090982903469816">"En aquests moments no es pot connectar a la xarxa. Torneu-ho a provar més tard."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"La targeta SIM no et permet connectar-te a aquesta xarxa."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Ara mateix no es pot connectar a aquesta xarxa. Torna-ho a provar més tard."</string>
     <string name="registration_done" msgid="495135664535876612">"Registrat a la xarxa."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Seleccioneu un operador de xarxa"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Selecciona un operador de xarxa"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Cerca totes les xarxes disponibles"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Selecció automàtica"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Selecciona automàticament la xarxa preferida"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Registre automàtic..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Selecció automàtica"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Selecciona automàticament la xarxa preferida"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Registre automàtic..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Mode de xarxa"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Canvia el mode de funcionament de la xarxa"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Mode de xarxa preferit"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Mode de xarxa preferit: només EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Mode de xarxa preferit: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Només EvDo"</item>
     <item msgid="454610224530856274">"CDMA sense EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo autom."</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA autom."</item>
+    <item msgid="648505122852496166">"CDMA/EvDo automàtic"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA automàtic"</item>
     <item msgid="5189164180446264504">"Només WCDMA"</item>
     <item msgid="5714714953966979187">"Només GSM"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA preferit"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA preferit"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Dades activades"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Itinerància de dades"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Connecta\'t als serveis de dades en itinerància"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Connecta\'t als serveis de dades en itinerància"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Heu perdut la connectivitat de dades perquè heu abandonat la xarxa local amb la itinerància de dades desactivada."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Has perdut la connectivitat de dades perquè has abandonat la xarxa local amb la itinerància de dades desactivada."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Voleu permetre la itinerància de dades? Els costos poden ser molt alts."</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Opcions de GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Opcions de CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Ús de dades"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Política de dades de l\'operador"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Dades utilitzades al període actual"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Període d\'ús de dades"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Política de velocitat de dades"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ del cicle transcorregut"\n"El període següent comença d\'aquí a <xliff:g id="USED_1">%2$d</xliff:g> dies (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"La velocitat de dades es redueix a <xliff:g id="USED">%1$d</xliff:g> kbps si se supera el límit d\'ús de dades"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Més informació sobre la política d\'us de dades de la xarxa mòbil de l\'operador"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS de difusió de cel·la"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS de difusió de cel·la"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS de difusió de cel·la"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS de difusió de cel·la activat"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Coreà"</item>
     <item msgid="1933212028684529632">"Xinès"</item>
     <item msgid="1908428006803639064">"Hebreu"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Idiomes"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Informació del temps local"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Oportunitats de feina"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Oportunitats de feina activades"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Oportunitats de feina desactivades"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Medicina, salut i hospitals"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Medicina, salut i hospitals activat"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Medicina, salut i hospitals desactivat"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Medicina, salut i hospitals"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Medicina, salut i hospitals activat"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Medicina, salut i hospitals desactivat"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Notícies de tecnologia"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Notícies de tecnologia activades"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Notícies de tecnologia desactivades"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"Només WCDMA"</item>
     <item msgid="8776934131146642662">"Només GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (preferència: WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Utilitza només les xarxes 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Estalvia bateria"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Selecció del sistema"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Canvia el mode d\'itinerància cdma"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Canvia el mode d\'itinerància CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selecció del sistema"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Només local"</item>
     <item msgid="1205664026446156265">"Automàtic"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Mode d\'itinerància CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Canvia el mode d\'itinerància cdma"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Mode d\'itinerància CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Només xarxes locals"</item>
-    <item msgid="8174642753290624634">"Xarxes afiliades"</item>
-    <item msgid="2241951431403168661">"Qualsevol xarxa"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Subscripció CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Preferències de xarxa CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Encara no s\'ha implementat."</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Preferències de xarxa CDMA"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"Només CDMA"</item>
     <item msgid="2683555124647197574">"Només EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Subscripció CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Canvia entre RUIM/SIM i NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"subscripció"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activació del dispositiu"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configuració del servei de dades"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Gestiona els números de marcatge fix"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Canvia el PIN per a l\'accés FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Gestiona la llista de números de telèfon"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Privadesa de veu"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Privadesa de veu"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Activa el mode de privadesa millorat"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Mode TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Activa el mode TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Mode TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Defineix el mode TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Reintent automàtic"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Activa el mode de reintent automàtic"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Reintent automàtic"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Activa el mode de reintent automàtic"</string>
     <string name="menu_add" msgid="1882023737425114762">"Afegeix un contacte"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Edita el contacte"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Suprimeix el contacte"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Introduïu el PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Escriu el PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Nom"</string>
     <string name="number" msgid="7905950798349903858">"Número"</string>
     <string name="save" msgid="4094274636321939086">"Desa"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Suprimeix el número de marcatge fix"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"S\'està suprimint el número de marcatge fix..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Número de marcatge fix suprimit."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN no actualitzat: heu introduït un PIN incorrecte."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN no actualitzat: el número no pot superar els 20 dígits."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN no s\'ha actualitzat ja que has escrit un PIN incorrecte."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN no s\'ha actualitzat ja que el nombre no pot excedir els 20 dígits."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"El número FDN no s\'ha actualitzat. El PIN2 no és correcte o bé s\'ha rebutjat el número de telèfon."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"S\'està llegint de la targeta SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"No hi ha cap contacte a la targeta SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Seleccioneu contactes per importar-los"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Per importar contactes des de la targeta SIM, apaga el mode avió."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Per importar contactes des de la targeta SIM, primer has de desactivar el mode d\'avió."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Activa/Desactiva el PIN de la SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Canvia el PIN de la SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN de la SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"PIN antic"</string>
     <string name="newPinLabel" msgid="207488227285336897">"PIN nou"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Confirmeu el PIN nou"</string>
-    <string name="badPin" msgid="4154316827946559447">"El PIN antic que heu escrit no és correcte. Torneu-ho a provar."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Els PIN que heu introduït no coincideixen. Torneu-ho a provar."</string>
+    <string name="badPin" msgid="8955102849303984935">"El PIN antic que has escrit no és correcte. Torna-ho a provar."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Els PIN que has introduït no coincideixen. Torna-ho a provar."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Escriviu un PIN que tingui de 4 a 8 números."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Desactiva el PIN de la SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Activació del PIN de la SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Espereu-vos…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"PIN de la SIM activat"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN de la SIM desactivat"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"El PIN que heu escrit és incorrecte"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"PIN de la SIM canviat correctament"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN de la SIM activat."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN de la SIM desactivat."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"El PIN que has escrit és incorrecte."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"El PIN de la SIM s\'ha modificat correctament."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Contrasenya incorrecta; s\'ha bloquejat la SIM. S\'ha sol·licitat el codi PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 antic"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 nou"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Confirmeu el PIN2 nou"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"El PUK2 que heu escrit no és correcte. Torneu-ho a provar."</string>
-    <string name="badPin2" msgid="515218795152422178">"El PIN2 antic que heu escrit no és correcte. Torneu-ho a provar."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Els PIN2 que heu introduït no coincideixen. Torneu-ho a provar."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"El PUK2 que has escrit no és correcte. Torna-ho a provar."</string>
+    <string name="badPin2" msgid="1041576234483629991">"El PIN2 antic que has escrit no és correcte. Torna-ho a provar."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Els PIN2 que has escrit no coincideixen. Torna-ho a provar."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Escriviu un PIN2 que tingui de 4 a 8 números."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Escriviu un PUK2 de 8 números."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 canviat correctament"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"El PIN2 s\'ha modificat correctament."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Escriviu el codi PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Contrasenya incorrecta. Canvieu el PIN2 i torneu-ho a provar."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Contrasenya incorrecta; s\'ha bloquejat la SIM. S\'ha sol·licitat el codi PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Contrasenya incorrecta. Canvia el PIN2 i torna-ho a provar."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Contrasenya incorrecta; s\'ha bloquejat la SIM. S\'ha sol·licitat el codi PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Fet"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Trucada de conferència <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Torna a la trucada"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Continua sense cap targeta SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"No s\'ha trobat cap targeta SIM. Inseriu-ne una al telèfon."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Omet"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Desbloqueja"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"S\'està autenticant el PIN…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número del correu de veu"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"S\'està marcant"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"S\'està tornant a provar"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Trucada de conferència"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Trucada entrant"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Trucada en espera CDMA"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Trucada finalitzada"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"En espera"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"S\'està penjant"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Trucades perdudes"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> trucades perdudes"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Trucada perduda de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Trucada actual (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Trucada en procés"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"En espera"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Trucada entrant"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Correu de veu nou"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número del correu de veu desconegut"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Sense servei"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"La xarxa seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) no està disponible"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Penja"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Torna la trucada"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Missatge"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Per fer una trucada, primer apagueu el mode d\'avió."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"No registrat a la xarxa."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"La xarxa mòbil no està disponible."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"No s\'ha enviat la trucada perquè no s\'ha introduït cap número vàlid."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"No s\'ha enviat la trucada."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"S\'està iniciant la seqüència MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"S\'està iniciant la seqüència de codis de funció..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Servei no compatible."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"No es poden canviar les trucades."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"No es pot separar la trucada."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Trucada d\'emergència"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"S\'està activant la ràdio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Fora de l\'àrea de servei; s\'està tornant a provar..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"No s\'ha enviat la trucada, perquè <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no és un número d\'emergència."</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Trucada no enviada. Marqueu un número d\'emergència."</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"No s\'ha enviat la trucada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no és un número d\'emergència."</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Trucada no enviada. Marca un número d\'emergència."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilitzeu el teclat per marcar"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Teclat de tons"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Posa en espera"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Allibera"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Final"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Teclat"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Amaga"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Altaveu"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Silencia"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Afegeix una trucada"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Combina les trucades"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Canvia"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Text ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Tons DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Tons DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Defineix la durada dels tons DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Llarg"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Missatge de xarxa"</string>
+    <string name="network_message" msgid="4483886461245213802">"Missatge de xarxa"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activació del telèfon"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Cal fer una trucada especial per activar el servei del telèfon. "\n\n"Després de prémer \"Activa\", escolteu les instruccions proporcionades per activar el telèfon."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Toqueu \"Activa\" per fer una trucada especial que activa el telèfon a la xarxa mòbil de l\'operador per tal que pugueu fer trucades i connectar-vos a les xarxes de dades mòbils."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Voleu ometre l\'activació?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Si ometeu l\'activació, no podreu fer trucades ni connectar-vos a xarxes de dades mòbils (tot i que podreu connectar-vos a xarxes Wi-fi). Fins que activeu el telèfon, se us demanarà que ho feu cada cop que l\'engegueu."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Omet"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Activa"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Activa"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"El telèfon s\'ha activat."</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"El telèfon està activat."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problema d\'activació"</string>
     <string name="ota_listen" msgid="162923839877584937">"Seguiu les instruccions parlades fins que escolteu que s\'ha completat l\'activació."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Teclat"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Altaveu"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Espereu-vos mentre es programa el telèfon."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programació incorrecta"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Espera mentre es programa el telèfon."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programació incorrecta"</string>
     <string name="ota_successful" msgid="1880780692887077407">"El telèfon s\'ha activat. El servei pot trigar fins a 15 minuts en iniciar-se."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"El telèfon no s\'ha activat. "\n"Pot ser que hàgiu de trobar una àrea amb millor cobertura (a prop d\'una finestra o a l\'exterior). "\n\n"Torneu-ho a provar o truqueu al servei d\'atenció al client per a més opcions."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"El telèfon no s\'ha activat. "\n"Pot ser que t\'hagis de desplaçar a una zona amb més cobertura (a prop d\'una finestra o a l\'exterior). "\n\n"Torna-ho a provar o truca al servei d\'atenció al client per obtenir més opcions."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ERRORS SPC EN EXCÉS"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Enrere"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Torna-ho a provar"</string>
     <string name="ota_next" msgid="3904945374358235910">"Següent"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Enrere"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"S\'ha entrat al mode de crida de retorn d\'emergència"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Mode de crida de retorn d\'emergència"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"No hi ha hagut connexió de dades durant <xliff:g id="COUNT">%s</xliff:g> minuts"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"El telèfon estarà en el mode de crida de retorn d\'emergència durant <xliff:g id="COUNT">%s</xliff:g> minut. En aquest mode no es poden utilitzar aplicacions que facin servir una connexió de dades. Voleu sortir ara?"</item>
-    <item quantity="other" msgid="3231879566243957821">"El telèfon estarà en el mode de crida de retorn d\'emergència durant <xliff:g id="COUNT">%s</xliff:g> minuts. En aquest mode no es poden utilitzar aplicacions que facin servir una connexió de dades. Voleu sortir ara?"</item>
+    <item quantity="one" msgid="8060210887681426682">"El telèfon estarà en mode de devolució de trucades d\'emergència durant <xliff:g id="COUNT">%s</xliff:g> minut. Mentre estigui en aquest mode, no es podran utilitzar aplicacions que utilitzin una connexió de dades. En vols sortir ara?"</item>
+    <item quantity="other" msgid="8617116564023933114">"El telèfon estarà en mode de devolució de trucades d\'emergència durant <xliff:g id="COUNT">%s</xliff:g> minuts. Mentre estigui en aquest mode, no es podran utilitzar aplicacions que utilitzin una connexió de dades. En vols sortir ara?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"L\'acció seleccionada no està disponible en mode de crida de retorn d\'emergència. El telèfon estarà en aquest mode durant <xliff:g id="COUNT">%s</xliff:g> minut. Voleu sortir ara?"</item>
-    <item quantity="other" msgid="3489076611710869904">"L\'acció seleccionada no està disponible en mode de crida de retorn d\'emergència. El telèfon estarà en aquest mode durant <xliff:g id="COUNT">%s</xliff:g> minuts. Voleu sortir ara?"</item>
+    <item quantity="one" msgid="2585506997024726599">"L\'acció seleccionada no està disponible mentre estiguis en mode de devolució de trucades d\'emergència. El telèfon estarà en aquest mode durant <xliff:g id="COUNT">%s</xliff:g> minuts. En vols sortir ara?"</item>
+    <item quantity="other" msgid="6115622137771382224">"L\'acció seleccionada no està disponible mentre estiguis en mode de devolució de trucades d\'emergència. El telèfon estarà en aquest mode durant <xliff:g id="COUNT">%s</xliff:g> minuts. En vols sortir ara?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"L\'acció seleccionada no està disponible en una trucada d\'emergència"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"S\'està sortint del mode de crida de retorn d\'emergència"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"L\'acció seleccionada no està disponible en una trucada d\'emergència."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"S\'està sortint del mode de devolució de trucades d\'emergència"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Sí"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"No"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Omet"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Configuració del correu de veu"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;no definit&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Servei de correu de veu"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Configuració de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Servei"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Configuració"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;No definit&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Altres opcions de configuració de trucades"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Marca"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"S\'està trucant mitjançant ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Arrossegueu-ho cap a la dreta per respondre"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Arrossegueu-ho cap a l\'esquerra per silenciar el timbre"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Arrossegueu-ho cap a l\'esquerra per rebutjar-la"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Arrossegueu-ho cap a la dreta per respondre i"\n"posar en espera la trucada activa"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Arrossegueu-ho cap a la dreta per respondre i"\n"finalitzar la trucada activa"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Arrossegueu-ho cap a la dreta per respondre i"\n"finalitzar la trucada en espera"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Respon"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Rebutja"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Trucada mitjançant <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"foto de contacte"</string>
     <string name="goPrivate" msgid="865837794424530980">"passa a privat"</string>
     <string name="selectContact" msgid="781975788478987237">"selecciona el contacte"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Configuració de les trucades per Internet"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Comptes per a trucades per Internet (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Comptes"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Gestió dels comptes i estats de les trucades per Internet (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Recepció de trucades entrants"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Redueix la durada de la bateria"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Configura les opcions de trucada"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Utilitza la trucada per Internet"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Utilitza la trucada per Internet (només Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Per a totes les trucades quan hi hagi disponible una xarxa de dades"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Només per a trucades per Internet"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Pregunta-ho per a cada trucada"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Per a totes les trucades"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Registre automàtic"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Trucada sortint per SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Fes una trucada"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Utilitza el compte per a trucades per Internet:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Utilitza-ho sempre per fer trucades per Internet"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Pots utilitzar les Opcions de trucada per canviar quin compte de trucada per Internet s\'ha d\'utilitzar de forma predeterminada en fer trucades, seleccionant un compte diferent a les opcions de trucades per Internet"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Pots canviar quin compte vols utilitzar com a opció predeterminada per a les trucades per Internet del telèfon a la pantalla &gt; Configuració &gt; Configuració de les trucades per Internet &gt; Comptes."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Trucada amb telèfon mòbil"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Trucada per Internet"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"No hi ha cap compte per a trucades per Internet"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"No hi ha comptes per a trucades per Internet en aquest telèfon. Vols afegir-ne un ara?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"En aquest telèfon no hi ha comptes de trucades per Internet. Vols afegir-n\'hi un?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Afegeix"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Afegeix un compte"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Elimina el compte"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Comptes SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"S\'està desant el compte..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"S\'està eliminant el compte..."</string>
+    <string name="saving_account" msgid="52903398217017954">"S\'està desant el compte..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"S\'està eliminant el compte..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Desa"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Descarta"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Tanca el perfil"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"D\'acord"</string>
     <string name="close_profile" msgid="6886968271423155284">"Tanca"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Principal"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Defineix-lo com el meu compte principal"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Utilitzat per a trucades sortints"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Configuració avançada"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Compte principal. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"S\'està comprovant l\'estat..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"S\'està registrant..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Encara s\'està provant..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"No s\'estan rebent trucades"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"S\'ha aturat el registre del compte perquè no hi ha connexió a Internet"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"S\'ha aturat el registre del compte perquè no hi ha una connexió Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"S\'ha produït un error en registrar el compte"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Recepció de trucades"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"S\'està registrant..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Encara s\'està provant..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"No s\'estan rebent trucades."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"S\'ha aturat el registre del compte perquè no hi ha connexió a Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"S\'ha aturat el registre del compte perquè no hi ha cap connexió Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"S\'ha produït un error en registrar el compte."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"S\'estan rebent trucades."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"S\'ha produït un error en registrar el compte: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); ho tornarem a provar més tard"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"S\'ha produït un error en el registre del compte: el nom d\'usuari o la contrasenya no són correctes"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"S\'ha produït un error en el registre del compte: comprova el nom del servidor"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"L\'aplicació <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> està utilitzant aquest compte actualment"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"S\'ha produït un error en el registre del compte: el nom d\'usuari o la contrasenya no són correctes."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"S\'ha produït un error en el registre del compte: comprova el nom del servidor."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"L\'aplicació <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> està utilitzant aquest compte actualment."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Detalls del compte SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Detalls del compte SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Servidor"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Número de port"</string>
     <string name="transport_title" msgid="8253139511847746640">"Tipus de transport"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Envia mantenir en línia"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Envia missatges SIP de manteniment"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Registre automàtic"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Registra automàticament el perfil"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Defineix com a compte principal"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Utilitzat per a trucades sortints"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Configuració opcional"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Opcional&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Toca per mostrar-ho tot"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Toca per amagar-ho tot"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> és obligatori, no es pot deixar en blanc"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"El número de port hauria de ser entre 1000 i 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> és obligatori, no es pot deixar en blanc."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"El número de port hauria de ser entre 1000 i 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"No hi ha connexió a Internet"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"No hi ha connexió Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Per fer una trucada per Internet, en primer lloc comprova la connexió a Internet"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Has d\'estar connectat a una xarxa Wi-Fi per fer trucades per Internet (utilitza la configuració Wi-Fi i Xarxa)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Per fer una trucada per Internet, primer comprova la connexió a Internet."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Has d\'estar connectat a una xarxa Wi-Fi per fer trucades per Internet (utilitza la configuració Wi-Fi i Xarxa)"</string>
     <string name="no_voip" msgid="8901474054537199865">"No s\'admeten les trucades per Internet"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automàtic"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Envia sempre"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Et truco de seguida."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Et truco més tard."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Ara no puc parlar. Truques després?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Missatge personalitzat..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Personalitza el missatge"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respostes ràpides"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edita les respostes ràpides"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"estrella"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"coixinet"</string>
-    <string name="description_search_button" msgid="239929880630534731">"cerca"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marca"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"retrocés"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Altaveu activat."</string>
@@ -715,9 +615,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Rebutja"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibra"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibra"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"To"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Sempre"</item>
     <item msgid="1595097872875714252">"Només quan està en silenci"</item>
     <item msgid="1458182414036878616">"Mai"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"To del telèfon"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibra  quan soni"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tons en tocar el teclat per marcar"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"To"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 631eaef38..97912e50f 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Soukromé číslo"</string>
     <string name="payphone" msgid="1931775086311769314">"Veřejný telefon"</string>
     <string name="onHold" msgid="9035493194749959955">"Přidržený hovor"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Aktuální hovor"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Linka je obsazená."</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Síť je zaneprázdněna."</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Bez odezvy, vypršel časový limit"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server je nedostupný"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Volané číslo je nedostupné"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nesprávné uživatelské jméno nebo heslo"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Volání z vně sítě"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Volání z vně sítě"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Chyba serveru: Zkuste to znovu později."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Není signál."</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Byl dosažen limit ACM."</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Rádio je vypnuto"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Karta SIM chybí nebo nefunguje."</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"SIM karta chybí nebo nefunguje."</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Nepokrytá oblast."</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Odchozí hovory jsou omezeny na povolená telefonní čísla."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Pokud je zapnuto blokování hovorů, nelze provádět odchozí hovory."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Pokud je zapnuto blokování hovorů, nelze provádět odchozí hovory."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Všechny hovory jsou omezeny řízením přístupu."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Tísňová volání jsou omezena řízením přístupu."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Běžné hovory jsou omezeny řízením přístupu."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Telefon uzamčen do dalšího cyklu nabíjení."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Hovor přerušen."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Hovor přerušen."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: přeuspořádání."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Odmítnutí možnosti služby."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: Pořadí opakování."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Chyba přístupu."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Zabráněno."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Jsou možná jen tísňová volání."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Neplatné číslo"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Neplatné číslo"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferenční hovor"</string>
     <string name="call_lost" msgid="317670617901479594">"Hovor byl ztracen."</string>
-    <string name="retry" msgid="8462986804300767852">"Zkusit znovu"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Hovor byl ztracen"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Kód MMI byl spuštěn"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Kód USSD je spuštěn..."</string>
@@ -69,37 +57,28 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Kabelová náhlavní soupr."</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Odeslat následující tóny?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Odesílání tónů"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Odesílání tónů"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Odeslat"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Ano"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Ne"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Nahradit zástupný znak znakem"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Nahradit zástupné znaky jinými znaky"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Chybí číslo hlasové schránky"</string>
-    <string name="no_vm_number_msg" msgid="1300729501030053828">"Na kartě SIM není uloženo žádné číslo hlasové schránky."</string>
+    <string name="no_vm_number_msg" msgid="1300729501030053828">"Na SIM kartě není uloženo žádné číslo hlasové schránky."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Přidat číslo"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Načítání..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Kartu SIM odblokujete zadáním kódu PIN:"</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"Karta SIM byla odblokována."</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Nový kód PIN karty SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Potvrďte nový kód PIN karty SIM"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Zadané kódy PIN karty SIM se neshodují. Zkuste to znovu."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Kartu SIM odblokujete zadáním kódu PUK"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Zadaný kód PUK je nesprávný."</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Pokračovat"</string>
-    <string name="puk_unlocked" msgid="2284912838477558454">"Karta SIM byla odblokována. Telefon se odblokovává..."</string>
-    <string name="label_ndp" msgid="780479633159517250">"Kód PIN odblokování sítě pro kartu SIM"</string>
+    <string name="puk_unlocked" msgid="2284912838477558454">"SIM karta byla odblokována. Telefon se odblokovává..."</string>
+    <string name="label_ndp" msgid="780479633159517250">"Kód PIN odblokování sítě pro SIM kartu"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Odemknout"</string>
     <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Zavřít"</string>
     <string name="requesting_unlock" msgid="6412629401033249351">"Žádost o odblokování sítě..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Požadavek na odblokování sítě se nezdařil."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Síť byla úspěšně odblokována."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Nastavení hovorů GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Nastavení hovorů CDMA"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Názvy přístupových bodů"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Názvy přístupových bodů (APN)"</string>
     <string name="settings_label" msgid="3876743539816984008">"Nastavení sítě"</string>
     <string name="voicemail" msgid="8693759337917898954">"Hlasová schránka"</string>
+    <string name="mwi_notification_title">Upozornění příchozí zprávy</string>
+    <string name="mwi_notification_summary">Pro zobrazení zprávy počkejte na zvukové upozornění hlasové schránky</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"HS:"</string>
     <string name="networks" msgid="8873030692174541976">"Síťoví operátoři"</string>
     <string name="call_settings" msgid="6112441768261754562">"Nastavení hovorů"</string>
@@ -109,6 +88,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Další nastavení hovorů, pouze CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Nastavení síťové služby"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"ID volajícího"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Načítání nastavení..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Číslo je v odchozích hovorech skryto"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Číslo je v odchozích hovorech zobrazeno"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Zobrazení čísla v odchozích hovorech se bude řídit výchozím nastavením operátora"</string>
@@ -127,26 +107,26 @@
     <string name="messageCFB" msgid="3711089705936187129">"Číslo při obsazené lince"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Hovory budou přesměrovány na číslo <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Vypnuto"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Váš operátor neumožňuje deaktivaci přesměrování, je-li telefon obsazen."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Váš operátor neumožňuje deaktivovat přesměrování hovorů, když je telefon obsazen."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Přesměrovat – nečinnost"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Číslo při nečinnosti"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Hovory budou přesměrovány na číslo <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Vypnuto"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Váš operátor neumožňuje deaktivaci přesměrování, jestliže telefon neodpovídá."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Váš operátor neumožňuje deaktivovat přesměrování hovorů, když telefon neodpovídá."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Přesměrovat – nedostupnost"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Číslo při nedostupnosti"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Hovory budou přesměrovány na číslo <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Vypnuto"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Váš operátor neumožňuje deaktivaci přesměrování, je-li telefon nedostupný."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Váš operátor neumožňuje deaktivovat přesměrování hovorů, když je telefon nedostupný."</string>
     <string name="updating_title" msgid="6146755386174019046">"Nastavení hovorů"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Chyba nastavení hovorů"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Načítání nastavení..."</string>
     <string name="updating_settings" msgid="8171225533884883252">"Probíhá aktualizace nastavení..."</string>
     <string name="reverting_settings" msgid="4752151682666912828">"Probíhá vrácení předchozích nastavení…"</string>
     <string name="response_error" msgid="6674110501330139405">"Neočekávaná odpověď sítě."</string>
-    <string name="exception_error" msgid="7027667130619518211">"Došlo k chybě sítě nebo karty SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Operace lze provádět pouze na povolená telefonní čísla."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Před zobrazením nastavení zapněte rádio."</string>
+    <string name="exception_error" msgid="7027667130619518211">"Došlo k chybě sítě nebo SIM karty."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Nastavení Povolených telefonních čísel v aplikaci vašeho telefonu je zapnuto. Z tohoto důvodu nefungují některé funkce spojené s voláním."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Před zobrazením těchto nastavení prosím zapněte bezdrátový modul."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Povolit"</string>
     <string name="disable" msgid="7274240979164762320">"Vypnout"</string>
@@ -156,10 +136,9 @@
     <item msgid="7876195870037833661">"Skrýt číslo"</item>
     <item msgid="1108394741608734023">"Zobrazit číslo"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Uložit číslo hlasové schránky"</string>
     <string name="vm_changed" msgid="380744030726254139">"Číslo hlasové schránky bylo změněno."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Změna čísla hlasové schránky se nezdařila."\n"Pokud problém přetrvává, obraťte se na svého operátora."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Změna čísla pro přesměrování se nezdařila."\n"Pokud problém přetrvává, obraťte se na svého operátora."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Číslo hlasové schránky se nepodařilo změnit."\n"Pokud problém přetrvá, obraťte se na operátora."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Číslo pro přesměrování se nepodařilo změnit."\n"Pokud tento problém přetrvá, obraťte se na operátora."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Načtení a uložení aktuálních nastavení čísla přesměrování se nezdařilo."\n"Chcete přesto změnit poskytovatele?"</string>
     <string name="no_change" msgid="3186040086622435212">"Nebyly provedeny žádné změny."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Zvolte službu hlasové schránky"</string>
@@ -171,14 +150,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Vyhledávání sítí"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Při vyhledávání sítí došlo k chybě."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Probíhá registrace v síti <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Vaše karta SIM nepovoluje připojení k této síti."</string>
-    <string name="connect_later" msgid="500090982903469816">"K této síti se nyní nelze připojit. Zkuste to znovu později."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Vaše SIM karta nepovoluje připojení k této síti."</string>
+    <string name="connect_later" msgid="2308119155752343975">"K této síti se momentálně nelze přihlásit. Zkuste to znovu později."</string>
     <string name="registration_done" msgid="495135664535876612">"Přihlášení k síti bylo úspěšné."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Umožňuje vybrat síťového operátora"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Vybrat síťového operátora"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Vyhledá všechny dostupné sítě"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Automatická volba"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Upřednostňovaná síť je volena automaticky"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automatická registrace..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Zvolit automaticky"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Automaticky zvolit upřednostňovanou síť"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automatická registrace..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Režim sítě"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Změnit provozní režim sítě"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Upřednostňovaný režim sítě"</string>
@@ -191,31 +170,43 @@
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Upřednostňovaný režim sítě: pouze CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Upřednostňovaný režim sítě: pouze EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Upřednostňovaný režim sítě: LTE / CDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_summary">Upřednostňované sítě: LTE / GSM/WCDMA</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary">Upřednostňované sítě: LTE/CDMA/EvDo</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">Upřednostňované sítě: LTE/CMDA/EvDo / GSM/WCDMA</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Pouze EvDo"</item>
     <item msgid="454610224530856274">"CDMA bez EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo – automaticky"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA – automaticky"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo – automaticky"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA – automaticky"</item>
     <item msgid="5189164180446264504">"Pouze WCDMA"</item>
     <item msgid="5714714953966979187">"Pouze GSM"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA – upřednostňováno"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA – upřednostňováno"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item>Pouze LTE</item>
+    <item>LTE/CMDA/EvDo/GSM/WCDMA</item>
+    <item>LTE/CDMA/EvDo</item>
+    <item>LTE/CDMA</item>
+    <item>CDMA/EvDo automaticky</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_lte_gsm">
+      <item>LTE/GSM/WCDMA</item>
+      <item>Upřednostňovat GSM/WCDMA</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Dat. přenosy aktivovány"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Aktivuje datový přístup prostřednictvím mobilní sítě"</string>
-    <string name="roaming" msgid="8871412572928323707">"Datové služby při roamingu"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"Datové služby se mohou připojovat při roamingu"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"Datové služby se mohou připojovat při roamingu"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Připojení datových služeb bylo přerušeno, protože jste opustili domovskou síť a datové služby při roamingu máte vypnuty."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Opravdu chcete povolit datové služby při roamingu? Vystavujete se nebezpečí vysokých poplatků."</string>
+    <string name="data_enable_summary" msgid="5022018967714633874">"Aktivovat datový přístup prostřednictvím mobilní sítě"</string>
+    <string name="roaming" msgid="8871412572928323707">"Datový roaming"</string>
+    <string name="roaming_enable" msgid="7331106985174381987">"Používat datové služby při roamingu"</string>
+    <string name="roaming_disable" msgid="1843417228755568110">"Používat datové služby při roamingu"</string>
+    <string name="national_roaming">Vnitrostátní datový roaming</string>
+    <string name="national_roaming_enable">Používat datové služby při vnitrostátním roamingu</string>
+    <string name="national_roaming_disable">Nepoužívat datové služby při vnitrostátním roamingu</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Datové připojení bylo přerušeno, protože jste opustili domovskou síť a máte vypnutý datový roaming."</string>
+    <string name="roaming_warning" msgid="7820963598559553967">"Opravdu chcete povolit datový roaming? Vystavujete se nebezpečí vysokých poplatků."</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Možnosti GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Možnosti CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Využití dat"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Zásady operátora pro data"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Data využitá v aktuálním období"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Období využití dat"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Zásady pro přenosovou rychlost"</string>
@@ -226,7 +217,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Uplynulo <xliff:g id="USED_0">%1$d</xliff:g>٪ cyklu"\n"Počet dní do začátku dalšího období: <xliff:g id="USED_1">%2$d</xliff:g> (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"V případě překročení limitu využití dat se přenosová rychlost sníží na <xliff:g id="USED">%1$d</xliff:g> kb/s"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Další informace o zásadách využití dat v mobilní síti vašeho mobilního operátora"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS Cell Broadcast"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS Cell Broadcast"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS Cell Broadcast"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS Cell Broadcast povoleny"</string>
@@ -242,7 +232,7 @@
     <string name="maintenance_enable" msgid="8566636458770971189">"Údržba povolena"</string>
     <string name="maintenance_disable" msgid="7340189100885066077">"Údržba zakázána"</string>
     <string name="general_news_settings" msgid="4968779723948432978">"Obecné zprávy"</string>
-    <string name="bf_news_settings" msgid="3935593091894685267">"Obchodní a finanční zprávy"</string>
+    <string name="bf_news_settings" msgid="3935593091894685267">"Ekonomika a finance"</string>
     <string name="sports_news_settings" msgid="7649399631270052835">"Sportovní zprávy"</string>
     <string name="entertainment_news_settings" msgid="5051153952959405035">"Zprávy z kultury"</string>
     <string name="enable_disable_local" msgid="7890281063123416120">"Místní"</string>
@@ -267,15 +257,6 @@
     <item msgid="1858401628368130638">"korejština"</item>
     <item msgid="1933212028684529632">"čínština"</item>
     <item msgid="1908428006803639064">"hebrejština"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Jazyky"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Místní počasí"</string>
@@ -305,9 +286,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Pracovní příležitosti"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Pracovní příležitosti povoleny"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Pracovní příležitosti zakázány"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Lékařství, zdraví a nemocnice"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Lékařství, zdraví a nemocnice povoleny"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Lékařství, zdraví a nemocnice zakázány"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Lékařství, zdraví a nemocnice"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Lékařství, zdraví a nemocnice – povoleno"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Lékařství, zdraví a nemocnice – zakázáno"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Technologické zprávy"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Technologické zprávy povoleny"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Technologické zprávy zakázány"</string>
@@ -322,35 +303,17 @@
     <item msgid="8912042051809329533">"Pouze WCDMA"</item>
     <item msgid="8776934131146642662">"Pouze GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (preferováno WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Používat pouze sítě 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Šetří baterii"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Výběr systému"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Změnit režim roamingu CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Změnit režim roamingu CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Výběr systému"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Pouze plocha"</item>
     <item msgid="1205664026446156265">"Automaticky"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Režim roamingu CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Změnit režim roamingu CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Režim roamingu CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Pouze domovské sítě"</item>
-    <item msgid="8174642753290624634">"Partnerské sítě"</item>
-    <item msgid="2241951431403168661">"Jakákoli síť"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Odběr CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Nastavení sítě CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Dosud neimplementováno"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Nastavení sítě CDMA"</string>
@@ -359,21 +322,11 @@
     <item msgid="6143696847467859795">"Pouze CDMA"</item>
     <item msgid="2683555124647197574">"Pouze EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Odběr CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Přepnout mezi RUIM/SIM a NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"odběr"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivovat zařízení"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Nastavit datovou službu"</string>
@@ -390,18 +343,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Umožňuje spravovat povolená telefonní čísla"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Umožňuje změnit kód PIN pro přístup k povoleným telefonním číslům"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Správa telefonního seznamu"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Ochrana soukromí hlasové pošty"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Ochrana osobních údajů v hlasové poště"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Povolit režim vylepšené ochrany soukromí"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Režim TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Povolit režim TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Režim TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Nastavit režim TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Automaticky zkusit znovu"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Aktivovat režim Automaticky zkusit znovu"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Automaticky zkusit znovu"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Aktivovat režim Automaticky zkusit znovu"</string>
     <string name="menu_add" msgid="1882023737425114762">"Přidat kontakt"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Upravit kontakt"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Smazat kontakt"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Zadat kód PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Zadejte kód PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Jméno"</string>
     <string name="number" msgid="7905950798349903858">"Číslo"</string>
     <string name="save" msgid="4094274636321939086">"Uložit"</string>
@@ -414,56 +365,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Smazat povolené telefonní číslo"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Mazání povoleného telefonního čísla..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Povolené telefonní číslo bylo smazáno."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Povolené telefonní číslo nebylo aktualizováno: Zadali jste nesprávný kód PIN."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"Povolené telefonní číslo nebylo aktualizováno: Délka čísla nemůže přesahovat 20 číslic."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Čtení z karty SIM..."</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"Na kartě SIM nejsou žádné kontakty."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Funkce Povolená telefonní čísla nebyla aktualizována, protože jste zadali chybný kód PIN."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Funkce Povolená telefonní čísla nebyla aktualizována, protože číslo nesmí obsahovat více než 20 číslic."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Povolená telefonní čísla (FDN) nebyla aktualizována. Kód PIN2 byl nesprávný nebo bylo telefonní číslo odmítnuto."</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Čtení ze SIM karty..."</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"Na SIM kartě nejsou žádné kontakty."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Vybrat kontakty pro import"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Chcete-li importovat kontakty z karty SIM, vypněte prosím režim V letadle."</string>
-    <string name="enable_pin" msgid="5422767284133234860">"Povolit nebo zakázat kód PIN karty SIM"</string>
-    <string name="change_pin" msgid="9174186126330785343">"Změnit kód PIN karty SIM"</string>
-    <string name="enter_pin_text" msgid="8532615714751931951">"Kód PIN karty SIM:"</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Chcete-li importovat kontakty ze SIM karty, vypněte nejprve režim V letadle."</string>
+    <string name="enable_pin" msgid="5422767284133234860">"Povolit nebo zakázat PIN SIM karty"</string>
+    <string name="change_pin" msgid="9174186126330785343">"Změnit PIN SIM karty"</string>
+    <string name="enter_pin_text" msgid="8532615714751931951">"PIN SIM karty:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Původní kód PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Nový kód PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Potvrďte nový kód PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Původní kód PIN byl zadán nesprávně. Zkuste to znovu."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Zadané kódy PIN se neshodují. Zkuste to znovu."</string>
+    <string name="badPin" msgid="8955102849303984935">"Původní kód PIN byl zadán nesprávně. Zkuste to znovu."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Zadané kódy PIN se neshodují. Zkuste to znovu."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Zadejte kód PIN o délce 4-8 číslic."</string>
-    <string name="disable_sim_pin" msgid="3992926931620188855">"Zakázat kód PIN karty SIM"</string>
-    <string name="enable_sim_pin" msgid="5803702443844458831">"Povolit kód PIN karty SIM"</string>
+    <string name="disable_sim_pin" msgid="3992926931620188855">"Zakázat PIN SIM karty"</string>
+    <string name="enable_sim_pin" msgid="5803702443844458831">"Povolit PIN SIM karty"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Čekejte prosím..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"Kód PIN karty SIM je povolen."</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"Kód PIN karty SIM je zakázán."</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Zadaný kód PIN je nesprávný."</string>
-    <string name="pin_changed" msgid="9000716792724195093">"Kód PIN karty SIM byl úspěšně změněn."</string>
-    <string name="puk_requested" msgid="3898394204193202803">"Neplatné heslo, karta SIM je zablokována. Zadejte kód PUK2."</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN SIM karty je povolen."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN SIM karty je zakázán."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Zadaný kód PIN není správný."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"PIN SIM karty byl úspěšně změněn."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Neplatné heslo, SIM karta je zablokována. Zadejte kód PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Původní kód PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nový kód PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Potvrdit nový kód PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Původní kód PUK2 byl zadán nesprávně. Zkuste to znovu."</string>
-    <string name="badPin2" msgid="515218795152422178">"Původní kód PIN2 byl zadán nesprávně. Zkuste to znovu."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Zadané kódy PIN2 se neshodují. Zkuste to znovu."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Zadaný kód PUK2 není správný. Zkuste to znovu."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Zadaný původní kód PIN2 není správný. Zkuste to znovu."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Zadané kódy PIN2 se neshodují. Zkuste to znovu."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Zadejte kód PIN2 o délce 4-8 číslic."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Zadejte 8místný kód PUK2."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"Kód PIN2 byl úspěšně změněn."</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"Kód PIN2 byl úspěšně změněn."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Zadejte kód PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Heslo je nesprávné. Změňte kód PIN2 a zkuste to znovu."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Neplatné heslo, karta SIM je zablokována. Zadejte kód PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Heslo není správné. Změňte kód PIN2 a zkuste to znovu."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Neplatné heslo, SIM karta je zablokována. Je požadován kód PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Hotovo"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenční hovor <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Zpět k hovoru"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Pokračovat bez karty SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Karta SIM nebyla nalezena. Vložte do telefonu kartu SIM."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Zavřít"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Odemknout"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Ověřování kódu PIN..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Číslo hlasové schránky"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Vytáčení"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Nový pokus"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferenční hovor"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Příchozí hovor"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Čekající hovor CDMA"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Hovor ukončen"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Přidržený hovor"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Zavěšování"</string>
@@ -473,7 +418,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Zmeškané hovory"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Zmeškané hovory: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>."</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Zmeškaný hovor od volajícího <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>."</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Aktuální hovor (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Probíhající hovor"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Přidržený hovor"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Příchozí hovor"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nová hlasová zpráva"</string>
@@ -482,13 +427,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Číslo hlasové schránky je neznámé."</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Žádný signál"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Vybraná síť (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) není k dispozici"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Zavěsit"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Zavolat zpět"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Zpráva"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Chcete-li telefonovat, vypněte nejprve režim V letadle."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Přihlášení k síti nebylo úspěšné."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilní síť je nedostupná."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Hovor nelze spojit, nebylo zadáno platné číslo."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Hovor nebyl spojen."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Spouštění sekvence MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Spouštění sekvence kódu funkce…"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nepodporovaná služba."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Hovory nelze přepnout."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Hovor nelze oddělit."</string>
@@ -500,18 +447,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Tísňové volání"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Zapínání rádia..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Nepokrytá oblast, opakování pokusu..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Hovor nelze spojit, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> není číslo nouzového volání."</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Hovor nebyl spojen, vytočte číslo tísňového volání."</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Hovor nelze spojit, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> není číslo nouzového volání."</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Hovor nebyl spojen. Vytočte prosím číslo tísňového volání."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Číslo vytočíte pomocí klávesnice."</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Tónová klávesnice"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Přidržet"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Pokračovat"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Ukončit"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Číselník"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Skrýt"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Hlasitě"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Ztlumit"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Přidat hovor"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Spojit hovory"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Zaměnit"</string>
@@ -520,7 +462,7 @@
     <string name="onscreenAudioText" msgid="1710087112800041743">"Zvuk"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"Importovat"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"Importovat vše"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"Importování kontaktů z karty SIM"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"Importování kontaktů ze SIM karty"</string>
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"Import z kontaktů"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Naslouchátka"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Zapnout režim kompatibility s naslouchátkem"</string>
@@ -530,36 +472,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Text ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Tóny DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Tóny DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Nastavit délku tónů DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normální"</item>
     <item msgid="2883365539347850535">"Dlouhé"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Zpráva sítě"</string>
+    <string name="network_message" msgid="4483886461245213802">"Zpráva sítě"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktivujte svůj telefon"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"K aktivaci telefonní služby je potřeba uskutečnit speciální hovor. "\n\n"Stiskněte tlačítko Aktivovat a aktivujte telefon podle pokynů, které vám budou sděleny."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Dotkněte se tlačítka Aktivovat. Uskutečníte tak zvláštní hovor, kterým telefon aktivujete v mobilní síti svého operátora, abyste mohli volat a připojovat se k mobilním datovým sítím."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Přeskočit aktivaci?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Pokud přeskočíte aktivaci, nemůžete volat ani se připojovat k mobilním datovým sítím (můžete se ale připojit k sítím WiFi). Dokud svůj telefon neaktivujete, bude se zobrazovat výzva k aktivaci při každém zapnutí."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Přeskočit"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktivovat"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktivovat"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Telefon je aktivován."</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefon je aktivován."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problém s aktivací"</string>
     <string name="ota_listen" msgid="162923839877584937">"Postupujte podle hlasových pokynů, dokud nebudete informováni o dokončení aktivace."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Klávesnice"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Hlasitě"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Počkejte prosím, než bude telefon naprogramován."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programování se nezdařilo"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Počkejte prosím, než bude telefon naprogramován."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programování se nezdařilo"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Váš telefon je nyní aktivován. Spuštění služby může trvat až 15 minut."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Váš telefon nebyl aktivován."\n"Možná bude nutné vyhledat oblast s lepším pokrytím (blízko okna nebo venku). "\n\n"Zkuste to znovu nebo kontaktujte oddělení zákaznických služeb, kde získáte další možnosti."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Váš telefon nebyl aktivován."\n"Možná bude nutné vyhledat místo s lepším pokrytím (blízko okna nebo venku). "\n\n"Zkuste to znovu nebo kontaktujte oddělení zákaznických služeb, kde získáte další možnosti."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"PŘÍLIŠ MNOHO SELHÁNÍ CERTIFIKÁTŮ SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Zpět"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Zkuste to znovu"</string>
     <string name="ota_next" msgid="3904945374358235910">"Další"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Zpět"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"Dialog ukončení režimu tísňového zpětného volání"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Byl aktivován režim tísňového zpětného volání"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Režim tísňového zpětného volání"</string>
@@ -569,87 +506,71 @@
     <item quantity="other" msgid="3122217344579273583">"Žádné datové připojení po dobu <xliff:g id="COUNT">%s</xliff:g> min"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Telefon bude v režimu tísňového zpětného volání po dobu <xliff:g id="COUNT">%s</xliff:g> min. V tomto režimu nelze použít žádné aplikace využívající datové připojení. Chcete režim ukončit nyní?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Telefon bude v režimu tísňového zpětného volání po dobu <xliff:g id="COUNT">%s</xliff:g> min. V tomto režimu nelze použít žádné aplikace využívající datové připojení. Chcete režim ukončit nyní?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Telefon bude v režimu tísňového zpětného volání po dobu <xliff:g id="COUNT">%s</xliff:g> minuty. Dokud je telefon v tomto režimu, nelze použít žádnou aplikaci, která využívá datové připojení. Chcete tento režim ukončit?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Telefon bude v režimu tísňového zpětného volání po dobu <xliff:g id="COUNT">%s</xliff:g> minut. Dokud je telefon v tomto režimu, nelze použít žádnou aplikaci, která využívá datové připojení. Chcete tento režim ukončit?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Vybraná akce není v režimu tísňového zpětného volání dostupná. Telefon bude v tomto režimu po dobu <xliff:g id="COUNT">%s</xliff:g> min. Chcete režim ukončit nyní?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Vybraná akce není v režimu tísňového zpětného volání dostupná. Telefon bude v tomto režimu po dobu <xliff:g id="COUNT">%s</xliff:g> min. Chcete režim ukončit nyní?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Vybraná akce není v režimu tísňového zpětného volání dostupná. Telefon bude v tomto režimu po dobu <xliff:g id="COUNT">%s</xliff:g> minuty. Chcete aplikaci nyní ukončit?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Vybraná akce není v režimu tísňového zpětného volání dostupná. Telefon bude v tomto režimu po dobu <xliff:g id="COUNT">%s</xliff:g> minut. Chcete tento režim nyní ukončit?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Během tísňového volání není vybraná akce k dispozici"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Ukončení režimu tísňového zpětného volání"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Během tísňového volání není vybraná akce k dispozici."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Ukončení režimu tísňového zpětného volání"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Ano"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Ne"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Zavřít"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Nastavení hlasové schránky"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;nenastaveno&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Služba hlasové schránky"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Nastavení pro poskytovatele <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Služba"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Konfigurace"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nenastaveno&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Další nastavení hovorů"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Vytočit"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Volání prostřednictvím ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Přetažením doprava hovor přijmete"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Přetažením doleva ztlumíte vyzvánění"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Přetažením doleva hovor odmítnete"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Přetažením doprava hovor přijmete"\n"a aktivní přidržíte"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Přetažením doprava hovor přijmete"\n"a aktivní ukončíte"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Přetažením doprava hovor přijmete"\n"a přidržený ukončíte"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Přijmout"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Odmítnout"</string>
+    <string name="dialer_ui_settings_title">Nastavení číselníku</string>
+    <string name="dialer_ui_settings_summary">Nastavení číselníku</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Volání prostřednictvím poskytovatele <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"fotografie kontaktu"</string>
     <string name="goPrivate" msgid="865837794424530980">"přepnout na soukromé"</string>
     <string name="selectContact" msgid="781975788478987237">"vybrat kontakt"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Nastavení internetových hovorů"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Účty pro internetové hovory (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Účty"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Správa a stav účtů pro internetové hovory"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Přijímat příchozí hovory"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Snižuje výdrž baterie"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Konfigurace možností hovorů"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Použít internetový hovor"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Použít internetový hovor (pouze s připojením Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Pro všechny hovory, pokud je k dispozici datová síť"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Pouze pro internetové hovory"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Pokaždé se zeptat"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Pro všechny hovory"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Automatická registrace"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Odchozí hovory pomocí protokolu SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Uskutečnit hovor"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Použít účet pro internetové hovory:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Vždy používat pro internetové hovory"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"V části Nastavení hovorů můžete pomocí možnosti Nastavení internetových hovorů změnit účet pro internetové hovory, který chcete při volání používat jako výchozí."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Výchozí účet pro internetové hovory můžete změnit na obrazovce Telefon &gt; Nastavení &gt; Nastavení internetových hovorů &gt; Účty."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Hovor z mobilního telefonu"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Internetový hovor"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Žádný účet pro internetové hovory:"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"V tomto telefonu nejsou žádné účty pro internetové hovory. Chcete účet přidat?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"V tomto telefonu není žádný účet pro internetové volání. Chcete jej nyní vytvořit?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Přidat"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Přidat účet"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Odebrat účet"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Účty SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Ukládání účtu..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Odebírání účtu..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Ukládání účtu..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Odebírání účtu..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Uložit"</string>
-    <string name="sip_menu_discard" msgid="524075892158789701">"Zrušit"</string>
+    <string name="sip_menu_discard" msgid="524075892158789701">"Zahodit"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Zavřít profil"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Zavřít"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Primární"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Nastavit tento účet jako primární"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Použito pro odchozí hovory"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Upřesnit nastavení"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Primární účet. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Kontrola stavu..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Probíhá registrace..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Probíhají další pokusy..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Hovory nejsou přijímány"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Registrace účtu byla zastavena, protože není k dispozici připojení k internetu"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Registrace účtu byla zastavena, protože není k dispozici připojení Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Registrace účtu se nezdařila"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Příjem hovorů"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registrace..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Stále funkci zkouším..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Hovory nejsou přijímány."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Registrace účtu byla zastavena, protože není k dispozici připojení k internetu."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Registrace účtu byla zastavena, protože není k dispozici připojení Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Registrace účtu se nezdařila."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Příjem hovorů."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Registrace účtu se nezdařila: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Pokus bude opakován později"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Registrace účtu se nezdařila: nesprávné uživatelské jméno nebo heslo"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Registrace účtu se nezdařila. Zkontrolujte prosím název serveru."</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Tento účet je aktuálně používán aplikací <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Registrace účtu se nezdařila: nesprávné uživatelské jméno nebo heslo."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Registrace účtu se nezdařila. Zkontrolujte prosím název serveru."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Tento účet je aktuálně používán aplikací <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Podrobnosti o účtu SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Podrobnosti o účtu SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Server"</string>
@@ -660,9 +581,6 @@
     <string name="port_title" msgid="5952939408078626657">"Číslo portu"</string>
     <string name="transport_title" msgid="8253139511847746640">"Typ přenosu"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Odesílat zprávy pro zachování připojení"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Odesílat zprávy protokolu SIP pro zachování připojení"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Automatická registrace"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Automaticky zaregistrovat profil"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Nastavit jako primární účet"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Použito pro odchozí hovory"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Nepovinná nastavení"</string>
@@ -673,12 +591,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Nepovinné&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Výběrem této položky zobrazíte všechna nastavení"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Výběrem této položky skryjete všechna nastavení"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"Pole <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> je vyžadováno. Nelze je ponechat prázdné."</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Číslo portu by mělo být od 1000 do 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Pole <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> je povinné. Nelze je ponechat prázdné."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Číslo portu by mělo být od 1000 do 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Žádné připojení k internetu"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Připojení Wi-Fi není k dispozici"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Chcete-li uskutečnit internetový hovor, zkontrolujte, zda jste připojeni k internetu"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Abyste mohli uskutečnit internetový hovor musíte být připojeni k síti WiFi (viz část Nastavení bezdrátového připojení a sítě)."</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Chcete-li uskutečnit internetový hovor, zkontrolujte, zda jste připojeni k internetu."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Abyste mohli uskutečnit internetový hovor, musíte být připojeni k síti Wi-Fi (použijte sekci Nastavení bezdrátového připojení a sítě)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Internetové hovory nejsou podporovány"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automaticky"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Odesílat vždy"</string>
@@ -687,7 +605,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Zavolám zpátky."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Zavolám později."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Nemůžu telefonovat, volejte jindy."</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Vlastní zpráva..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Vlastní zpráva"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Rychlé odpovědi"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Upravit rychlé odpovědi"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +623,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"hvězdička"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"nula"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
-    <string name="description_search_button" msgid="239929880630534731">"vyhledat"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"vytáčení"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Reproduktor je zapnutý."</string>
@@ -715,9 +632,30 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Odmítnout"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrace"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrace"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Vyzvánění"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Vždy"</item>
     <item msgid="1595097872875714252">"Pouze v tichém režimu"</item>
     <item msgid="1458182414036878616">"Nikdy"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Vyzváněcí tón telefonu"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrace při vyzvánění"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tóny při dotyku číselníku"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Vyzvánění"</string>
+    <string name="perm_change_mobile_network">Změnit typ sítě (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Aplikace s tímto oprávněním může kdykoliv změnit mezi 2G data a 3G data. 3G je rychlejší, ale náročnější na využití baterie a také může stát více peněz.</string>
+    <string name="noise_suppression_title">Potlačení šumu</string>
+    <string name="noise_suppression_summary">Povolit potlačení šumu při volání</string>
+    <string name="phone_number_label">Moje telefonní číslo</string>
+    <string name="phone_number_summary">Nastavit telefonní číslo tohoto zařízení</string>
+    <string name="advanced_setting">Pokročilé nastavení</string>
+    <string name="keep_proximity_sensor_on">Nevypínat senzor přiblížení</string>
+    <string name="keep_proximity_sensor_on_sum">Nevypínat senzor přiblížení během volání pomocí headsetu</string>
+    <string name="lockscreen_if_call_ends_with_screenoff">Uzamknout po skončení hovoru</string>
+    <string name="lockscreen_if_call_ends_with_screenoff_sum">Automaticky uzamknout pokud skončí hovor a obrazovka je vypnutá</string>
+    <string name="vibrate_outgoing">Vibrace při odpovědi</string>
+    <string name="vibrate_call_waiting">Vibrace při dalším hovoru</string>
+    <string name="vibrate_hangup">Vibrace po zavěšení</string>
+    <string name="vibrate_45">Vibrovat každých 45 sekund</string>
+    <string name="vibrate_45_sum">Při odchozím hovoru vibrovat každých 45 sekund.</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index c02670868..669555124 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Privat nummer"</string>
     <string name="payphone" msgid="1931775086311769314">"Betalingstelefon"</string>
     <string name="onHold" msgid="9035493194749959955">"Ventende"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Aktuelt opkald"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Linjen er optaget"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Netværket er optaget"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Intet svar, timeout"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Serveren er ikke tilgængelig"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nummeret er ikke tilgængeligt"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Forkert brugernavn eller adgangskode"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Opkald fra netværk"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Opkald uden for netværk"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Serverfejl. Prøv igen senere."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Der er intet signal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-grænsen er overskredet"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Slå radio fra"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Der er intet SIM-kort, eller der er SIM-kortfejl"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Der er intet SIM-kort, eller der er SIM-kortfejl"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Området er uden for netværksdækning"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Udgående opkald er begrænset af faste opkaldsnumre."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Du kan ikke foretage udgående opkald, mens opkaldsspærring er slået til."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Du kan ikke foretage udgående opkald, mens opkaldsspærring er slået til."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Alle opkald er begrænset af adgangskontrol."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Nødopkald er begrænset af adgangskontrol."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Normale opkald er begrænset af adgangskontrol."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Telefon låst indtil strømcyklus."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Opkald opgivet."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Opkald aflyttet."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: genkald."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Servicemulighed afvist."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: prøv genkald igen."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Adgangen mislykkedes."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Flyttet."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Det er kun muligt at foretage nødopkald."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Ugyldigt nummer"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Ugyldigt antal"</string>
     <string name="confCall" msgid="1904840547188336828">"Telefonmøde"</string>
     <string name="call_lost" msgid="317670617901479594">"Opkaldet er mistet."</string>
-    <string name="retry" msgid="8462986804300767852">"Prøv igen"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Mistet opkald"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-nummer er startet"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-kode kører ..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Headset med ledning"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Send følgende toner?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Sender toner"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Sender toner"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Send"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Ja"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Nej"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Erstat jokertegnet med"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Erstat jokertegnet med"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Manglende voicemailnummer"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Der er ikke gemt noget voicemailnummer på SIM-kortet."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Tilføj nummer"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Indlæser ..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Indtast PIN-kode for at låse SIM-kortet op."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM-kortet er låst op"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Ny PIN-kode til SIM-kortet"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Indtast ny PIN-kode igen for at bekræfte"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"De PIN-koder til SIM-kortet, du indtastede, stemmer ikke overens. Prøv igen."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Indtast PUK-kode for at låse SIM-kortet op."</string>
-    <string name="badPuk" msgid="3213017898690275965">"Forkert PUK-kode."</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Fortsæt"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Blokeringen af dit SIM-kort er blevet ophævet. Din telefon låser op ..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN-kode til oplåsning af SIM-netværket"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Lås op"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Anmoder om oplåsning af netværk ..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Anmodningen om oplåsning af netværk mislykkedes."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Netværket blev låst op."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI-nummer"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Indstillinger for GSM-opkald"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Indstillinger for CDMA-opkald"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Navn på adgangspunkt"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Yderligere indstillinger for opkald er for kun CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Indstillinger for netværkstjeneste"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Opkalds-id"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Indlæser indstillinger…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Nummer skjules i udgående opkald"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Nummer vises i udgående opkald"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Brug udbyderens standardindstillinger til at vise mine numre i udgående opkald"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Nummer ved optaget"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Viderestiller til <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Deaktiveret"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Din udbyder understøtter ikke, deaktivering af viderestilling af opkald, når telefonen er optaget."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Din udbyder understøtter ikke deaktivering af viderestilling af opkald, når telefonen er optaget."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Viderestil ved ubesvaret"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Nummer ved ubesvaret"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Viderestiller til <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Deaktiveret"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Din udbyder understøtter ikke, deaktivering af viderestilling af opkald, når telefonen ikke bliver taget."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Dit mobilselskab understøtter ikke deaktivering af viderestilling af opkald, når telefonen ikke bliver taget."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Viderestil ved utilgængelig"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Nummer ved utilgængelig"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Viderestiller til <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Deaktiveret"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Din udbyder understøtter ikke, deaktivering af viderestilling af opkald, når telefonen er utilgængelig."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Dit mobilselskab understøtter ikke deaktivering af viderestilling af opkald, når telefonen ikke er tilgængelig."</string>
     <string name="updating_title" msgid="6146755386174019046">"Indstillinger for opkald"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Fejl i indstillinger for opkald"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Læser indstillinger ..."</string>
@@ -145,10 +123,10 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Tilbagefører indstillinger …"</string>
     <string name="response_error" msgid="6674110501330139405">"Uventet svar fra netværk."</string>
     <string name="exception_error" msgid="7027667130619518211">"Fejl på netværk eller SIM-kort."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Du kan kun foretage handlinger med dine faste opkaldsnumre."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Slå radioen til, inden du viser disse indstillinger."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Din telefons appindstilling Faste opkaldsnumre er slået til. Som et resultat heraf fungerer nogle opkaldsrelaterede funktioner ikke."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Tænd radioen, inden du får vist disse indstillinger."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
-    <string name="enable" msgid="1059008390636773574">"Aktiver"</string>
+    <string name="enable" msgid="1059008390636773574">"Aktivér"</string>
     <string name="disable" msgid="7274240979164762320">"Deaktiver"</string>
     <string name="change_num" msgid="239476305819844391">"Opdater"</string>
   <string-array name="clir_display_values">
@@ -156,29 +134,28 @@
     <item msgid="7876195870037833661">"Skjul nummer"</item>
     <item msgid="1108394741608734023">"Vis nummer"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Gem voicemailnummer"</string>
     <string name="vm_changed" msgid="380744030726254139">"Voicemailnummeret blev ændret."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Nummeret til voicemail blev ikke ændret."\n"Kontakt din udbyder, hvis problemet fortsætter."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Nummeret til viderestilling blev ikke ændret."\n"Kontakt din udbyder, hvis problemet fortsætter."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Telefonsvarernummeret kunne ikke ændres."\n"Kontakt dit mobilselskab, hvis problemet vedbliver."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Telefonsvarernummeret kunne ikke ændres."\n"Kontakt dit mobilselskab, hvis problemet vedbliver."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"De aktuelle indstillinger til viderestillingsnummer kunne ikke hentes og gemmes."\n"Vil du skifte til den nye udbyder alligevel?"</string>
     <string name="no_change" msgid="3186040086622435212">"Der blev ikke foretaget nogen ændringer."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Vælg voicemail-tjeneste"</string>
     <string name="voicemail_default" msgid="5902099213882352338">"Min udbyder"</string>
     <string name="mobile_networks" msgid="5540397602919106177">"Indstillinger for mobilnetværk"</string>
     <string name="label_available" msgid="1181658289009300430">"Tilgængelige netværk"</string>
-    <string name="load_networks_progress" msgid="5230707536168902952">"Søger ..."</string>
+    <string name="load_networks_progress" msgid="5230707536168902952">"Søger..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Der blev ikke fundet nogen netværk."</string>
     <string name="search_networks" msgid="1601136049300882441">"Søg efter netværk"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Der opstod en fejl, mens der blev søgt efter netværk."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrerer på <xliff:g id="NETWORK">%s</xliff:g> ..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Dit SIM-kort tillader ikke en forbindelse til dette netværk."</string>
-    <string name="connect_later" msgid="500090982903469816">"Der kan ikke oprettes forbindelse til dette netværk lige nu. Prøv igen senere."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Dit SIM-kort tillader ikke en forbindelse til dette netværk."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Der kan ikke oprettes forbindelse til dette netværk lige nu. Prøv igen senere."</string>
     <string name="registration_done" msgid="495135664535876612">"Registreret på netværket."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Vælg en netværksudbyder"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Vælg en netværksudbyder"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Søg efter alle tilgængelige netværk"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Vælg automatisk"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Vælg automatisk det foretrukne netværk"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automatisk registrering ..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Vælg automatisk"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Vælg automatisk det foretrukne netværk"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automatisk registrering..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Netværkstilstand"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Skift netværksdriftstilstand"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Foretrukken netværkstilstand"</string>
@@ -192,30 +169,29 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Foretrukken netværkstilstand: kun EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Foretrukken netværkstilstand: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Kun EvDo"</item>
     <item msgid="454610224530856274">"CDMA u. EvDo"</item>
-    <item msgid="8928247118825616081">"Automatisk CDMA/EvDo"</item>
-    <item msgid="8595462903294812666">"Automatisk GSM/WCDMA"</item>
+    <item msgid="648505122852496166">"Automatisk CDMA/EvDo"</item>
+    <item msgid="7148247646407324800">"Automatisk GSM/WCDMA"</item>
     <item msgid="5189164180446264504">"Kun WCDMA"</item>
     <item msgid="5714714953966979187">"Kun GSM"</item>
-    <item msgid="4775796025725908913">"GSM/WCDMA foretrækkes"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA foretrækkes"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data aktiveret"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Aktiver dataadgang via mobilnetværk"</string>
+    <string name="data_enable_summary" msgid="5022018967714633874">"Aktivér dataadgang via mobilnetværk"</string>
     <string name="roaming" msgid="8871412572928323707">"Dataroaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Opret forbindelse til datatjenester under roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Opret forbindelse til datatjenester under roaming"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Du har mistet dataforbindelsen, fordi du har forladt dit hjemmenetværk, og dataroaming er slået fra."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Du har mistet dataforbindelsen, fordi du har forladt dit hjemmenetværk, og dataroaming er slået fra."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Tillad dataroaming? Der kan være væsentlige gebyrer for dataroaming."</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Indstillinger for GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Indstillinger for CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Databrug"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Mobilselskabets datapolitik"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Databrug i denne periode"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Periode for databrug"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Politik om datahastighed"</string>
@@ -232,7 +208,6 @@
     <skip />
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Datahastigheden er nedsat til <xliff:g id="USED">%1$d</xliff:g> Kb/s, hvis datagrænsen overskrides"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Oplysninger om mobilselskabets politik om databrug på netværket"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Celletransmissions-sms"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Celletransmissions-sms"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Celletransmissions-sms"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Celletransmissions-sms er aktiveret"</string>
@@ -273,15 +248,6 @@
     <item msgid="1858401628368130638">"Koreansk"</item>
     <item msgid="1933212028684529632">"Kinesisk"</item>
     <item msgid="1908428006803639064">"Hebraisk"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Sprog"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Lokalt vejr"</string>
@@ -311,9 +277,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Jobmuligheder"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Jobmuligheder er aktiveret"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Jobmuligheder er deaktiveret"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Læger, sundhed og hospital"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Læger, sundhed og hospital er aktiveret"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Læger, sundhed og hospital er deaktiveret"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Læger, sundhed og hospital"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Læger, sundhed og hospital er aktiveret"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Læger, sundhed og hospital er deaktiveret"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Teknologinyheder"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Teknologinyheder er deaktiveret"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Teknologinyheder er deaktiveret"</string>
@@ -328,35 +294,17 @@
     <item msgid="8912042051809329533">"Kun WCDMA"</item>
     <item msgid="8776934131146642662">"Kun GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA foretrukken)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Brug kun 2G-netværk"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Spar på batteriet"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Vælg system"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Skift cdma-roamingtilstand"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Skift CDMA-roamingtilstand"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Vælg system"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Kun hjemme"</item>
     <item msgid="1205664026446156265">"Automatisk"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA-roamingtilstand"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Skift cdma-roamingtilstand"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA-roamingtilstand"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Kun hjemmenetværk"</item>
-    <item msgid="8174642753290624634">"Tilknyttede netværk"</item>
-    <item msgid="2241951431403168661">"Alle netværk"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA-abonnement"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA-netværkspræferencer"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Ikke implementeret endnu!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA-netværkspræferencer"</string>
@@ -365,12 +313,6 @@
     <item msgid="6143696847467859795">"Kun CDMA"</item>
     <item msgid="2683555124647197574">"Kun EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA-abonnement"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Skift mellem RUIM/SIM og NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"abonnement"</string>
   <string-array name="cdma_subscription_choices">
@@ -381,33 +323,31 @@
     <item msgid="7494167883478914080">"0"</item>
     <item msgid="6043847456049107742">"1"</item>
   </string-array>
-    <string name="cdma_activate_device" msgid="3793805892364814518">"Aktiver enhed"</string>
+    <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivér enhed"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Opsætning af datatjeneste"</string>
     <string name="fdn" msgid="7878832555095183202">"Faste opkaldsnumre"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Liste over faste opkald"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Aktivering af faste opkald"</string>
     <string name="fdn_enabled" msgid="5238109009915521240">"Faste opkaldsnumre er aktiveret"</string>
     <string name="fdn_disabled" msgid="4700049736675368279">"Faste opkaldsnumre er deaktiveret"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"Aktiver faste opkald"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"Aktivér faste opkald"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Deaktiver faste opkald"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Skift PIN2-kode"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"Deaktiver faste opkald"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"Aktiver faste opkald"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"Aktivér faste opkald"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Administrer faste opkaldsnumre"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Skift PIN-kode for at få adgang til faste opkald."</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Administrer telefonnummerliste"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Stemme Fortrolighed"</string>
-    <string name="voice_privacy_summary" msgid="3159383389833516214">"Aktiver øget fortrolighedstilstand"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY-tilstand"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Aktiver TTY-tilstand"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Privat talekommunikation"</string>
+    <string name="voice_privacy_summary" msgid="3159383389833516214">"Aktivér øget fortrolighedstilstand"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY-tilstand"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Angiv TTY-tilstand"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Prøv automatisk igen"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Aktiver automatisk gentagelsestilstand"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Prøv automatisk igen"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Aktivér automatisk gentagelsestilstand"</string>
     <string name="menu_add" msgid="1882023737425114762">"Tilføj kontakt"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Rediger kontakt"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Slet kontakt"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Indtast PIN2-kode"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Indtast PIN2-kode"</string>
     <string name="name" msgid="7329028332786872378">"Navn"</string>
     <string name="number" msgid="7905950798349903858">"Nummer"</string>
     <string name="save" msgid="4094274636321939086">"Gem"</string>
@@ -420,56 +360,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Slet fast opkaldsnummer"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Sletter fast opkaldsnummer..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Det faste opkaldsnummer blev slettet."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Fast opkaldsnummer er ikke opdateret: Du har indtastet en forkert PIN-kode."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"Fast opkaldsnumner er ikke opdateret: Nummer kan højst indeholde 20 tal."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Fast opkaldsnummer blev ikke opdateret, fordi du har indtastet en forkert PIN-kode."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN blev ikke opdateret, fordi antallet ikke må overstige 20 cifre."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN blev ikke opdateret. PIN2-koden var forkert, eller telefonnummeret blev afvist."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Læser fra SIM-kort ..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Der er ingen kontakter på dit SIM-kort."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Vælg kontakter, der skal importeres"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Sluk flytilstanden for at importere kontaktpersoner fra SIM-kortet."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Du skal først slukke Flytilstand for at importere kontaktpersoner fra SIM-kortet."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Aktiver/deaktiver PIN-kode til SIM-kort"</string>
     <string name="change_pin" msgid="9174186126330785343">"Skift PIN-kode til SIM-kort"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN-kode til SIM-kort:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Nuværende PIN-kode"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Ny PIN-kode"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Bekræft ny PIN-kode"</string>
-    <string name="badPin" msgid="4154316827946559447">"Den gamle PIN-kode, du indtastede, er forkert. Prøv igen."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"De PIN-koder, du indtastede, stemmer ikke overens. Prøv igen."</string>
+    <string name="badPin" msgid="8955102849303984935">"Den gamle pinkode, du har indtastet, er forkert. Prøv igen."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"PIN-koderne, som du har indtastet, stemmer ikke overens. Prøv igen."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Indtast en PIN-kode på mellem 4 og 8 tal."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Deaktiver PIN-kode til SIM-kort"</string>
-    <string name="enable_sim_pin" msgid="5803702443844458831">"Aktiver PIN-kode til SIM-kort"</string>
-    <string name="enable_in_progress" msgid="3695303775100109650">"Vent ..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"PIN-koden til SIM-kortet blev aktiveret"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN-koden til SIM-kortet er deaktiveret"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Den indtastede PIN-kode er forkert"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"PIN-kode til SIM-kort blev ændret."</string>
+    <string name="enable_sim_pin" msgid="5803702443844458831">"Aktivér PIN-kode til SIM-kort"</string>
+    <string name="enable_in_progress" msgid="3695303775100109650">"Vent..."</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"Pinkoden til SIM-kortet blev aktiveret."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"Pinkoden til SIM-kortet er deaktiveret."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Den indtastede pinkode var forkert."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"Pinkoden til SIM-kortet er ændret."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Adgangskoden er forkert. SIM-kortet er låst. PUK2-kode er påkrævet."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2-kode"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Nuværende PIN2-kode"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Ny PIN2-kode"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Bekræft ny PIN2-kode"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Den indtastede PUK2-kode er forkert. Prøv igen."</string>
-    <string name="badPin2" msgid="515218795152422178">"Den gamle PIN2-kode, du indtastede, er forkert. Prøv igen."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"De PIN2-koder, du indtastede, stemmer ikke overens. Prøv igen."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Den indtastede PUK2-kode er forkert. Prøv igen."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Den gamle PIN2-kode, du har indtastet, er forkert. Prøv igen."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"PIN2-koderne, du har indtastet, stemmer ikke overens. Prøv igen."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Indtast en PIN2-kode på mellem 4 og 8 tal."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Indtast en PUK2-kode på 8 tal."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2-koden blev ændret"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2-koden blev ændret."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Indtast PUK2-kode"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Forkert adgangskode. Skift PIN2-kode, og prøv igen."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Adgangskoden er forkert. SIM-kortet er låst. PUK2 er påkrævet."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Forkert adgangskode. Skift PIN2-kode, og prøv igen."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Adgangskoden er forkert. SIM-kortet er låst. PUK2-kode er påkrævet."</string>
     <string name="doneButton" msgid="2859593360997984240">"Udfør"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Telefonmøde <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Tilbage til opkald"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Fortsæt uden SIM-kort"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Der blev ikke fundet noget SIM-kort. Indsæt et SIM-kort i telefonen."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Annuller"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Lås op"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Autentificerer PIN-kode ..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemailnummer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Ringer op"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Prøver igen"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Telefonmøde"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Indgående opkald"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Cdma opkaldventer"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Opkaldet er afsluttet"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Ventende"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Lægger på"</string>
@@ -479,7 +413,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Ubesvarede opkald"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> ubesvarede opkald"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Ubesvarede opkald fra <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Aktuelt opkald (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Igangværende opkald"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Ventende"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Indgående opkald"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Ny voicemail"</string>
@@ -488,13 +422,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Voicemailnummeret er ukendt"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ingen dækning"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Det valgte netværk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) er ikke tilgængeligt"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Læg på"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Ring tilbage"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Besked"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Slå Flytilstand fra først for at foretage et opkald."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ikke registreret på netværk."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilnetværket er ikke tilgængeligt."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Opkaldet blev ikke sendt. Der blev ikke indtastet et gyldigt nummer."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Opkaldet blev ikke sendt."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Starter MMI-sekvens ..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Starter funktionskodesekvens ..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Tjenesten understøttes ikke."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Der kan ikke skiftes mellem opkald."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Opkaldet kunne ikke separeres."</string>
@@ -506,18 +442,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Nødopkald"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Tænder for radio ..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Området er ude af drift. Prøver igen ..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Opkaldet blev ikke sendt. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ikke et nødnummer."</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Opkaldet blev ikke sendt. Indtast et nødnummer."</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Opkaldet blev ikke sendt. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ikke et nødnummer."</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Opkaldet blev ikke sendt. Indtast et nødnummer."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Brug tastatur til at ringe op"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Touch-tone-tastatur"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Hold"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Hold fra"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Afslut"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Nummerblok"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Skjul"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Højttaler"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Lyd fra"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Tilføj opkald"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Slå opkald sammen"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Skift"</string>
@@ -536,36 +467,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI-tekst"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF-toner"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF-toner"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Angiv længden på DTMF-toner"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Lang"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Netværksbesked"</string>
-    <string name="ota_title_activate" msgid="8616918561356194398">"Aktiver din telefon"</string>
-    <string name="ota_touch_activate" msgid="6553212803262586244">"Der skal foretages et særligt opkald for at aktivere din telefontjeneste. "\n\n" Lyt til instruktionerne, når du har trykket på “Aktiver” for at aktivere din telefon."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Tryk på “Aktiver” for at foretage et særligt opkald, der aktiverer din telefon på dit telefonselskabs mobilnetværk, så du kan foretage opkald og oprette forbindelse til mobile datanetværk."</string>
+    <string name="network_message" msgid="4483886461245213802">"Netværksbesked"</string>
+    <string name="ota_title_activate" msgid="8616918561356194398">"Aktivér din telefon"</string>
+    <string name="ota_touch_activate" msgid="6553212803262586244">"Der skal foretages et særligt opkald for at aktivere din telefontjeneste. "\n\n" Lyt til instruktionerne, når du har trykket på “Aktivér” for at aktivere din telefon."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Spring aktivering over?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Hvis du springer aktiveringen over, kan du ikke foretage opkald eller oprette forbindelse til mobildatanetværk (du kan dog godt oprette forbindelse til Wi-Fi-netværk). Du vil blive bedt om at aktivere din telefon, hver gang du tænder den, indtil du gør det."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Spring over"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktiver"</string>
-    <string name="ota_activate" msgid="1368528132525626264">"Aktiver"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Telefonen er aktiveret!"</string>
+    <string name="ota_activate" msgid="1368528132525626264">"Aktivér"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefonen er aktiveret."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Der opstod et problem med aktiveringen"</string>
     <string name="ota_listen" msgid="162923839877584937">"Følg talevejledningen, indtil du hører, at aktiveringen er gennemført."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Tastatur"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Højttaler"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Vent, mens din telefon bliver programmeret."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programmering mislykkedes"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Vent, mens din telefon programmeres."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programmering mislykkedes"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Din telefon er nu aktiveret. Det kan tage op til 15 minutter, før tjenesten begynder."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Din telefon blev ikke aktiveret. "\n"Du skal muligvis finde et område med bedre dækning (ved et vindue eller udenfor). "\n\n"Prøv igen, eller ring til kundeservice for at få flere oplysninger om andre muligheder."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Din telefon blev ikke aktiveret. "\n"Du skal muligvis finde et område med bedre dækning (ved et vindue eller udenfor). "\n\n"Prøv igen, eller ring til kundeservice for at få flere oplysninger om andre muligheder."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"FOR MANGE SPC-FEJL"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Tilbage"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Prøv igen"</string>
     <string name="ota_next" msgid="3904945374358235910">"Næste"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Tilbage"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"NttAfslutDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Gik i nødtilbagekaldstilstand"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Nødtilbagekaldstilstand"</string>
@@ -575,87 +501,69 @@
     <item quantity="other" msgid="3122217344579273583">"Ingen dataforbindelse i <xliff:g id="COUNT">%s</xliff:g> minutter"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Telefonen vil være i nødtilbagekaldstilstand i <xliff:g id="COUNT">%s</xliff:g> minut. I denne tilstand kan der ikke anvendes applikationer, der anvender en dataforbindelse. Vil du afslutte nu?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Telefonen vil være i nødtilbagekaldstilstand i <xliff:g id="COUNT">%s</xliff:g> minutter. I denne tilstand kan der ikke anvendes applikationer, der anvender en dataforbindelse. Vil du afslutte nu?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Telefonen vil være i nødtilbagekaldstilstand i <xliff:g id="COUNT">%s</xliff:g> minut. Mens du er i denne tilstand kan ingen apps, der bruger en dataforbindelse, anvendes. Vil du afslutte nu?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Telefonen vil være i nødtilbagekaldstilstand i <xliff:g id="COUNT">%s</xliff:g> minutter. Mens du er i denne tilstand kan ingen applikationer, der bruger en dataforbindelse, anvendes. Vil du afslutte nu?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Den valgte handling er ikke tilgængelig, når telefonen er i nødtilbagekaldstilstand. Telefonen vil være i denne tilstand i <xliff:g id="COUNT">%s</xliff:g> minut. Ønsker du at afslutte?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Den valgte handling er ikke tilgængelig, når telefonen er i nødtilbagekaldstilstand. Telefonen vil være i denne tilstand i <xliff:g id="COUNT">%s</xliff:g> minutter. Ønsker du at afslutte?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Den valgte handling er ikke tilgængelig i nødtilbagekaldstilstand. Telefonen vil være i denne tilstand i <xliff:g id="COUNT">%s</xliff:g> minut. Vil du afslutte nu?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Den valgte handling er ikke tilgængelig i nødtilbagekaldstilstand. Telefonen vil være i denne tilstand i <xliff:g id="COUNT">%s</xliff:g> minutter. Vil du afslutte nu?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Den valgte handling er ikke tilgængelig ved nødopkald"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Eksisterende nødtilbagekaldstilstand"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Den valgte handling er ikke tilgængelig ved nødopkald"</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Eksisterende nødtilbagekaldstilstand"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Ja"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Nej"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Annuller"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Indstillinger for voicemail"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;ikke indstillet&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Voicemail-tjeneste"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Indstillinger for <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Tjeneste"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Konfiguration"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ikke angivet&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Andre indstillinger for opkald"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Ring til"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Ringer op via ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Træk til højre for at besvare"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Træk til venstre for at sætte ringetonen på lydløs"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Træk til venstre for at afvise"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Træk til højre for at besvare og"\n"stille aktivt opkald på hold"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Træk til højre for at besvare og"\n"afslutte aktivt opkald"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Træk til højre for at besvare og"\n"afslutte ventende opkald"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Svar"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Afvis"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Opkald via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"billede af kontaktperson"</string>
     <string name="goPrivate" msgid="865837794424530980">"gør privat"</string>
     <string name="selectContact" msgid="781975788478987237">"vælg kontaktperson"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Indstillinger for internetopkald"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Konti til internetopkald (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Konti"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Administrer status og konti til internetopkald (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Modtag opkald"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Reducerer batteriets levetid"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Konfigurer opkaldsindstillinger"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Benyt internetopkald"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Benyt internetopkald (kun Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Gælder alle opkald, når datanetværk er tilgængeligt"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Kun til internetopkald"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Spørg ved hvert opkald"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Gælder alle opkald"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Automatisk tilmelding"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Udgående opkald via SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Foretag opkald"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Benyt internetopkaldskonto:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Benyt altid til at foretage internetopkald"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Hvis du ønsker at ændre standardkontoen for internetopkald, kan du vælge en anden konto under Indstillinger for internetopkald"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Du kan ændre, hvilken internetopkaldskonto der skal bruges som standard fra Telefon &gt; Indstillinger &gt; Indstillinger for internetopkald &gt; skærmen Konti."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Mobiltelefonopkald"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Internetopkald"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Ingen internetopkaldskonto"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Der er ingen konti til internetopkald på denne telefon. Vil du tilføje en nu?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Der er ingen internetopkaldskonti på denne telefon. Vil du tilføje en nu?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Tilføj"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Tilføj konto"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Fjern konto"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP-konti"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Kontoen gemmes..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Kontoen fjernes..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Kontoen gemmes..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Kontoen fjernes..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Gem"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Kassér"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Luk profilen"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Luk"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Primær"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Gør dette til min primære konto"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Bruges til udgående opkald"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Avancerede indstillinger"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Primær konto. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Tjekker status..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Tilmelder..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Prøver stadig..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Modtager ikke opkald"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Kontotilmeldingen blev afbrudt, fordi der ikke er nogen internetforbindelse"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Kontotilmeldingen blev afbrudt, fordi der ikke er nogen Wi-Fi-forbindelse"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Registreringen af konto mislykkedes"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Modtager opkald"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registrerer..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Forsøger stadig..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Modtager ikke opkald."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Kontoregistreringen blev afbrudt, fordi der ikke er nogen internetforbindelse."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Kontotilmeldingen blev afbrudt, fordi der ikke er nogen Wi-Fi-forbindelse"</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Registreringen af kontoen mislykkedes."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Modtager opkald."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Registreringen af konto mislykkedes: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Vi prøver igen senere."</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Registreringen af konto mislykkedes: forkert brugernavn eller adgangskode"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Registreringen af konto mislykkedes: Kontroller servernavn"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Denne konto benyttes i øjeblikket af applikationen <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Registreringen af kontoen mislykkedes: forkert brugernavn eller adgangskode."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Registreringen af kontoen mislykkedes. Kontroller servernavn."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Denne konto benyttes i øjeblikket af applikationen <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Oplysninger om SIP-konto"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Oplysninger om SIP-konto"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Server"</string>
@@ -666,9 +574,6 @@
     <string name="port_title" msgid="5952939408078626657">"Portnummer"</string>
     <string name="transport_title" msgid="8253139511847746640">"Transporttype"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Send keepalive"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Send SIP-keepalive-meddelelser"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Automatisk tilmelding"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Registrer profilen automatisk"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Angiv som primær konto"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Bruges til udgående opkald"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Valgfri indstillinger"</string>
@@ -679,12 +584,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Valgfrit&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Tryk for at vise alle"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Tryk for at skjule alle"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> skal udfyldes. Feltet må ikke være tomt."</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Portnummeret skal være mellem 1000 og 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> skal udfyldes. Feltet må ikke være tomt."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Portnummeret skal være mellem 1000 og 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Ingen internetforbindelse"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Ingen Wi-FI-forbindelse"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Kontroller din internetforbindelse, før du foretager et internetopkald"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Du skal have forbindelse til et Wi-Fi-netværk for internetopkald (brug Indstillinger for trådløs og netværk)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Kontroller din internetforbindelse, før du foretager et internetopkald."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Du skal have forbindelse til et Wi-Fi-netværk for at kunne foretage internetopkald (brug Indstillinger for trådløs og netværk)"</string>
     <string name="no_voip" msgid="8901474054537199865">"Internetopkald understøttes ikke"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automatisk"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Send altid"</string>
@@ -693,7 +598,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Jeg ringer tilbage lige om lidt."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Jeg ringer til dig senere."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Kan ikke tale nu. Ringer du senere?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Tilpasset besked..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Tilpasset besked"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Hurtige svar"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Rediger hurtige svar"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -711,7 +616,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"stjerne"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"nul"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"pund"</string>
-    <string name="description_search_button" msgid="239929880630534731">"søg"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ring op"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"tilbage"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Højttalertelefon aktiveret."</string>
@@ -721,9 +625,56 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Afvis"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibration"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibration"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ringetone"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Altid"</item>
     <item msgid="1595097872875714252">"Kun ved lydløs"</item>
     <item msgid="1458182414036878616">"Aldrig"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Ringetone for opkald"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrer ved opringning"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tastaturtoner"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ringetone"</string>
+
+    <!-- CM10 additions -->
+    <string name="mwi_notification_title">Indikator for ventende beskeder</string>
+    <string name="mwi_notification_summary">Vis notifikationer for indikator for ventende beskeder i voicemail</string>
+
+    <string name="preferred_network_mode_lte_gsm_summary">Foretrukket netværkstilstand: LTE / WCDMA / GSM</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary">Foretrukket netværkstilstand: LTE / CDMA / EvDo</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">Foretrukket netværkstilstand: LTE / CMDA / EvDo / GSM/WCDMA</string>
+
+    <string name="throttle_status_subtext"><xliff:g id="used">%1$s</xliff:g> (<xliff:g id="used">%2$d</xliff:g>\u066A) af <xliff:g id="used">%3$s</xliff:g> periode-maksimum\nNæste periode starter om <xliff:g id="used">%4$d</xliff:g> dage (<xliff:g id="used">%5$s</xliff:g>)</string>
+    <string name="throttle_data_usage_subtext"><xliff:g id="used">%1$s</xliff:g> (<xliff:g id="used">%2$d</xliff:g>\u066A) af <xliff:g id="used">%3$s</xliff:g> periode-maksimum</string>
+    <string name="throttle_time_frame_subtext"><xliff:g id="used">%1$d</xliff:g>\u066A af cyklus gået\nNæste periode starter om <xliff:g id="used">%2$d</xliff:g> dage (<xliff:g id="used">%3$s</xliff:g>)</string>
+
+    <string name="dialer_ui_settings_title">Opkaldsprogram-indstillinger</string>
+    <string name="dialer_ui_settings_summary">Indstillinger for opkaldsprogram</string>
+
+    <string name="perm_change_mobile_network">Skift netværk (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Apps med denne tilladelse kan, til alle tider, skifte mellem 2G-data og 3G-data. 3G er hurtigere, bruger mere batteri, og kan også koste dig flere penge.</string>
+
+    <string name="noise_suppression_title">Undertrykkelse af støj</string>
+    <string name="noise_suppression_summary">Slå undertrykkelse af støj for opkald til</string>
+
+    <string name="national_roaming">National data-roaming</string>
+    <string name="national_roaming_enable">Tilslut til datatjenester, når der roames nationalt</string>
+    <string name="national_roaming_disable">Tilslut til datatjenester, når der roames nationalt</string>
+
+    <string name="phone_number_label">Mit telefonnummer</string>
+    <string name="phone_number_summary">Angiv telefonnummeret for denne enhed</string>
+
+    <string name="advanced_setting">Avancerede indstillinger</string>
+    <string name="vibrate_outgoing">Vibrér ved opkald</string>
+    <string name="vibrate_45">Vibrér hver 45 sekunder</string>
+    <string name="vibrate_45_sum">Vibrér ved 45-sekundersmærket i hvert minut under udgående opkald</string>
+    <string name="vibrate_hangup">Vibrér ved endt opkald</string>
+    <string name="vibrate_call_waiting">Vibrér ventende opkald</string>
+
+    <string name="keep_proximity_sensor_on">Hold nærhedsføler tændt</string>
+    <string name="keep_proximity_sensor_on_sum">Sluk ikke for nærhedsføleren under opkald ved brug af headset</string>
+
+    <string name="lockscreen_if_call_ends_with_screenoff">Lås, når opkald afsluttes</string>
+    <string name="lockscreen_if_call_ends_with_screenoff_sum">Lås automatisk, når et opkald afsluttes, og skærmen er slukket</string>
+    <!-- CM10 additions end -->
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ad35d117a..e99772646 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -18,46 +18,34 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"Mobile Daten"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Telefon"</string>
-    <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Notrufwählprogramm"</string>
+    <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Notruf"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Anrufbegrenzung"</string>
     <string name="unknown" msgid="6878797917991465859">"Unbekannt"</string>
     <string name="private_num" msgid="6713286113000232309">"Private Nummer"</string>
     <string name="payphone" msgid="1931775086311769314">"Telefonzelle"</string>
     <string name="onHold" msgid="9035493194749959955">"Gehaltener Anruf"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Aktueller Anruf"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Leitung besetzt"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Netzwerk ausgelastet"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Keine Antwort, Timeout"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server nicht erreichbar"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nummer nicht erreichbar"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Ungültiger Nutzername oder ungültiges Passwort"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Anruf außerhalb des Netzwerks"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Anruf außerhalb des Netzwerks"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Serverfehler. Bitte versuchen Sie es später erneut."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Kein Signal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-Grenzwert überschritten"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Mobilfunkverbindung aus"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Keine SIM-Karte, SIM-Kartenfehler"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Keine SIM-Karte oder SIM-Kartenfehler"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Gebiet ohne Netzabdeckung"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Ausgehende Anrufe unterliegen der Anrufbegrenzung."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Sie können keine Anrufe tätigen, wenn die Anrufsperre aktiviert ist."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Sie können keine Anrufe tätigen, wenn die Anrufsperre aktiviert ist."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Alle Anrufe werden durch die Zugriffssteuerung beschränkt."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Notrufe werden durch die Zugriffssteuerung beschränkt."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Normale Anrufe werden durch die Zugriffssteuerung beschränkt."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Telefon bis zum Einschalten gesperrt"</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Anruf beendet"</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Anruf unterbrochen"</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: Erneuter Aufruf"</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Ablehnung der Serviceoption"</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: Wiederholungsaufruf"</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Zugriff fehlgeschlagen"</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Vorzeitig entfernt"</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Es sind nur Notrufe möglich."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Ungültige Nummer"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Ungültige Nummer"</string>
     <string name="confCall" msgid="1904840547188336828">"Telefonkonferenz"</string>
     <string name="call_lost" msgid="317670617901479594">"Anruf ist verloren gegangen."</string>
-    <string name="retry" msgid="8462986804300767852">"Wiederholen"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Anruf verloren"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-Code gestartet"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-Code wird ausgeführt..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Kabelgebundenes Headset"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Folgende Töne senden?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Töne werden gesendet"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Töne werden gesendet."\n</string>
     <string name="send_button" msgid="4106860097497818751">"Senden"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Ja"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Nein"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Platzhalter ersetzen durch"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Platzhalter ersetzen durch"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Fehlende Mailbox-Nummer"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Auf der SIM-Karte ist keine Mailbox-Nummer gespeichert."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Nummer hinzufügen"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Wird geladen..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Geben Sie zum Entsperren der SIM-Karte den PIN-Code ein."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM-Karte entsperrt"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Neuer PIN-Code der SIM-Karte"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Neuen PIN-Code für SIM-Karte zur Bestätigung erneut eingeben"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Die von Ihnen eingegebenen PIN-Codes für die SIM-Karte stimmen nicht überein. Versuchen Sie es erneut."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Geben Sie zum Entsperren der SIM-Karte den PUK ein"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Falscher PUK-Code!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Fortfahren"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Ihre SIM-Karte wurde entsperrt. Ihr Telefon wird nun entsperrt..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN zur Entsperrung des SIM-Netzwerks"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Entsperren"</string>
@@ -93,11 +72,9 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Netzwerkentsperrung wird angefordert..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Anfrage für Entsperrung des Netzwerks war nicht erfolgreich."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Entsperrung des Netzwerks nicht erfolgreich."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM-Anrufeinstellungen"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA-Anrufeinstellungen"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Zugangspunkte"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Zugangspunkte (APNs)"</string>
     <string name="settings_label" msgid="3876743539816984008">"Netzwerkeinstellungen"</string>
     <string name="voicemail" msgid="8693759337917898954">"Mailbox"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"MB:"</string>
@@ -109,12 +86,13 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Zusätzliche Anrufeinstellungen nur für CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Einstellungen für Netzwerkservice"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Anrufer-ID"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Einstellungen werden geladen…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Nummer bei abgehenden Anrufen unterdrückt"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Nummer bei abgehenden Anrufen angezeigt"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Standardeinst. zur Anzeige meiner Nr. bei abgehenden Anrufen verwenden"</string>
     <string name="labelCW" msgid="6120513814915920200">"Anklopfen"</string>
-    <string name="sum_cw_enabled" msgid="8083061901633671397">"Mich während eines Anrufs über eingehende Anrufe benachrichtigen"</string>
-    <string name="sum_cw_disabled" msgid="3648693907300104575">"Mich während eines Anrufs über eingehende Anrufe benachrichtigen"</string>
+    <string name="sum_cw_enabled" msgid="8083061901633671397">"Während eines Anrufs über eingehende Anrufe benachrichtigen"</string>
+    <string name="sum_cw_disabled" msgid="3648693907300104575">"Während eines Anrufs über eingehende Anrufe benachrichtigen"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Einstellungen"</string>
     <string name="labelCF" msgid="2574386948026924737">"Rufweiterleitung"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Immer weiterleiten"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Nummer falls besetzt"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Weiterleitung an <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Deaktiviert"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Ihr Netzbetreiber unterstützt die Deaktivierung der Anrufweiterleitung bei besetzter Leitung nicht."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Ihr Mobilfunkanbieter unterstützt die Deaktivierung der Anrufweiterleitung bei besetzter Leitung nicht."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Weiterl. falls keine Antw."</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Nummer falls keine Antwort"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Weiterleitung an <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Deaktiviert"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Ihr Netzbetreiber unterstützt die Deaktivierung der Anrufweiterleitung bei Nichtbeantwortung nicht."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Ihr Mobilfunkanbieter unterstützt die Deaktivierung der Anrufweiterleitung bei Nichtbeantwortung nicht."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Weiterl. falls n. erreichb."</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Nummer falls nicht erreichbar"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Weiterleitung an <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Deaktiviert"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Ihr Netzbetreiber unterstützt die Deaktivierung der Anrufweiterleitung bei Nichterreichbarkeit nicht."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Ihr Mobilfunkanbieter unterstützt die Deaktivierung der Anrufweiterleitung bei Nichterreichbarkeit nicht."</string>
     <string name="updating_title" msgid="6146755386174019046">"Anrufeinstellungen"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Fehler bei Anrufeinstellungen"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Einstellungen werden gelesen…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Einstellungen werden zurückgesetzt..."</string>
     <string name="response_error" msgid="6674110501330139405">"Unerwartete Antwort von Netzwerk"</string>
     <string name="exception_error" msgid="7027667130619518211">"Netzwerk- oder SIM-Kartenfehler"</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Vorgänge sind nur für Ihre zugelassenen Rufnummern möglich."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Aktivieren Sie Ihre Mobilfunkverbindung, bevor Sie diese Einstellungen anzeigen."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Da die Anrufbegrenzung in Ihrer Telefon-App aktiviert ist, funktionieren nicht alle Anruffunktionen."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Aktivieren Sie Ihre Mobilfunkverbindung, bevor Sie diese Einstellungen anzeigen."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Aktivieren"</string>
     <string name="disable" msgid="7274240979164762320">"Deaktivieren"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Rufnummer unterdrücken"</item>
     <item msgid="1108394741608734023">"Rufnummer anzeigen"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Mailbox-Nummer speichern"</string>
     <string name="vm_changed" msgid="380744030726254139">"Mailboxnummer geändert."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Die Mailbox-Nummer konnte nicht geändert werden."\n"Kontaktieren Sie Ihren Netzbetreiber, wenn dieses Problem weiterhin besteht."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Die Weiterleitungsnummer konnte nicht geändert werden."\n"Kontaktieren Sie Ihren Netzbetreiber, wenn dieses Problem weiterhin besteht."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Die Mailbox-Nummer konnte nicht geändert werden."\n"Falls dieses Problem weiterhin besteht, setzen Sie sich mit Ihrem Mobilfunkanbieter in Verbindung."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Die Weiterleitungsnummer konnte nicht geändert werden."\n"Falls dieses Problem weiterhin besteht, setzen Sie sich mit Ihrem Mobilfunkanbieter in Verbindung."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Die aktuellen Einstellungen der Weiterleitungsnummern konnten nicht abgerufen und gespeichert werden."\n"Möchten Sie trotzdem zum neuen Anbieter wechseln?"</string>
     <string name="no_change" msgid="3186040086622435212">"Es wurden keine Änderungen vorgenommen."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Mailbox-Dienst auswählen"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Netzwerke suchen"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Fehler bei der Netzwerksuche"</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrierung in <xliff:g id="NETWORK">%s</xliff:g> läuft..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Ihre SIM-Karte unterstützt keine Verbindung mit diesem Netzwerk."</string>
-    <string name="connect_later" msgid="500090982903469816">"Es kann zurzeit keine Verbindung zu diesem Netzwerk hergestellt werden. Versuchen Sie es später erneut."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Ihre SIM-Karte unterstützt keine Verbindung mit diesem Netzwerk."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Momentan kann keine Verbindung zu diesem Netzwerk aufgebaut werden. Bitte versuchen Sie es später erneut."</string>
     <string name="registration_done" msgid="495135664535876612">"In Netzwerk registriert."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Netzbetreiber auswählen"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Mobilfunkanbieter auswählen"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Nach allen verfügbaren Netzwerken suchen"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Automatisch auswählen"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Bevorzugtes Netzwerk automatisch auswählen"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automatische Registrierung..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Automatisch auswählen"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Bevorzugtes Netzwerk automatisch auswählen"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automatische Registrierung..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Netzwerkmodus"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Netzwerkbetriebsmodus ändern"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Bevorzugter Netzwerkmodus"</string>
@@ -192,30 +169,32 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Bevorzugter Netzwerkmodus: nur EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Bevorzugter Netzwerkmodus: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Nur EvDo"</item>
     <item msgid="454610224530856274">"CDMA ohne EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA/EvDo (automatisch)"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA (automatisch)"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo (automatisch)"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA (automatisch)"</item>
     <item msgid="5189164180446264504">"Nur WCDMA"</item>
     <item msgid="5714714953966979187">"Nur GSM"</item>
-    <item msgid="4775796025725908913">"GSM/WCDMA bevorzugt"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA bevorzugt"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Daten aktiviert"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Datenzugriff über Mobilfunknetz aktivieren"</string>
+    <string name="data_enable_summary" msgid="5022018967714633874">"Datenzugriff über Mobilfunknetz"</string>
     <string name="roaming" msgid="8871412572928323707">"Daten-Roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Bei Roaming mit Datendienst verbinden"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Bei Roaming mit Datendienst verbinden"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Die Datenverbindung wurde unterbrochen, da Sie Ihr Mobilfunknetz verlassen haben und Daten-Roaming nicht aktiviert ist."</string>
+    <string name="national_roaming">Nationales Daten-Roaming</string>
+    <string name="national_roaming_enable">Bei nationalem Roaming mit Datendienst verbinden</string>
+    <string name="national_roaming_disable">Bei nationalem Roaming nicht mit Datendienst verbinden</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Die Datenverbindung wurde unterbrochen, weil Sie Ihr privates Netzwerk verlassen haben und Daten-Roaming nicht aktiviert ist."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Daten-Roaming zulassen? Es können beträchtliche Roaming-Gebühren anfallen!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM-/UMTS-Optionen"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA-Optionen"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Datenverbrauch"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Datenrichtlinien des Mobilfunkanbieters"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Im aktuellen Zeitraum verwendete Daten"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Zeitraum des Datenverbrauchs"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Richtlinien zur Datenrate"</string>
@@ -230,7 +209,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g> % des Zyklus sind verstrichen. "\n"Der nächste Zeitraum beginnt in <xliff:g id="USED_1">%2$d</xliff:g> Tagen (<xliff:g id="USED_2">%3$s</xliff:g>)."</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Datenrate wird auf <xliff:g id="USED">%1$d</xliff:g> kbit/s reduziert, wenn Datennutzungslimit überschritten wird."</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Weitere Informationen über die Richtlinien Ihres Mobilfunkanbieters zur Nutzung der Mobilfunknetzdaten"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Cell Broadcast SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Cell Broadcast SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Cell Broadcast SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Cell Broadcast SMS aktiviert"</string>
@@ -271,15 +249,6 @@
     <item msgid="1858401628368130638">"Koreanisch"</item>
     <item msgid="1933212028684529632">"Chinesisch"</item>
     <item msgid="1908428006803639064">"Hebräisch"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Sprachen"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Lokalwetter"</string>
@@ -309,9 +278,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Jobmöglichkeiten"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Jobmöglichkeiten aktiviert"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Jobmöglichkeiten deaktiviert"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Medizin, Gesundheit und Krankenhäuser"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Medizin, Gesundheit und Krankenhäuser aktiviert"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Medizin, Gesundheit und Krankenhäuser deaktiviert"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Medizin, Gesundheit und Krankenhäuser"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Medizin, Gesundheit und Krankenhäuser aktiviert"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Medizin, Gesundheit und Krankenhäuser deaktiviert"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Technologienachrichten"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Technologienachrichten aktiviert"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Technologienachrichten deaktiviert"</string>
@@ -326,35 +295,17 @@
     <item msgid="8912042051809329533">"Nur WCDMA"</item>
     <item msgid="8776934131146642662">"Nur GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA bevorzugt)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Nur 2G-Netzwerke"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Energiesparend"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Systemauswahl"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"CDMA-Roamingmodus ändern"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA-Roamingmodus ändern"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Systemauswahl"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Nur Heimatnetz"</item>
     <item msgid="1205664026446156265">"Automatisch"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA-Roamingmodus"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"CDMA-Roamingmodus ändern"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA-Roamingmodus"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Nur private Netzwerke"</item>
-    <item msgid="8174642753290624634">"Zugehörige Netzwerke"</item>
-    <item msgid="2241951431403168661">"Beliebiges Netzwerk"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA-Abonnement"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA-Netzwerkeinstellungen"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Noch nicht implementiert"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA-Netzwerkeinstellungen"</string>
@@ -363,21 +314,11 @@
     <item msgid="6143696847467859795">"Nur CDMA"</item>
     <item msgid="2683555124647197574">"Nur EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA-Abonnement"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Zwischen RUIM/SIM und NV wechseln"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"Abonnement"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Gerät aktivieren"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Datendienst einrichten"</string>
@@ -394,18 +335,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Zugelassene Rufnummern verwalten"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Anrufbegrenzungs-PIN ändern"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Telefonnummernliste verwalten"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Datenschutz von Sprachnotizen"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Datenschutz für Sprachnotizen"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Erweiterten Datenschutzmodus aktivieren"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY-Modus"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"TTY-Modus aktivieren"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY-Modus"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY-Modus einstellen"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Automatische Wiederholung"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Modus für automatische Wiederholung aktivieren"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Automatische Wiederholung"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Modus für automatische Wiederholung aktivieren"</string>
     <string name="menu_add" msgid="1882023737425114762">"Kontakt hinzufügen"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Kontakt bearbeiten"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Kontakt löschen"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"PIN2 eingeben"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"PIN2 eingeben"</string>
     <string name="name" msgid="7329028332786872378">"Name"</string>
     <string name="number" msgid="7905950798349903858">"Nummer"</string>
     <string name="save" msgid="4094274636321939086">"Speichern"</string>
@@ -418,56 +357,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Zugelassene Rufnummer löschen"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Zugelassene Rufnummer wird gelöscht..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Zugelassene Rufnummer gelöscht"</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN nicht aktualisiert: Falsche PIN eingegeben"</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN nicht aktualisiert: Nummer darf maximal 20 Ziffern lang sein."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Die Anrufbegrenzung wurde nicht aktualisiert, weil Sie eine falsche PIN eingegeben haben."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Die Anrufbegrenzung wurde nicht aktualisiert, da die Nummer maximal 20 Ziffern enthalten darf."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN wurde nicht aktualisiert. PIN2 war ungültig oder die Telefonnummer wurde abgelehnt."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM-Karte wird ausgelesen..."</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"Keine Kontakte auf Ihrer SIM-Karte"</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"Keine Kontakte auf SIM-Karte"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Kontakte für Import auswählen"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Deaktivieren Sie zum Importieren der Kontakte von der SIM-Karte den Flugmodus."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Deaktivieren Sie zum Importieren der Kontakte von der SIM-Karte zunächst den Flugmodus."</string>
     <string name="enable_pin" msgid="5422767284133234860">"PIN-Abfrage für SIM-Karte aktivieren/deaktivieren"</string>
     <string name="change_pin" msgid="9174186126330785343">"PIN ändern"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN der SIM-Karte:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Alte PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Neue PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Neue PIN bestätigen"</string>
-    <string name="badPin" msgid="4154316827946559447">"Die von Ihnen eingegebene alte PIN ist nicht korrekt. Versuchen Sie es erneut."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Die von Ihnen eingegebenen PIN-Codes stimmen nicht überein. Versuchen Sie es erneut."</string>
+    <string name="badPin" msgid="8955102849303984935">"Die eingegebene alte PIN ist nicht korrekt. Bitte versuchen Sie es erneut."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Die eingegebenen PIN-Codes stimmen nicht überein. Bitte versuchen Sie es erneut."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Geben Sie eine 4- bis 8-stellige PIN ein."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"PIN-Abfrage für SIM-Karte deaktivieren"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"PIN-Abfrage für SIM-Karte aktivieren"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Bitte warten..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"PIN für SIM-Karte aktiviert"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN-Abfrage für SIM-Karte deaktiviert"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Die von Ihnen eingegebene PIN war nicht korrekt."</string>
-    <string name="pin_changed" msgid="9000716792724195093">"Änderung der PIN für SIM-Karte erfolgreich"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN für SIM-Karte aktiviert"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN-Abfrage für SIM-Karte deaktiviert"</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Die eingegebene PIN ist falsch."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"PIN der SIM-Karte geändert"</string>
     <string name="puk_requested" msgid="3898394204193202803">"Passwort falsch, SIM-Karte gesperrt! Eingabe des PUK2 erforderlich."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Alte PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Neue PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Neue PIN2 bestätigen"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Der von Ihnen eingegebene PUK2 ist nicht korrekt. Versuchen Sie es erneut."</string>
-    <string name="badPin2" msgid="515218795152422178">"Die von Ihnen eingegebene alte PIN2 ist nicht korrekt. Versuchen Sie es erneut."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Die von Ihnen eingegebenen PIN2-Codes stimmen nicht überein. Versuchen Sie es erneut."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Der eingegebene PUK2 ist falsch. Bitte versuchen Sie es erneut."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Die von Ihnen eingegebene alte PIN2 ist nicht korrekt. Bitte versuchen Sie es erneut."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Die eingegebenen PIN2-Codes stimmen nicht überein. Bitte versuchen Sie es erneut."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Geben Sie eine 4- bis 8-stellige PIN2 ein."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Geben Sie einen 8-stelligen PUK2 ein."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 erfolgreich geändert"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 geändert"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"PUK2 eingeben"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Passwort falsch. Ändern Sie die PIN2 und versuchen Sie es erneut!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Passwort falsch, SIM-Karte gesperrt! Eingabe des PUK2 erforderlich."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Passwort falsch. Ändern Sie die PIN2 und versuchen Sie es erneut."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Passwort falsch, SIM-Karte gesperrt. Eingabe des PUK2 erforderlich."</string>
     <string name="doneButton" msgid="2859593360997984240">"Fertig"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Telefonkonferenz <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Zurück zu Anruf"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Ohne SIM-Karte fortfahren"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Keine SIM-Karte gefunden. Legen Sie eine SIM-Karte in das Telefon ein."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Verwerfen"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Entsperren"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"PIN wird authentifiziert..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Mailboxnummer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Rufaufbau"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Wird wiederholt"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Telefonkonferenz"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Eingehender Anruf"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"CDMA-Anruf wartet"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Anruf beendet"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Gehaltener Anruf"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Auflegen"</string>
@@ -477,7 +410,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Entgangene Anrufe"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> entgangene Anrufe"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Entgangener Anruf von <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Aktueller Anruf (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Aktueller Anruf"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Gehaltener Anruf"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Eingehender Anruf"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Neue Nachricht"</string>
@@ -486,13 +419,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Mailboxnummer unbekannt"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"kein Dienst"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Ausgewähltes Netzwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nicht verfügbar"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Beenden"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Zurückrufen"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Nachricht"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Deaktivieren Sie zunächst den Flugmodus, um einen Anruf zu tätigen."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nicht in Netzwerk registriert."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilfunknetz ist nicht verfügbar."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Anruf nicht verbunden; keine gültige Nummer."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Anruf nicht verbunden."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI-Sequenz wird gestartet..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Funktionscodesequenz wird gestartet..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nicht unterstützter Dienst."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Wechsel zwischen Anrufen nicht möglich."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Anruf kann nicht getrennt werden."</string>
@@ -504,18 +439,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Notruf"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Mobilfunkverbindung wird aktiviert..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Gebiet ohne Netzabdeckung, erneuter Versuch..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Anruf nicht verbunden; <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ist keine Notrufnummer!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Anruf nicht verbunden. Wählen Sie eine Notrufnummer!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Anruf nicht verbunden. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ist keine Notrufnummer!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Anruf nicht verbunden. Wählen Sie eine Notrufnummer!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Zum Wählen Tastatur verwenden"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Tonwahltasten"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Halten"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Fortsetzen"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Ende"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Wähltasten"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Ausblenden"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Lautspr."</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Ton aus"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Anruf hinzufügen"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Anrufe verbinden"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Wechseln"</string>
@@ -534,36 +464,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI-Text"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF-Töne"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF-Töne"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Länge der DTMF-Töne einstellen"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Lang"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Netzwerknachricht"</string>
+    <string name="network_message" msgid="4483886461245213802">"Netzwerknachricht"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Ihr Telefon aktivieren"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Zur Aktivierung Ihres Telefondienstes muss ein spezieller Anruf getätigt werden. "\n\n"Wählen Sie \"Aktivieren\" und folgen Sie der Anleitung zur Aktivierung Ihres Telefons."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Wählen Sie \"Aktivieren\", um über einen speziellen Anruf Ihr Telefon beim Mobilfunknetz Ihres Anbieters zu aktivieren. Anschließend können Sie Anrufe tätigen und sich mit mobilen Datennetzwerken verbinden."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Aktivierung überspringen?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Wenn Sie die Aktivierung überspringen, können Sie keine Anrufe tätigen oder sich mit mobilen Datennetzwerken verbinden (Sie können sich allerdings mit WLAN-Netzwerken verbinden). Bis Sie Ihr Telefon aktivieren, werden Sie bei jedem Einschalten zur Aktivierung aufgefordert."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Überspringen"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktivieren"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktivieren"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Telefon ist aktiviert!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Das Telefon ist aktiviert."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problem mit der Aktivierung"</string>
     <string name="ota_listen" msgid="162923839877584937">"Folgen Sie der Anleitung bis Sie hören, dass die Aktivierung abgeschlossen ist."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Tastatur"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Lautspr."</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Bitte warten Sie, während Ihr Telefon programmiert wird."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programmierung nicht erfolgreich"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Bitte warten Sie, während Ihr Telefon programmiert wird."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programmierung fehlgeschlagen"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Ihr Telefon ist jetzt aktiviert. Es kann bis zu 15 Minuten dauern, bis der Dienst gestartet wird."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Ihr Telefon wurde nicht aktiviert. "\n"Suchen Sie einen Bereich auf, in dem Sie besseren Empfang haben, zum Beispiel in der Nähe eines Fensters oder unter freiem Himmel."\n\n"Versuchen Sie es erneut oder rufen Sie den Kundenservice an."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Ihr Telefon wurde nicht aktiviert. "\n"Suchen Sie einen Bereich auf, in dem Sie besseren Empfang haben, zum Beispiel in der Nähe eines Fensters oder unter freiem Himmel. "\n\n"Versuchen Sie es bitte noch einmal oder rufen Sie den Kundenservice an."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ZU VIELE SPC-FEHLER"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Zurück"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Erneut versuchen"</string>
     <string name="ota_next" msgid="3904945374358235910">"Weiter"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Zurück"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Notfallrückrufmodus aktiviert"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Notfallrückrufmodus"</string>
@@ -573,100 +498,84 @@
     <item quantity="other" msgid="3122217344579273583">"<xliff:g id="COUNT">%s</xliff:g> Minuten lang keine Datenverbindung"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Das Telefon wird sich <xliff:g id="COUNT">%s</xliff:g> Minute lang im Notfallrückrufmodus befinden. Während dieser Zeit können keine Anwendungen, die eine Datenverbindung verwenden, genutzt werden. Möchten Sie den Vorgang jetzt beenden?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Das Telefon wird sich <xliff:g id="COUNT">%s</xliff:g> Minuten im Notfallrückrufmodus befinden. Während dieser Zeit können keine Anwendungen, die eine Datenverbindung verwenden, genutzt werden. Möchten Sie den Vorgang jetzt beenden?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Das Telefon bleibt <xliff:g id="COUNT">%s</xliff:g> Minuten im Notfallrückrufmodus. In diesem Modus können keine Apps verwendet werden, die eine Datenverbindung erfordern. Möchten Sie den Vorgang jetzt beenden?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Das Telefon bleibt <xliff:g id="COUNT">%s</xliff:g> Minuten im Notfallrückrufmodus. In diesem Modus können keine Apps verwendet werden, die eine Datenverbindung erfordern. Möchten Sie den Vorgang jetzt beenden?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Die ausgewählte Aktion ist im Notfallrückrufmodus nicht verfügbar. Das Telefon bleibt <xliff:g id="COUNT">%s</xliff:g> Minuten in diesem Modus. Möchten Sie den Vorgang jetzt beenden?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Die ausgewählte Aktion ist im Notfallrückrufmodus nicht verfügbar. Das Telefon wird sich <xliff:g id="COUNT">%s</xliff:g> Minuten in diesem Modus befinden. Möchten Sie den Vorgang jetzt beenden?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Die ausgewählte Aktion ist im Notfallrückrufmodus nicht verfügbar. Das Telefon bleibt <xliff:g id="COUNT">%s</xliff:g> Minuten in diesem Modus. Möchten Sie den Vorgang jetzt beenden?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Die ausgewählte Aktion ist im Notfallrückrufmodus nicht verfügbar. Das Telefon bleibt <xliff:g id="COUNT">%s</xliff:g> Minuten in diesem Modus. Möchten Sie den Vorgang jetzt beenden?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Die ausgewählte Aktion ist während eines Notrufs nicht verfügbar."</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Notfallrückrufmodus wird beendet."</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Die ausgewählte Aktion ist während eines Notrufs nicht verfügbar."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Notfallrückrufmodus wird beendet..."</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Ja"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Nein"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Verwerfen"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Mailbox-Einstellungen"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;nicht festgelegt&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Mailbox-Dienst"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Einstellungen für <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Dienst"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Einrichtung"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nicht festgelegt&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Sonstige Anrufeinstellungen"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Wählen"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Anruf über ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Zum Annehmen nach rechts ziehen"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Zum Stummschalten des Klingeltons nach links ziehen"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Zum Abweisen nach links ziehen"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Zum Annehmen nach rechts ziehen und"\n"aktiven Anruf halten"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Zum Annehmen nach rechts ziehen und"\n"aktiven Anruf beenden"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Zum Annehmen nach rechts ziehen und"\n"gehaltenen Anruf beenden"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Annehmen"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Abweisen"</string>
+
+    <!-- Dialer UI Settings -->
+    <string name="dialer_ui_settings_title">Wähltasten</string>
+    <string name="dialer_ui_settings_summary">Einstellungen für die Wähltasten</string>
+
+    <string name="calling_via_template" msgid="4839419581866928142">"Anruf über <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"Kontaktbild"</string>
     <string name="goPrivate" msgid="865837794424530980">"privat sprechen"</string>
     <string name="selectContact" msgid="781975788478987237">"Kontakt wählen"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Einstellungen für Internetanrufe"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Konten für Internetanrufe (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Konten"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Verwaltung der Konten für Internetanrufe (SIP-Konten) und Statusinformationen"</string>
-    <string name="sip_receive_calls" msgid="5635685570889971559">"Eingeh. Anrufe annehmen"</string>
+    <string name="sip_receive_calls" msgid="5635685570889971559">"Eingehende Anrufe annehmen"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Verkürzt Akkulaufzeit"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Anrufoptionen konfigurieren"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Internetanrufe verwenden"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Internetanruf verwenden (nur WLAN)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Für alle Anrufe mit verfügbarem Datennetz"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Nur für Internetanrufe"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Bei jedem Anruf fragen"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Für alle Anrufe"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Automatische Registrierung"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Ausgehender Anruf über SIP"</string>
-    <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Anruf tätigen"</string>
+    <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Telefonieren"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Konto für Internetanrufe verwenden:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Immer für Internetanrufe verwenden"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Unter \"Anrufoptionen\" können Sie festlegen, welches Konto für Internetanrufe Sie als Standardkonto verwenden möchten. Wählen Sie in den Einstellungen für Internetanrufe einfach das gewünschte Konto."</string>
-    <string name="pstn_phone" msgid="8782554491484326429">"Handytelefonat"</string>
-    <string name="internet_phone" msgid="1147922660195095810">"Internetanruf"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Sie können auf Ihrem Telefon unter \"Einstellungen &gt; Einstellungen für Internetanrufe\" im Bildschirm \"Konten\" einstellen, welches Konto standardmäßig für Internetanrufe verwendet werden soll."</string>
+    <string name="pstn_phone" msgid="8782554491484326429">"per Telefon"</string>
+    <string name="internet_phone" msgid="1147922660195095810">"per Internet"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Kein Konto für Internetanrufe"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Auf diesem Telefon befinden sich keine Konten für Internetanrufe. Möchten Sie ein Konto hinzufügen?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Auf diesem Telefon befinden sich keine Konten für Internetanrufe. Möchten Sie jetzt ein Konto hinzufügen?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Hinzufügen"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Konto hinzufügen"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Konto entfernen"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP-Konten"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Konto wird gespeichert..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Konto wird entfernt..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Konto wird gespeichert..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Konto wird entfernt..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Speichern"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Verwerfen"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Profil schließen"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Schließen"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Primär"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Dieses Konto soll mein primäres Konto sein."</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Für ausgehende Anrufe verwendet"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Erweiterte Einstellungen"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Primäres Konto. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Status wird überprüft..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Registrierung läuft..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Wird weiter versucht..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Eingehende Anrufe deaktiviert"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Die Kontoregistrierung wurde abgebrochen. Es besteht keine Internetverbindung."</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Kontoregistrierung aufgrund fehlender WLAN-Verbindung gestoppt"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Kontoregistrierung fehlgeschlagen"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Eingehende Anrufe aktiviert"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registrierung läuft..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Wird weiter versucht..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Eingehende Anrufe deaktiviert"</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Kontoregistrierung aufgrund fehlender Internetverbindung gestoppt"</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Kontoregistrierung aufgrund fehlender WLAN-Verbindung gestoppt"</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Kontoregistrierung fehlgeschlagen"</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Eingehende Anrufe aktiviert"</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Kontoregistrierung fehlgeschlagen: <xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>. Erneuter Versuch zu einem späteren Zeitpunkt."</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Kontoregistrierung fehlgeschlagen: Nutzername oder Passwort falsch."</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Kontoregistrierung fehlgeschlagen. Überprüfen Sie den Servernamen."</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Dieses Konto wird zurzeit von der <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>-App verwendet."</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Kontoregistrierung fehlgeschlagen: Nutzername oder Passwort falsch."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Kontoregistrierung fehlgeschlagen. Bitte überprüfen Sie den Servernamen."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Dieses Konto wird momentan von der <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>-App verwendet."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIP-Konto: Details"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP-Konto: Details"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Server"</string>
     <string name="username_title" msgid="2479375923477682328">"Nutzername"</string>
     <string name="password_title" msgid="3323555249068171531">"Passwort"</string>
     <string name="display_name_title" msgid="2459768196312249937">"Anzeigename"</string>
-    <string name="proxy_address_title" msgid="4828301345351614273">"Ausgehende Proxy-Adr."</string>
+    <string name="proxy_address_title" msgid="4828301345351614273">"Ausgehende Proxy-Adresse"</string>
     <string name="port_title" msgid="5952939408078626657">"Port-Nummer"</string>
     <string name="transport_title" msgid="8253139511847746640">"Transportart"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Keep-Alive senden"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"SIP-Keep-Alive-Nachrichten senden"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Automatische Registrierung"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Profil automatisch registrieren"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Als primäres Konto festlegen"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Für ausgehende Anrufe verwendet"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Optionale Einstellungen"</string>
@@ -677,21 +586,21 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Optional&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Tippen, um alle anzuzeigen"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Tippen, um alle auszublenden"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ist ein erforderliches Feld. Es darf nicht leer bleiben."</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Portnummer muss zwischen 1000 und 65534 liegen."</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ist ein erforderliches Feld. Es darf nicht leer bleiben."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Portnummer muss zwischen 1000 und 65534 liegen."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Keine Internetverbindung."</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Keine WLAN-Verbindung"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Überprüfen Sie zunächst Ihre Internetverbindung, bevor Sie einen Internetanruf tätigen."</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Für Internetanrufe ist eine aktive WLAN-Verbindung notwendig. Wählen Sie die entsprechenden Einstellungen unter \"Drahtlos &amp; Netzwerke\"."</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Überprüfen Sie zunächst Ihre Internetverbindung, bevor Sie einen Internetanruf tätigen."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Für Internetanrufe ist eine aktive WLAN-Verbindung notwendig. Wählen Sie die entsprechenden Einstellungen unter \"Drahtlos &amp; Netzwerke\"."</string>
     <string name="no_voip" msgid="8901474054537199865">"Internetanrufe werden nicht unterstützt."</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automatisch"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Immer senden"</string>
     <string name="not_voice_capable" msgid="2739898841461577811">"Sprachanruf wird nicht unterstützt."</string>
-    <string name="respond_via_sms_canned_response_1" msgid="2461606462788380215">"Kann nicht sprechen. Was gibt\'s?"</string>
+    <string name="respond_via_sms_canned_response_1" msgid="2461606462788380215">"Kann jetzt nicht sprechen. Was gibt\'s?"</string>
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Ich rufe gleich zurück."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Ich rufe später zurück."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Kann jetzt nicht sprechen. Später?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Benutzerdefinierte SMS..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Benutzerdefinierte SMS"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Kurzantworten"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Kurzantworten bearbeiten"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -709,7 +618,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"Sternsymbol"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"Null"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"Pfund"</string>
-    <string name="description_search_button" msgid="239929880630534731">"Suchen"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"Wählen"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"Rücktaste"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Freisprechfunktion aktiviert"</string>
@@ -719,9 +627,46 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Ablehnen"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibration"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibration"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Klingelton"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Immer"</item>
     <item msgid="1595097872875714252">"Nur im Lautlos-Modus"</item>
     <item msgid="1458182414036878616">"Nie"</item>
   </string-array>
+
+    <string name="ringtone_title" msgid="6374978286202084684">"Klingelton"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Beim Klingeln vibrieren"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Wähltastentöne"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Klingelton"</string>
+
+    <string name="voice_quality_preferences_title">Sprachqualität</string>
+    <string name="voice_quality_summary">Sprachprofil: %s</string>
+    <string name="voice_quality_entry_normal">Normal</string>
+    <string name="voice_quality_entry_clear">Klar</string>
+    <string name="voice_quality_entry_crisp">Sehr klar</string>
+    <string name="voice_quality_entry_bright">Hell</string>
+
+    <string name="perm_change_mobile_network">Mobilfunkstandard wechseln (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Anwendungen mit dieser Berechtigung können jederzeit zwischen 2G- und 3G-Netz wechseln. 3G ist schneller, verbraucht mehr Batterieladung und kann teurer sein</string>
+
+    <!-- Advanced Settings -->
+    <string name="advanced_setting">Erweiterte Einstellungen</string>
+    <string name="keep_proximity_sensor_on">Näherungssensor eingeschaltet lassen</string>
+    <string name="keep_proximity_sensor_on_sum">Den Näherungssensor während eines Anrufs mit Headset nicht ausschalten</string>
+    <string name="lockscreen_if_call_ends_with_screenoff">Sperren nach Anruf</string>
+    <string name="lockscreen_if_call_ends_with_screenoff_sum">Automatsich sperren, wenn ein Anruf beendet wurde und der Bildschirm ausgeschaltet ist</string>
+    <string name="vibrate_outgoing">Vibriere bei Annahme</string>
+    <string name="vibrate_45">Vibriere alle 45 Sekunden</string>
+    <string name="vibrate_45_sum">Vibriere alle 45 Sekunden während ausgehender Anrufe</string>
+    <string name="vibrate_hangup">Vibriere bei Auflegen</string>
+    <string name="vibrate_call_waiting">Vibriere bei Anklopfen</string>
+
+    <!-- Noise suppression -->
+    <string name="noise_suppression_title">Nebengeräusch-Unterdrückung</string>
+    <string name="noise_suppression_summary">Nebengeräusch-Unterdrückung aktivieren</string>
+
+    <!-- Set Phone Number Settings -->
+    <string name="phone_number_label">Meine Nummer</string>
+    <string name="phone_number_summary">Die Telefonnummer für dieses Gerät einstellen</string>
+
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 867047957..a9112c7b9 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Απόκρυψη"</string>
     <string name="payphone" msgid="1931775086311769314">"Καρτοτηλέφωνο"</string>
     <string name="onHold" msgid="9035493194749959955">"Σε αναμονή"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Τρέχουσα κλήση"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Η γραμμή είναι απασχολημένη"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Το δίκτυο είναι απασχολημένο"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Καμία απάντηση, το χρονικό όριο έληξε"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Αδυναμία πρόσβασης σε διακομιστή"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Δεν είναι δυνατή η κλήση του αριθμού"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Εσφαλμένο όνομα χρήστη ή κωδικός πρόσβασης"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Κλήση εκτός δικτύου"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Κλήση εκτός δικτύου"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Σφάλμα διακομιστή: Δοκιμάστε ξανά αργότερα."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Δεν υπάρχει σήμα"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Υπέρβαση ορίου ACM"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Ο πομπός είναι απενεργοποιημένος"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Δεν υπάρχει κάρτα SIM ή σφάλμα κάρτας SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Δεν υπάρχει κάρτα SIM ή σφάλμα κάρτας SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Εκτός περιοχής κάλυψης"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Οι εξερχόμενες κλήσεις περιορίζονται από το FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Δεν μπορείτε να πραγματοποιήσετε εξερχόμενες κλήσεις όσο η φραγή κλήσεων είναι ενεργοποιημένη."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Δεν μπορείτε να πραγματοποιήσετε εξερχόμενες κλήσεις όσο η φραγή κλήσεων είναι ενεργοποιημένη."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Όλες οι κλήσεις περιορίζονται από τον έλεγχο πρόσβασης."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Οι κλήσεις επείγουσας ανάγκης περιορίζονται από τον έλεγχο πρόσβασης."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Οι κανονικές κλήσεις περιορίζονται από τον έλεγχο πρόσβασης."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Κλείδωμα τηλεφώνου έως τον επόμενο κύκλο ενέργειας."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Η κλήση απορρίφθηκε."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Διακοπή κλήσης."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: αναδιάταξη."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA:απόρριψη επιλογής υπηρεσίας."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: σειρά επανάληψης."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Η πρόσβαση δεν ήταν επιτυχής."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Προκαθορίστηκε."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Μόνο κλήσεις έκτακτης ανάγκης."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Μη έγκυρος αριθμός"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Μη έγκυρος αριθμός"</string>
     <string name="confCall" msgid="1904840547188336828">"Κλήση συνδιάσκεψης"</string>
     <string name="call_lost" msgid="317670617901479594">"Αναπάντητη κλήση."</string>
-    <string name="retry" msgid="8462986804300767852">"Νέα προσπάθεια"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Αναπάντητη κλήση"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Έναρξη κώδικα MMI"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Ο κώδικας USSD εκτελείται..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Ενσύρ. ακουστ."</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Αποστολή των παρακάτω τόνων;"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Τόνοι αποστολής"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Τόνοι αποστολής"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Αποστολή"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Ναι"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Όχι"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Αντικατάσταση του χαρακτήρα μπαλαντέρ με"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Αντικατάσταση του χαρακτήρα μπαλαντέρ με"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Λείπει ο αριθμός αυτόματου τηλεφωνητή"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Δεν έχει αποθηκευτεί αριθμός για τον αυτόματο τηλεφωνητή στην κάρτα SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Προσθήκη αριθμού"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Φόρτωση..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Πληκτρολογήστε τον κώδικα PIN για να ξεκλειδώσετε την κάρτα SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"Η κάρτα SIM ξεκλειδώθηκε"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Νέος κώδικας αριθμού PIN της κάρτας SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Για επιβεβαίωση, πληκτρολογήστε ξανά τον νέο αριθμό PIN της κάρτας SIM"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Οι αριθμοί PIN της κάρτας SIM που πληκτρολογήσατε δεν ταιριάζουν. Δοκιμάστε ξανά."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Πληκτρολογήστε τον κώδικα PUK για να ξεκλειδώσετε την κάρτα SIM"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Λανθασμένος κώδικας PUK!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Συνέχεια"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Καταργήθηκε ο αποκλεισμός της κάρτας SIM. Το τηλέφωνό σας ξεκλειδώνεται..."</string>
     <string name="label_ndp" msgid="780479633159517250">"Αριθμός PIN ξεκλειδώματος δικτύου κάρτας SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Ξεκλείδωμα"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Αίτηση ξεκλειδώματος δικτύου..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Ανεπιτυχές αίτημα ξεκλειδώματος δικτύου."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Το ξεκλείδωμα δικτύου ήταν επιτυχές."</string>
-    <string name="imei" msgid="8552502717594321281">"Αριθμός ΙΜΕΙ"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Ρυθμίσεις κλήσης GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Ρυθμίσεις κλήσης CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Ονόματα σημείου πρόσβασης"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Πρόσθετες ρυθμίσεις κλήσης μόνο CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Ρυθμίσεις υπηρεσίας δικτύου"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Αναγνώριση κλήσης"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Φόρτωση ρυθμίσεων…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Απόκρυψη αριθμού στις εξερχόμενες κλήσεις"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Αριθμός που προβάλλεται στις εξερχόμενες κλήσεις"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Χρήση των προεπιλεγμένων ρυθμίσεων της εταιρείας για την προβολή του αριθμού μου στις εξερχόμενες κλήσεις"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Αριθμός όταν είμαι απασχολημένος/ή"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Προώθηση προς <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Απενεργοποιημένη"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Ο φορέας σας δεν υποστηρίζει την απενεργοποίηση της προώθησης κλήσεων όταν το τηλέφωνό σας είναι απασχολημένο."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Ο φορέας σας δεν υποστηρίζει την απενεργοποίηση της προώθησης κλήσεων όταν το τηλέφωνό σας είναι απασχολημένο."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Προώθηση όταν δεν απαντάω"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Αριθμός όταν δεν απαντάω"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Προώθηση προς <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Απενεργοποιημένη"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Ο φορέας σας δεν υποστηρίζει την απενεργοποίηση της προώθησης κλήσεων όταν το τηλέφωνό σας δεν απαντάει."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Η εταιρεία σας δεν υποστηρίζει την απενεργοποίηση της προώθησης κλήσεων όταν το τηλέφωνό σας δεν απαντάει."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Προώθηση όταν δεν είμαι διαθέσιμος/η"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Αριθμός όταν δεν είμαι διαθέσιμος/η"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Προώθηση προς <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Απενεργοποιημένη"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Ο φορέας σας δεν υποστηρίζει την απενεργοποίηση της προώθησης κλήσεων όταν το τηλέφωνό σας δεν έχει σήμα."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Η εταιρεία κινητής τηλεφωνίας δεν υποστηρίζει την απενεργοποίηση της προώθησης κλήσεων όταν το τηλέφωνό σας δεν έχει σήμα."</string>
     <string name="updating_title" msgid="6146755386174019046">"Ρυθμίσεις κλήσης"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Σφάλμα ρυθμίσεων κλήσης"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Ανάγνωση ρυθμίσεων…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Επαναφορά ρυθμίσεων…"</string>
     <string name="response_error" msgid="6674110501330139405">"Μη αναμενόμενη απάντηση από το δίκτυο."</string>
     <string name="exception_error" msgid="7027667130619518211">"Σφάλμα δικτύου ή κάρτας SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Οι λειτουργίες επιτρέπονται μόνο για καθορισμένους αριθμούς κλήσης."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Πριν προβάλετε αυτές τις ρυθμίσεις, ενεργοποιήστε τον πομπό."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Έχει ενεργοποιηθεί η ρύθμιση αριθμών κλήσης καθορισμένων αριθμών της εφαρμογής του τηλεφώνου σας. Γι αυτόν τον λόγο δεν λειτουργούν ορισμένες λειτουργίες που σχετίζονται με τις κλήσεις."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Πριν προβάλετε αυτές τις ρυθμίσεις, ενεργοποιήστε τον πομπό."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Ενεργοποίηση"</string>
     <string name="disable" msgid="7274240979164762320">"Απενεργοποίηση"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Απόκρυψη αριθμού"</item>
     <item msgid="1108394741608734023">"Εμφάνιση αριθμού"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Αποθήκευση αριθμού αυτόματου τηλεφωνητή"</string>
     <string name="vm_changed" msgid="380744030726254139">"Ο αριθμός αυτόματου τηλεφωνητή άλλαξε."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Μη επιτυχής αλλαγή αριθμού αυτόματου τηλεφωνητή."\n"Επικοινωνήστε με την εταιρεία σας παροχής υπηρεσιών εάν δεν επιλυθεί το πρόβλημα."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Μη επιτυχής αλλαγή αριθμού προώθησης κλήσης."\n"Επικοινωνήστε με την εταιρεία σας παροχής υπηρεσιών εάν δεν επιλυθεί το πρόβλημα."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Δεν ήταν δυνατή η αλλαγή του αριθμού για τον αυτόματο τηλεφωνητή."\n"Επικοινωνήστε με την εταιρεία σας εάν το πρόβλημα παραμένει."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Δεν ήταν δυνατή η αλλαγή του αριθμού προώθησης."\n"Επικοινωνήστε με την εταιρεία σας εάν το πρόβλημα παραμένει."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Δεν ήταν δυνατή η ανάκτησης και η αποθήκευση των τρεχουσών ρυθμίσεων αριθμού προώθησης."\n"Να γίνει εναλλαγή στο νέο πάροχο υπηρεσιών;"</string>
     <string name="no_change" msgid="3186040086622435212">"Δεν έγιναν αλλαγές."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Επιλογή υπηρεσίας αυτόματου τηλεφωνητή"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Αναζήτηση δικτύων"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Προέκυψε σφάλμα κατά την αναζήτηση δικτύων."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Εγγραφή στο δίκτυο <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Η κάρτα SIM δεν επιτρέπει τη σύνδεση με αυτό το δίκτυο."</string>
-    <string name="connect_later" msgid="500090982903469816">"Δεν είναι δυνατή η σύνδεση σε αυτό το δίκτυο αυτήν τη στιγμή. Προσπαθήστε ξανά αργότερα."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Η κάρτα SIM δεν επιτρέπει τη σύνδεση με αυτό το δίκτυο."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Δεν είναι δυνατή η σύνδεση στο δίκτυο αυτήν τη στιγμή. Παρακαλούμε ξαναπροσπαθήστε αργότερα."</string>
     <string name="registration_done" msgid="495135664535876612">"Έγινε εγγραφή στο δίκτυο."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Επιλέξτε εταιρεία δικτύου"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Επιλέξτε μια εταιρεία δικτύου"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Αναζήτηση διαθέσιμων δικτύων"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Αυτόματη επιλογή"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Αυτόματη επιλογή προτιμώμενου δικτύου"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Αυτόματη εγγραφή..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Αυτόματη επιλογή"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Αυτόματη επιλογή προτιμώμενου δικτύου"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Αυτόματη εγγραφή..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Λειτουργία δικτύου"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Αλλαγή κατάστασης λειτουργίας δικτύου"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Προτιμώμενη λειτουργία δικτύου"</string>
@@ -192,30 +169,29 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Προτιμώμενη λειτουργία δικτύου: μόνο EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Προτιμώμενη λειτουργία δικτύου: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE / CDMA"</item>
     <item msgid="3273348576277144124">"Μόνο EvDo"</item>
     <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="8928247118825616081">"Αυτόματο CDMA / EvDo"</item>
-    <item msgid="8595462903294812666">"Αυτόματο GSM / WCDMA"</item>
+    <item msgid="648505122852496166">"Αυτόματο EvDo/CDMA"</item>
+    <item msgid="7148247646407324800">"Αυτόματο GSM/WCDMA"</item>
     <item msgid="5189164180446264504">"Μόνο WCDMA"</item>
     <item msgid="5714714953966979187">"Μόνο GSM"</item>
-    <item msgid="4775796025725908913">"Προτιμώνται GSM / WCDMA"</item>
+    <item msgid="8508331239546115206">"Προτιμώνται GSM/WCDMA"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Ενεργοποίηση δεδομένων"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Ενεργοποίηση της πρόσβασης δεδομένων μέσω του δικτύου κινητής τηλεφωνίας"</string>
     <string name="roaming" msgid="8871412572928323707">"Περιαγωγή δεδομένων"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Σύνδεση στις υπηρεσίες δεδομένων κατά την περιαγωγή"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"Σύνδεση στις υπηρεσίες δεδομένων κατά την περιαγωγή"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Χάσατε τη σύνδεση δεδομένων επειδή φύγατε από το οικείο δίκτυο έχοντας την περιαγωγή δεδομένων απενεργοποιημένη."</string>
+    <string name="roaming_disable" msgid="1843417228755568110">"Να μη γίνεται σύνδεση στις υπηρεσίες δεδομένων κατά την περιαγωγή"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Χάσατε τη σύνδεση δεδομένων επειδή φύγατε από το οικείο δίκτυο έχοντας την περιαγωγή δεδομένων απενεργοποιημένη."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Να επιτρέπεται η περιαγωγή δεδομένων; Ενδέχεται να επιβαρυνθείτε με σημαντικά έξοδα περιαγωγής!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Επιλογές GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Επιλογές CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Χρήση δεδομένων"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Πολιτική δεδομένων εταιρείας"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Δεδομένα που χρησιμοποιήθηκαν την τρέχουσα περίοδο"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Περίοδος χρήσης δεδομένων"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Πολιτική ταχύτητας δεδομένων"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Έχει περάσει το <xliff:g id="USED_0">%1$d</xliff:g>٪ του κύκλου"\n"Η επόμενη περίοδος ξεκινά σε <xliff:g id="USED_1">%2$d</xliff:g> ημέρες (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Εάν το όριο χρήσης δεδομένων ξεπεραστεί, τότε η ταχύτητα δεδομένων θα μειωθεί σε <xliff:g id="USED">%1$d</xliff:g> Kb/s"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Περισσότερες πληροφορίες σχετικά με την πολιτική χρήσης δεδομένων στο δίκτυο της εταιρείας κινητής τηλεφωνίας"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Cell Broadcast SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Cell Broadcast SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Cell Broadcast SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Ενεργοποιήθηκε η μετάδοση SMS μέσω κινητού τηλεφώνου"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Κορεατικά"</item>
     <item msgid="1933212028684529632">"Κινεζικά"</item>
     <item msgid="1908428006803639064">"Εβραϊκά"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Γλώσσες"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Τοπική πρόγνωση καιρού"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Ευκαιρίες καριέρας"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Ενεργοποιήθηκε η προβολή ευκαιριών καριέρας"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Απενεργοποιήθηκε η προβολή ευκαιριών καριέρας"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Ιατρικά θέματα, Υγεία και Νοσοκομεία"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Ενεργοποιήθηκε η προβολή Ιατρικών θεμάτων, Υγείας και Νοσοκομείων"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Απενεργοποιήθηκε η προβολή Ιατρικών θεμάτων, Υγείας και Νοσοκομείων"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Ιατρικά θέματα, Υγεία και Νοσοκομεία"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Ενεργοποιήθηκε η προβολή Ιατρικών θεμάτων, Υγείας και Νοσοκομείων"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Απενεργοποιήθηκε η προβολή Ιατρικών θεμάτων, Υγείας και Νοσοκομείων"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Τεχνολογικά νέα"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Ενεργοποιήθηκε η προβολή τεχνολογικών νέων"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Απενεργοποιήθηκε η προβολή τεχνολογικών νέων"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"Μόνο WCDMA"</item>
     <item msgid="8776934131146642662">"Μόνο GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (προτιμάται WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Χρήση μόνο δικτύων 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Εξοικονόμηση μπαταρίας"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Επιλογή συστήματος"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Αλλαγή της λειτουργίας περιαγωγής cdma"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Αλλαγή της λειτουργίας περιαγωγής CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Επιλογή συστήματος"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Μόνο αρχική σελίδα"</item>
     <item msgid="1205664026446156265">"Αυτόματο"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Λειτουργία περιαγωγής CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Αλλαγή της λειτουργίας περιαγωγής cdma"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Λειτουργία περιαγωγής CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Μόνο οικιακά δίκτυα"</item>
-    <item msgid="8174642753290624634">"Συνεργαζόμενα δίκτυα"</item>
-    <item msgid="2241951431403168661">"Οποιοδήποτε δίκτυο"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Συνδρομή CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Προτιμήσεις δικτύου CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Δεν εφαρμόστηκε ακόμη!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Προτιμήσεις δικτύου CDMA"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"Μόνο CDMA"</item>
     <item msgid="2683555124647197574">"Μόνο EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Συνδρομή CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Αλλαγή μεταξύ RUIM/SIM και NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"συνδρομή"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Ενεργοποίηση συσκευής"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Ρύθμιση υπηρεσίας δεδομένων"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Διαχείριση αριθμών κλήσης καθορισμένων αριθμών"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Αλλαγή αριθμού PIN για πρόσβαση FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Διαχείριση λίστας αριθμών τηλεφώνου"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Απόρρητο φωνής"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Απόρρητο φωνής"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Ενεργοποίηση λειτουργίας σύνθετου απορρήτου"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Λειτουργία TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Ενεργοποίηση λειτουργίας TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Λειτουργία TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Ορισμός λειτουργίας TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Αυτόματη επανάληψη"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Ενεργοποίηση λειτουργίας αυτόματης επανάληψης"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Αυτόματη επανάληψη"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Ενεργοποίηση λειτουργίας αυτόματης επανάληψης"</string>
     <string name="menu_add" msgid="1882023737425114762">"Προσθήκη επαφής"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Επεξεργασία επαφής"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Διαγραφή επαφής"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Εισάγετε τον αριθμό PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Τύπος PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Όνομα"</string>
     <string name="number" msgid="7905950798349903858">"Αριθμός"</string>
     <string name="save" msgid="4094274636321939086">"Αποθ/ση"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Διαγραφή καθορισμένου αριθμού κλήσης"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Διαγραφή καθορισμένου αριθμού κλήσης…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Ο καθορισμένος αριθμός κλήσης διαγράφηκε."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Το FDN δεν ενημερώθηκε: εισαγάγατε εσφαλμένο PIN."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"Το FDN δεν ενημερώθηκε: ο αριθμός δεν μπορεί να περιέχει περισσότερα από 20 ψηφία."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Το FDN δεν ενημερώθηκε, επειδή πληκτρολογήσατε εσφαλμένο PIN."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Το FDN δεν ενημερώθηκε διότι ο αριθμός δεν μπορεί να ξεπερνάει τα 20 ψηφία."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Δεν έγινε ενημέρωση του FDN. Το PIN2 ήταν λανθασμένο ή ο αριθμός του τηλεφώνου απορρίφθηκε."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Ανάγνωση από κάρτα SIM…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Δεν υπάρχουν επαφές στην κάρτα SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Επιλέξτε επαφές για εισαγωγή"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Για την εισαγωγή επαφών από την κάρτα SIM, απενεργοποιήστε τη λειτουργία πτήσης."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Για την εισαγωγή επαφών από την κάρτα SIM, απενεργοποιήστε πρώτα τη λειτουργία πτήσης."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Ενεργοποίηση/απενεργοποίηση αριθμού PIN της κάρτας SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Αλλαγή αριθμού PIN της κάρτας SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"Αριθμός PIN της κάρτας SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Παλιός αριθμός PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Νέος αριθμός PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Επιβεβαίωση νέου αριθμού PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Ο παλιός αριθμός PIN που πληκτρολογήσατε δεν είναι σωστός. Δοκιμάστε ξανά."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Οι αριθμοί PIN που πληκτρολογήσατε δεν ταιριάζουν. Δοκιμάστε ξανά."</string>
+    <string name="badPin" msgid="8955102849303984935">"Το παλιό PIN που πληκτρολογήσατε δεν είναι σωστό. Δοκιμάστε ξανά."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Τα PIN που πληκτρολογήσατε δεν ταιριάζουν. Δοκιμάστε ξανά."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Πληκτρολογήστε έναν αριθμό PIN που να αποτελείται από 4 έως 8 αριθμούς."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Απενεργοποίηση αριθμού PIN της κάρτας SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Ενεργοποίηση αριθμού PIN της κάρτας SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Περιμένετε..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"Ο αριθμός PIN της κάρτας SIM ενεργοποιήθηκε"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"Ο αριθμός PIN της κάρτας SIM απενεργοποιήθηκε"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Ο αριθμός PIN που πληκτρολογήσατε είναι λανθασμένος"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"Η αλλαγή του αριθμού PIN της κάρτας SIM ήταν επιτυχημένη"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"Το PIN της κάρτας SIM ενεργοποιήθηκε."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"Το PIN της κάρτας SIM απενεργοποιήθηκε."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Ο αριθμός PIN που πληκτρολογήσατε ήταν λανθασμένος."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"Ο αριθμός PIN της κάρτας SIM άλλαξε επιτυχώς."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Λανθασμένος κωδικός πρόσβασης, η κάρτα SIM κλειδώθηκε! Ζητήθηκε κωδικός PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"Αριθμός PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Παλιός αριθμός PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Νέος αριθμός PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Επιβεβαίωση νέου αριθμού PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Ο αριθμός PUK2 που πληκτρολογήσατε δεν είναι σωστός. Δοκιμάστε ξανά."</string>
-    <string name="badPin2" msgid="515218795152422178">"Ο παλιός αριθμός PIN2 που πληκτρολογήσατε δεν είναι σωστός. Δοκιμάστε ξανά."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Ο αριθμός PIN2 που εισάγατε δεν ταιριάζει. Δοκιμάστε ξανά."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Ο αριθμός PUK2 που πληκτρολογήσατε δεν είναι σωστός. Δοκιμάστε ξανά."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Ο παλιός αριθμός PIN2 που πληκτρολογήσατε δεν είναι σωστός. Δοκιμάστε ξανά."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Ο αριθμός PIN2 που πληκτρολογήσατε δεν ταιριάζει. Δοκιμάστε ξανά."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Πληκτρολογήστε έναν αριθμό PIN2 που να αποτελείται από 4 έως 8 αριθμούς."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Πληκτρολογήστε έναν αριθμό PUK2 που αποτελείται από 8 αριθμούς."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"Η αλλαγή του αριθμού PIN2 ήταν επιτυχημένη"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"Η αλλαγή του αριθμού PIN2 ήταν επιτυχημένη."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Πληκτρολογήστε τον κώδικα PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Ο κωδικός πρόσβασης είναι λανθασμένος, αλλάξτε τον αριθμό PIN2 και δοκιμάστε ξανά!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Λανθασμένος κωδικός πρόσβασης, η κάρτα SIM κλειδώθηκε! Ζητήθηκε κωδικός PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Ο κωδικός πρόσβασης είναι λανθασμένος. Αλλάξτε τον αριθμό PIN2 και δοκιμάστε ξανά!"</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Λανθασμένος κωδικός πρόσβασης, η κάρτα SIM κλειδώθηκε. Ζητήθηκε κωδικός PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Τέλος"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Κλήση συνδιάσκεψης <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Επιστροφή στην κλήση"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Συνέχεια χωρίς κάρτα SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Δεν βρέθηκε κάρτα SIM. Εισάγετε μια κάρτα SIM στο τηλέφωνο."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Παράβλεψη"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Ξεκλείδωμα"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Έλεγχος ταυτότητας αριθμού PIN…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Αριθμός αυτόματου τηλεφωνητή"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Κλήση"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Νέα προσπάθεια"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Κλήση συνδιάσκεψης"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Εισερχόμενη κλήση"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Αναμονή κλήσης Cdma"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Η κλήση τερματίστηκε"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Σε αναμονή"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Κλείσιμο γραμμής"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Αναπάντητες κλήσεις"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> αναπάντητες κλήσεις"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Αναπάντητη κλήση από <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Τρέχουσα κλήση (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Κλήση σε εξέλιξη"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Σε αναμονή"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Εισερχόμενη κλήση"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Νέο μήνυμα στον αυτόματο τηλεφωνητή"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Ο αριθμός αυτόματου τηλεφωνητή είναι άγνωστος"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Δίκτυο μη διαθέσιμο"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Επιλεγμένο δίκτυο (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) μη διαθέσιμο"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Τερματισμός κλήσης"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Επανάκληση"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Μήνυμα"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Για να πραγματοποιήσετε μια κλήση, απενεργοποιήστε πρώτα τη λειτουργία πτήσης."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Δεν έχετε εγγραφεί στο δίκτυο."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Το δίκτυο κινητής τηλεφωνίας δεν είναι διαθέσιμο."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Η κλήση δεν πραγματοποιήθηκε, δεν έγινε εισαγωγή έγκυρου αριθμού."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"H κλήση δεν πραγματοποιήθηκε."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Έναρξη ακολουθίας MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Έναρξη αλληλουχίας κωδικού λειτουργίας..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Μη υποστηριζόμενη υπηρεσία."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Αδύνατη η εναλλαγή κλήσεων."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Δεν ήταν δυνατός ο διαχωρισμός της κλήσης."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Κλήσεις επείγουσας ανάγκης"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ενεργοποίηση πομπού..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Εκτός περιοχής κάλυψης, επανάληψη κλήσης..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Η κλήση δεν πραγματοποιήθηκε, το <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> δεν είναι αριθμός επείγουσας ανάγκης!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Η κλήση δεν πραγματοποιήθηκε, καλέστε έναν αριθμό επείγουσας ανάγκης!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Η κλήση δεν πραγματοποιήθηκε. Το <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> δεν είναι αριθμός έκτακτης ανάγκης!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Η κλήση δεν πραγματοποιήθηκε. Καλέστε έναν αριθμό επείγουσας ανάγκης!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Χρησιμοποιήστε το πληκτρολόγιο για να πραγματοποιήσετε καλέσετε έναν αριθμό"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Αγγίξτε το πληκτρολόγιο τόνων"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Αναμονή"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Διακοπή αναμονής"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Τέλος"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Πληκτρολόγιο κλήσης"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Απόκρυψη"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Ηχείο"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Σίγαση"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Προσθήκη κλήσης"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Συγχώνευση κλήσεων"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Ανταλλαγή"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Κείμενο ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Τόνοι DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Τόνοι DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Ορισμός διάρκειας τόνων DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Κανονική"</item>
     <item msgid="2883365539347850535">"Συνεχόμενος"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Μήνυμα δικτύου"</string>
+    <string name="network_message" msgid="4483886461245213802">"Μήνυμα δικτύου"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Ενεργοποίηση του τηλεφώνου σας"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Πρέπει να γίνει ειδική κλήση για την ενεργοποίηση της υπηρεσίας του τηλεφώνου που διαθέτετε. "\n\n"Αφού πατήσετε την \"Ενεργοποίηση\", ακούστε τις οδηγίες που παρέχονται για να ενεργοποιήσετε το τηλέφωνό σας."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Αγγίξτε την ένδειξη “Ενεργοποίηση” για να πραγματοποιήσετε μια ειδική κλήση που ενεργοποιεί το τηλέφωνό σας στο δίκτυο της εταιρείας κινητής τηλεφωνίας που χρησιμοποιείτε ώστε να μπορείτε να πραγματοποιείτε κλήσεις και να συνδέεστε σε δίκτυα δεδομένων κινητής τηλεφωνίας."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Παράβλεψη ενεργοποίησης;"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Εάν παραλείψετε την ενεργοποίηση, δεν θα μπορείτε να πραγματοποιήσετε κλήσεις ή να συνδεθείτε σε δίκτυα δεδομένων κινητής τηλεφωνίας (αν και θα μπορείτε να συνδεθείτε σε δίκτυα Wi-Fi). Μέχρι να ενεργοποιήσετε το τηλέφωνό σας, θα σας ζητείται να το ενεργοποιήσετε κάθε φορά που θα το θέτετε σε λειτουργία."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Παράλειψη"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Ενεργοποίηση"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Ενεργοποίηση"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Το τηλέφωνο ενεργοποιήθηκε!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Το τηλέφωνο ενεργοποιήθηκε."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Πρόβλημα κατά την ενεργοποίηση"</string>
     <string name="ota_listen" msgid="162923839877584937">"Ακολουθήστε τις φωνητικές οδηγίες μέχρι να ακούσετε ότι η ενεργοποίηση ολοκληρώθηκε."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Πληκτρολόγιο"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Ηχείο"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Περιμένετε μέχρι να ολοκληρωθεί ο προγραμματισμός του τηλεφώνου σας."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Μη επιτυχής προγραμματισμός"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Περιμένετε μέχρι να ολοκληρωθεί ο προγραμματισμός του τηλεφώνου σας."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Μη επιτυχής προγραμματισμός"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Το τηλέφωνό σας ενεργοποιήθηκε. Ενδέχεται να χρειαστούν έως και 15 λεπτά για την έναρξη της υπηρεσίας."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Το τηλέφωνό σας δεν ενεργοποιήθηκε. "\n"Ίσως χρειάζεται να βρείτε μια περιοχή με καλύτερη κάλυψη (κοντά σε ένα παράθυρο ή σε εξωτερικό χώρο). "\n\n"Δοκιμάστε ξανά ή καλέστε την υπηρεσία εξυπηρέτησης πελατών για περισσότερες επιλογές."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Το τηλέφωνό σας δεν ενεργοποιήθηκε "\n"Ίσως χρειάζεται να βρείτε μια περιοχή με καλύτερη κάλυψη (κοντά σε ένα παράθυρο ή σε εξωτερικό χώρο). "\n\n"Δοκιμάστε ξανά ή καλέστε την υπηρεσία εξυπηρέτησης πελατών για περισσότερες επιλογές."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"EXCESS SPC FAILURES"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Πίσω"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Προσπαθήστε ξανά"</string>
     <string name="ota_next" msgid="3904945374358235910">"Επόμενο"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Πίσω"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"Παράθυρο διαλόγου εξόδου από λειτουργία κλήσης έκτακτης ανάγκης"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Είσοδος σε λειτουργία επιστροφής κλήσης έκτακτης ανάγκης"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Λειτουργία επιστροφής κλήσης έκτακτης ανάγκης"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"Δεν θα υπάρχει σύνδεση δεδομένων για <xliff:g id="COUNT">%s</xliff:g> λεπτά"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Το τηλέφωνο θα βρίσκεται σε λειτουργία επιστροφής κλήσης έκτακτης ανάγκης για <xliff:g id="COUNT">%s</xliff:g> λεπτό. Κατά τη διάρκεια αυτής της λειτουργίας η χρήση εφαρμογών που χρησιμοποιούν σύνδεση δεδομένων δεν θα είναι εφικτή. Θέλετε να πραγματοποιήσετε έξοδο τώρα;"</item>
-    <item quantity="other" msgid="3231879566243957821">"Το τηλέφωνο θα βρίσκεται σε λειτουργία επιστροφής κλήσης έκτακτης ανάγκης για <xliff:g id="COUNT">%s</xliff:g> λεπτά. Κατά τη διάρκεια αυτής της λειτουργίας η χρήση εφαρμογών που χρησιμοποιούν σύνδεση δεδομένων δεν θα είναι εφικτή. Θέλετε να πραγματοποιήσετε έξοδο τώρα;"</item>
+    <item quantity="one" msgid="8060210887681426682">"Το τηλέφωνο θα βρίσκεται στη λειτουργία επιστροφής κλήσης έκτακτης ανάγκης για <xliff:g id="COUNT">%s</xliff:g> λεπτό. Όσο βρίσκεται σε αυτήν τη λειτουργία, δεν θα μπορούν να χρησιμοποιηθούν εφαρμογές με σύνδεση δεδομένων. Θέλετε να εξέλθετε τώρα;"</item>
+    <item quantity="other" msgid="8617116564023933114">"Το τηλέφωνο βρίσκεται στη λειτουργία επιστροφής κλήσης έκτακτης ανάγκης για <xliff:g id="COUNT">%s</xliff:g> λεπτά. Όσο βρίσκεται σε αυτήν τη λειτουργία, δεν θα μπορούν να χρησιμοποιηθούν εφαρμογές με σύνδεση δεδομένων. Θέλετε να εξέλθετε τώρα;"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Η επιλεγμένη ενέργεια δεν είναι διαθέσιμη κατά τη λειτουργία επιστροφής κλήσης έκτακτης ανάγκης. Το τηλέφωνο θα παραμείνει σε αυτήν τη λειτουργία για <xliff:g id="COUNT">%s</xliff:g> λεπτό. Θέλετε να πραγματοποιήσετε έξοδο τώρα;"</item>
-    <item quantity="other" msgid="3489076611710869904">"Η επιλεγμένη ενέργεια δεν είναι διαθέσιμη κατά τη λειτουργία επιστροφής κλήσης έκτακτης ανάγκης. Το τηλέφωνο θα παραμείνει σε αυτήν τη λειτουργία για <xliff:g id="COUNT">%s</xliff:g> λεπτά. Θέλετε να πραγματοποιήσετε έξοδο τώρα;"</item>
+    <item quantity="one" msgid="2585506997024726599">"Η επιλεγμένη ενέργεια δεν είναι διαθέσιμη σε λειτουργία επιστροφής κλήσης έκτακτης ανάγκης. Το τηλέφωνο θα βρίσκεται σε αυτήν τη λειτουργία για <xliff:g id="COUNT">%s</xliff:g> λεπτό. Θέλετε να εξέλθετε τώρα;"</item>
+    <item quantity="other" msgid="6115622137771382224">"Η επιλεγμένη ενέργεια δεν είναι διαθέσιμη στη λειτουργία επιστροφής κλήσης έκτακτης ανάγκης. Το τηλέφωνο θα βρίσκεται σε αυτήν τη λειτουργία για <xliff:g id="COUNT">%s</xliff:g> λεπτά. Θέλετε να εξέλθετε τώρα;"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Η επιλεγμένη ενέργεια δεν είναι διαθέσιμη κατά τη διάρκεια κλήσης επείγουσας ανάγκης"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Έξοδος από τη λειτουργία επιστροφής κλήσης έκτακτης ανάγκης"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Η επιλεγμένη ενέργεια δεν είναι διαθέσιμη κατά τη διάρκεια κλήσης επείγουσας ανάγκης."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Έξοδος από τη λειτουργία επιστροφής κλήσης έκτακτης ανάγκης"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Ναι"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Όχι"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Απόρριψη"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Ρυθμίσεις αυτόματου τηλεφωνητή"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;δεν έχει οριστεί&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Υπηρεσία αυτόματου τηλεφωνητή"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Ρυθμίσεις για <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Υπηρεσία"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Ρυθμίσεις"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Δεν έχει οριστεί&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Άλλες ρυθμίσεις κλήσης"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Κλήση"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Κλήση μέσω ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Μεταφορά δεξιά για απάντηση"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Σύρετε αριστερά για σίγαση του ήχου ειδοποίησης"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Μεταφορά αριστερά για απόρριψη"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Μεταφορά δεξιά για απάντηση και"\n"θέση ενεργής κλήσης σε αναμονή"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Μεταφορά δεξιά για απάντηση και"\n"τερματισμό ενεργής κλήσης"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Μεταφορά δεξιά για απάντηση και"\n"τερματισμό κλήσης σε αναμονή"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Απάντηση"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Απόρριψη"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Κλήση μέσω <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"φωτογραφία επαφής"</string>
     <string name="goPrivate" msgid="865837794424530980">"ιδιωτική χρήση"</string>
     <string name="selectContact" msgid="781975788478987237">"επιλογή επαφής"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Ρυθμίσεις κλήσεων Διαδικτύου"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Λογαριασμοί κλήσεων μέσω Διαδικτύου (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Λογαριασμοί"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Διαχείριση λογαριασμών και κατάστασης κλήσεων μέσω Διαδικτύου (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Λήψη εισερχόμενων κλήσεων"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Μειώνει τη διάρκεια ζωής της μπαταρίας"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Διαμόρφωση ρυθμίσεων κλήσης"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Χρήση κλήσεων μέσω Διαδικτύου"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Κάντε χρήση της κλήσης μέσω Διαδικτύου (μόνο με Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Για όλες τις κλήσεις όταν το δίκτυο δεδομένων είναι διαθέσιμο"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Μόνο για κλήσεις μέσω Διαδικτύου"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Να ερωτώμαι για κάθε κλήση"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Για όλες τις κλήσεις"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Αυτόματη εγγραφή"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Εξερχόμενη κλήση μέσω SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Πραγματοποίηση κλήσης"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Χρήση λογαριασμού κλήσης Διαδικτύου:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Να χρησιμοποιείται πάντα για την πραγματοποίηση κλήσεων"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Μπορείτε να χρησιμοποιήσετε τις Ρυθμίσεις κλήσεων για να αλλάξετε τον προεπιλεγμένο λογαριασμό κλήσεων μέσω διαδικτύου που θα χρησιμοποιείται κατά την πραγματοποίηση κλήσεων, επιλέγοντας διαφορετικό λογαριασμό από τις ρυθμίσεις κλήσεων μέσω Διαδικτύου"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Μπορείτε να καθορίσετε ποιος λογαριασμός κλήσεων μέσω Διαδικτύου θα χρησιμοποιείται από προεπιλογή από τις επιλογές Τηλέφωνο &gt; Ρυθμίσεις &gt; Ρυθμίσεις κλήσεων μέσω Διαδικτύου &gt; Οθόνη λογαριασμών."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Κλήση από κινητό τηλέφωνο"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Κλήση Διαδικτύου"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Δεν υπάρχει λογαριασμός κλήσης Διαδικτύου"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Δεν υπάρχουν λογαριασμοί κλήσεων Διαδικτύου σε αυτό το τηλέφωνο. Να γίνει άμεση προσθήκη λογαριασμού;"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Δεν υπάρχουν λογαριασμοί κλήσεων μέσω Διαδικτύου σε αυτό το τηλέφωνο. Θέλετε να προσθέσετε έναν τώρα;"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Προσθήκη"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Προσθήκη λογαριασμού"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Κατάργηση λογαριασμού"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Λογαριασμοί SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Αποθήκευση του λογαριασμού..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Κατάργηση του λογαριασμού..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Αποθήκευση του λογαριασμού..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Κατάργηση του λογαριασμού..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Αποθήκευση"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Απόρριψη"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Κλείσιμο του προφίλ"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"ΟΚ"</string>
     <string name="close_profile" msgid="6886968271423155284">"Κλείσιμο"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Κύριος"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Μετατροπή αυτού του λογαριασμού σε κύριο"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Χρησιμοποιείται για εξερχόμενες κλήσεις"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Σύνθετες ρυθμίσεις"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Βασικός λογαριασμός. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Έλεγχος κατάστασης..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Γίνεται εγγραφή..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Η προσπάθεια συνεχίζεται..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Δεν γίνεται αποδοχή κλήσεων"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Η εγγραφή λογαριασμού διεκόπη επειδή δεν υπάρχει σύνδεση στο Διαδίκτυο"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Ο λογαριασμός εγγραφής διεκόπη επειδή δεν υπάρχει σύνδεση Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Η εγγραφή λογαριασμού απέτυχε"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Δέχεται κλήσεις"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Γίνεται εγγραφή..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Συνέχιση προσπαθειών..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Δεν γίνεται αποδοχή κλήσεων."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Η εγγραφή λογαριασμού διεκόπη επειδή δεν υπάρχει σύνδεση στο Διαδίκτυο."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Ο λογαριασμός εγγραφής διεκόπη επειδή δεν υπάρχει σύνδεση Wi-Fi"</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Η εγγραφή λογαριασμού απέτυχε."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Δέχεται κλήσεις."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Αποτυχία εγγραφής λογαριασμού: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Θα επαναληφθεί αργότερα"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Αποτυχία εγγραφής λογαριασμού: Εσφαλμένο όνομα χρήστη ή κωδικός πρόσβασης"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Αποτυχία εγγραφής λογαριασμού: Ελέγξτε το όνομα του διακομιστή"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Αυτήν τη στιγμή ο λογαριασμός χρησιμοποιείται από την εφαρμογή <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Αποτυχία εγγραφής λογαριασμού: Εσφαλμένο όνομα χρήστη ή κωδικός πρόσβασης."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Αποτυχία εγγραφής λογαριασμού: Ελέγξτε το όνομα του διακομιστή."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Αυτήν τη στιγμή ο λογαριασμός χρησιμοποιείται από την εφαρμογή <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Πληροφορίες λογαριασμού SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Πληροφορίες λογαριασμού SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Διακομιστής"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Αριθμός θύρας"</string>
     <string name="transport_title" msgid="8253139511847746640">"Τύπος μεταφοράς"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Αποστολή μηνυμάτων \"keep-alive\""</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Αποστολή μηνυμάτων \"keep-alive\" στο διακομιστή SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Αυτόματη εγγραφή"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Αυτόματη εγγραφή του προφίλ"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Ορισμός ως κυρίως λογαριασμού"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Χρησιμοποιείται για εξερχόμενες κλήσεις"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Προαιρετικές ρυθμίσεις"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Προαιρετικό&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Αγγίξτε για εμφάνιση όλων"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▷ Αγγίξτε για απόκρυψη όλων"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"Το πεδίο <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> απαιτείται, δεν μπορεί να είναι κενό"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Ο αριθμός της θύρας θα πρέπει να είναι μεταξύ 1000 και 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Το πεδίο <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> απαιτείται και δεν μπορεί να είναι κενό."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Ο αριθμός της θύρας θα πρέπει να είναι μεταξύ 1000 και 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Χωρίς σύνδεση στο Διαδίκτυο"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Δεν υπάρχει σύνδεση Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Για να πραγματοποιήσετε μια κλήση μέσω Διαδικτύου, ελέγξτε πρώτα τη σύνδεσή σας στο Διαδίκτυο"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Για κλήσεις μέσω Διαδικτύου πρέπει να είστε συνδεδεμένοι σε δίκτυο Wi-Fi (χρησιμοποιήστε το στοιχείο Ασύρματο δίκτυο και Ρυθμίσεις δικτύου)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Για να πραγματοποιήσετε μια κλήση μέσω Διαδικτύου, ελέγξτε πρώτα τη σύνδεσή σας στο Διαδίκτυο."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Για κλήσεις μέσω Διαδικτύου πρέπει να είστε συνδεδεμένοι σε δίκτυο Wi-Fi (χρησιμοποιήστε το στοιχείο Ασύρματο δίκτυο και Ρυθμίσεις δικτύου)"</string>
     <string name="no_voip" msgid="8901474054537199865">"Η κλ. μέσω Διαδικτύου δεν υποστηρίζεται"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Αυτόματα"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Πάντα να αποστέλλεται"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Θα σου τηλεφωνήσω αμέσως."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Θα σου τηλεφωνήσω αργότερα."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Δεν μπορώ τώρα. Πάρε με αργότερα."</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Προσαρμοσμένο μήνυμα..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Προσαρμοσμένο μήνυμα"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Γρήγορες απαντήσεις"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Επεξεργασία γρήγορων απαντήσεων"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"αστέρι"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"μηδέν"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"σύμβολο δίεσης"</string>
-    <string name="description_search_button" msgid="239929880630534731">"αναζήτηση"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"κλήση"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Η ανοικτή συνομιλία ενεργοποιήθηκε."</string>
@@ -715,9 +615,47 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Απόρριψη"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Δόνηση"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Δόνηση"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ήχος κλήσης"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Πάντα"</item>
     <item msgid="1595097872875714252">"Μόνο στο αθόρυβο"</item>
     <item msgid="1458182414036878616">"Ποτέ"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Ήχος κλήσης τηλεφώνου"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Δόνηση κατά το κουδούνισμα"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Ήχοι αφής πληκτρολογίου κλήσης"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ήχος κλήσης"</string>
+
+    <!-- Mobile network settings screen, setting check box name -->
+    <string name="national_roaming">Εθνική περιαγωγή δεδομένων</string>
+    <!-- Mobile network settings screen, setting summary text when check box is selected -->
+    <string name="national_roaming_enable">Σύνδεση στις υπηρεσίες δεδομένων κατά την περιαγωγή σε εθνικό δίκτυο</string>
+    <!-- Mobile network settings screen, setting summary text when check box is clear -->
+    <string name="national_roaming_disable">Να μη γίνεται σύνδεση στις υπηρεσίες δεδομένων κατά την περιαγωγή σε εθνικό δίκτυο</string>
+
+    <!-- Dialer UI Settings -->
+    <string name="dialer_ui_settings_title">Πληκτρολόγιο κλήσης</string>
+    <string name="dialer_ui_settings_summary">Ρυθμίσεις για το πληκτρολόγιο κλήσης</string>
+
+    <string name="phone_number_label">Ο αριθμός μου</string>
+    <string name="phone_number_summary">Ορίστε τον αριθμό τηλεφώνου για αυτή τη συσκευή</string>
+
+    <string name="perm_change_mobile_network">Επιλογή δικτύου (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Όποια εφαρμογή έχει αυτή την άδεια μπορεί να αλλάζει μεταξύ 2G και 3G δεδομένων. Το 3G είναι γρηγορότερο, καταναλώνει περισσότερο μπαταρία και μπορεί επίσης να σας κοστίσει περισσότερα χρήματα.</string>
+
+    <!-- Noise suppression -->
+    <string name="noise_suppression_title">Καταστολή θορύβου</string>
+    <string name="noise_suppression_summary">Ενεργοποίηση της καταστολής θορύβου κατά τη διάρκεια κλήσεων</string>
+
+    <!-- Advanced Settings -->
+    <string name="advanced_setting">Για προχωρημένους</string>
+    <string name="keep_proximity_sensor_on">Ενεργός αισθητήρας απόστασης</string>
+    <string name="keep_proximity_sensor_on_sum">Να μην απενεργοποιείται ο αισθητήρας απόστασης κατά τη διάρκεια κλήσεων με τη χρήση ακουστικών</string>
+    <string name="lockscreen_if_call_ends_with_screenoff">Κλείδωμα κατά το τέλος της κλήσης</string>
+    <string name="lockscreen_if_call_ends_with_screenoff_sum">Αυτόματο κλείδωμα και σβήσιμο της οθόνης στο τέλος της κλήσης</string>
+    <string name="vibrate_outgoing">Δόνηση στην απάντηση</string>
+    <string name="vibrate_call_waiting">Δόνηση στην αναμονή</string>
+    <string name="vibrate_hangup">Δόνηση στο κλείσιμο</string>
+    <string name="vibrate_45">Δόνηση κάθε 45 δευτερόλεπτα</string>
+    <string name="vibrate_45_sum">Δόνηση κάθε 45 δευτερόλεπτα κατά τη διάρκεια εξερχόμενων κλήσεων</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a2a086cbe..b79b5785f 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Private number"</string>
     <string name="payphone" msgid="1931775086311769314">"Phonebox"</string>
     <string name="onHold" msgid="9035493194749959955">"On hold"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Current call"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Line busy"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Network busy"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"No response; timed out"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server unreachable"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Number unreachable"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Incorrect username or password"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Called from out of network"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Called from out-of-network"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Server error. Try again later."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"No signal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM limit exceeded"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio off"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"No SIM, or SIM error"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"No SIM or SIM error"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Out of service area"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Outgoing calls are restricted by FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"You cannot make outgoing calls while call barring is on."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"You can\'t make outgoing calls while call barring is on."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"All calls are restricted by access control."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Emergency calls are restricted by access control."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Normal calls are restricted by access control."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Phone locked until power cycle."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Call dropped."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Call intercepted."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: reorder."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Service Option Reject."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: retry order."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Access unsuccessful."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Pre-empted."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Only Emergency calls are possible."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Invalid Number"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Invalid number"</string>
     <string name="confCall" msgid="1904840547188336828">"Conference call"</string>
     <string name="call_lost" msgid="317670617901479594">"Call has been lost."</string>
-    <string name="retry" msgid="8462986804300767852">"Retry"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Call Lost"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI code started"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD code running…"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Wired headset"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Send the following tones?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Sending Tones"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Sending tones"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Send"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Yes"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"No"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Replace the wild character with"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Replace wild character with"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Missing voicemail number"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"No voicemail number is stored on the SIM card."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Add number"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Loading…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Type PIN code to unlock SIM card."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM unlocked"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"New SIM PIN code"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Type new SIM PIN code again to confirm"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"The SIM PINs that you typed do not match. Please try again."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Type PUK code to unlock SIM card"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Incorrect PUK code!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Continue"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Your SIM card has been unblocked. Your phone is unlocking…"</string>
     <string name="label_ndp" msgid="780479633159517250">"SIM network unlock PIN"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Unlock"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Requesting network unlock…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Network unlock request unsuccessful."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Network unlock successful."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM call settings"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA call settings"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Access Point Names"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Additional CDMA-only call settings"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Network service settings"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Caller ID"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Loading settings…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Number hidden in outgoing calls"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Number displayed in outgoing calls"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Use default operator settings to display my number in outgoing calls"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Number when busy"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Forwarding to <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Disabled"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Your operator does not support disabling call forwarding when your phone is busy."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Your operator doesn\'t support disabling call forwarding when your phone is busy."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Forward when unanswered"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Number when unanswered"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Forwarding to <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Disabled"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Your operator does not support disabling call forwarding when your phone isn\'t answered."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Your operator doesn\'t support disabling call forwarding when your phone doesn\'t answer."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Forward when unreachable"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Number when unreachable"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Forwarding to <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Disabled"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Your operator does not support disabling call forwarding when your phone is unreachable."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Your operator doesn\'t support disabling call forwarding when your phone is unreachable."</string>
     <string name="updating_title" msgid="6146755386174019046">"Call settings"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Call settings error"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Reading settings…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Reverting settings…"</string>
     <string name="response_error" msgid="6674110501330139405">"Unexpected response from network."</string>
     <string name="exception_error" msgid="7027667130619518211">"Network or SIM card error."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Operations are only allowed on fixed dialling numbers."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Please turn on the radio before viewing these settings."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Your Phone app\'s Fixed Dialing Numbers setting is turned on. As a result, some call-related features aren\'t working."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Please turn on the radio before viewing these settings."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Enable"</string>
     <string name="disable" msgid="7274240979164762320">"Disable"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Hide number"</item>
     <item msgid="1108394741608734023">"Show number"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Save voicemail number"</string>
     <string name="vm_changed" msgid="380744030726254139">"Voicemail number changed."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Voicemail number change unsuccessful."\n"Please contact your operator if this problem persists."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Forwarding number change unsuccessful."\n"Please contact your operator if this problem persists."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Couldn\'t change the voicemail number."\n"Contact your operator if this problem persists."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Couldn\'t change the forwarding number."\n"Contact your operator if this problem persists."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Couldn\'t retrieve and save current forwarding number settings."\n"Switch to the new provider anyway?"</string>
     <string name="no_change" msgid="3186040086622435212">"No changes were made."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Choose voicemail service"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Search networks"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Error while searching for networks."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registering on <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Your SIM card does not allow a connection to this network."</string>
-    <string name="connect_later" msgid="500090982903469816">"Unable to connect to this network at this time. Please try again later."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Your SIM card doesn\'t allow a connection to this network."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Can\'t connect to this network at the moment. Try again later."</string>
     <string name="registration_done" msgid="495135664535876612">"Registered on network."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Select a network operator"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Choose a network operator"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Search for all available networks"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Select automatically"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Automatically select preferred network"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automatic registration..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Choose automatically"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Automatically choose preferred network"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automatic registration..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Network Mode"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Change the network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Preferred network mode"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Preferred network mode: EvDo only"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Preferred network mode: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"EvDo only"</item>
     <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA/EvDo auto"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA auto"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo auto"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA auto"</item>
     <item msgid="5189164180446264504">"WCDMA only"</item>
     <item msgid="5714714953966979187">"GSM only"</item>
-    <item msgid="4775796025725908913">"GSM/WCDMA preferred"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA preferred"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data enabled"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Data roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Connect to data services when roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Connect to data services when roaming"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"You have lost data connectivity because you left your home network with data roaming turned off."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"You have lost data connectivity because you left your home network with data roaming turned off."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Allow data roaming? You may incur significant roaming charges!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS Options"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA Options"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Data usage"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Operator data policy"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Data used in current period"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Data usage period"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Data rate policy"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ of cycle elapsed"\n"Next period starts in <xliff:g id="USED_1">%2$d</xliff:g> days (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Data rate reduced to <xliff:g id="USED">%1$d</xliff:g> Kb/s if data usage limit is exceeded"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"More information about your operator\'s mobile network data usage policy"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Mobile Broadcast SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Mobile Broadcast SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Mobile Broadcast SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Mobile Broadcast SMS enabled"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Korean"</item>
     <item msgid="1933212028684529632">"Chinese"</item>
     <item msgid="1908428006803639064">"Hebrew"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Languages"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Local Weather"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Employment Opportunities"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Employment Opportunities enabled"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Employment Opportunities disabled"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Medical, Health and Hospital"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Medical, Health and Hospital enabled"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Medical, Health and Hospital disabled"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Medical, Health and Hospital"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Medical, Health and Hospital enabled"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Medical, Health and Hospital disabled"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Technology News"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Technology News enabled"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Technology News disabled"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"WCDMA only"</item>
     <item msgid="8776934131146642662">"GSM only"</item>
     <item msgid="4684679567848300935">"GSM/WCDMA (WCDMA preferred)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Use only 2G networks"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Saves battery"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"System select"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Change the CDMA roaming mode"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Change the CDMA roaming mode"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"System select"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Home only"</item>
     <item msgid="1205664026446156265">"Automatic"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA Roaming Mode"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Change the CDMA roaming mode"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA roaming mode"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Home Networks only"</item>
-    <item msgid="8174642753290624634">"Affiliated Networks"</item>
-    <item msgid="2241951431403168661">"Any Network"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA subscription"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA Network Preferences"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Not implemented yet!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA network preferences"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"CDMA only"</item>
     <item msgid="2683555124647197574">"EvDo only"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA Subscription"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Change between RUIM/SIM and NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"subscription"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activate device"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Set up data service"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Manage Fixed Dialling Numbers"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Change PIN for FDN access"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Manage phone number list"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Voice Privacy"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Voice privacy"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Enable enhanced privacy mode"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY mode"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Enable TTY mode"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY mode"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Set TTY mode"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Auto-Retry"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Enable Auto-Retry mode"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Auto-retry"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Enable Auto-retry mode"</string>
     <string name="menu_add" msgid="1882023737425114762">"Add contact"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Edit contact"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Delete contact"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Enter PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Type PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Name"</string>
     <string name="number" msgid="7905950798349903858">"Number"</string>
     <string name="save" msgid="4094274636321939086">"Save"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Delete fixed dialling number"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Deleting fixed dialling number…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Fixed dialling number deleted."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN not updated: you entered an incorrect PIN."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN not updated: number cannot exceed 20 digits."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN wasn\'t updated because you typed an incorrect PIN."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN wasn\'t updated because the number can\'t exceed 20 digits."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN wasn\'t updated. The PIN2 was incorrect or the phone number was rejected."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Reading from SIM card…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"No contacts on your SIM card."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Select contacts to import"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"To import contacts from SIM card, please turn off Airplane mode."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"To import contacts from the SIM card, first turn off Aeroplane mode."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Enable/disable SIM PIN"</string>
     <string name="change_pin" msgid="9174186126330785343">"Change SIM PIN"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Old PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"New PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Confirm new PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"The old PIN that you typed is not correct. Please try again."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"The PINs that you entered do not match. Please try again."</string>
+    <string name="badPin" msgid="8955102849303984935">"The old PIN that you typed isn\'t correct. Try again."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"The PINs that you typed don\'t match. Try again."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Type a PIN that is 4 to 8 numbers."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Disable SIM PIN"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Enable SIM PIN"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Please wait…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"SIM PIN enabled"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM PIN disabled"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"The PIN that you typed was incorrect"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"SIM PIN changed successfully"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM PIN enabled"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM PIN disabled."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"The PIN that you typed was incorrect."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"SIM PIN changed successfully."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Password incorrect; SIM is locked! PUK2 requested."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Old PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"New PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Confirm new PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"The PUK2 that you typed is not correct. Please try again."</string>
-    <string name="badPin2" msgid="515218795152422178">"The old PIN2 that you typed is not correct. Please try again."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"The PIN2s that you entered do not match. Please try again."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"The PUK2 that you typed isn\'t correct. Try again."</string>
+    <string name="badPin2" msgid="1041576234483629991">"The old PIN2 that you typed isn\'t correct. Try again."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"The PIN2s you typed don\'t match. Try again."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Type a PIN2 that is 4 to 8 numbers."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Type a PUK2 that is 8 numbers."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 changed successfully"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 changed successfully."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Type PUK2 code"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Password incorrect. Please change PIN2 and retry!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Password incorrect; SIM is locked! PUK2 requested."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Password incorrect. Change PIN2 and retry."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Password incorrect, SIM is locked. PUK2 requested."</string>
     <string name="doneButton" msgid="2859593360997984240">"Done"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Conference call <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Back to call"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Continue without SIM card"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"No SIM card found. Please insert a SIM card into the phone."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Dismiss"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Unlock"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Authenticating PIN…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemail number"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Dialling"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Retrying"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conference call"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Incoming call"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"CDMA call waiting"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Call ended"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"On hold"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Hanging up"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Missed calls"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> missed calls"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Missed call from <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Current call (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"On-going call"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"On hold"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Incoming call"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"New voicemail"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Voicemail number unknown"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"No service"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Selected network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) unavailable"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Hang up"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Call back"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Message"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"To place a call, first turn off Aeroplane mode."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Not registered on network."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobile network not available."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Call not sent. No valid number entered."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Call not sent."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Starting MMI sequence…"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Starting feature code sequence…"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Unsupported service."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Unable to switch calls."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Unable to separate call."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Emergency call"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Turning on radio…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Out-of-service area; retrying…"</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Call not sent. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Call not sent. Please dial an emergency number!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Call not sent. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is not an emergency number!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Call not sent. Dial an emergency number!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Use keyboard to dial"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Touch-tone keypad"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Hold"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Unhold"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"End"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Dialling Pad"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Hide"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Speaker"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Mute"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Add call"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Merge calls"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Swap"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI text"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF Tones"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF tones"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Set the length of DTMF tones"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Long"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Network Message"</string>
+    <string name="network_message" msgid="4483886461245213802">"Network message"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activate your phone"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"A special call needs to be made to activate your phone service. "\n\n"After pressing “Activate”, listen to the instructions provided to activate your phone."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Touch “Activate” to place a special call that activates your phone on your operator\'s mobile network, so that you can place calls and connect to mobile data networks."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Skip activation?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"If you skip activation, you can\'t place calls or connect to mobile data networks (though you can connect to Wi-Fi networks). Until you activate your phone, you are asked to activate it each time that you turn it on."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Skip"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Activate"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Activate"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Phone is activated!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Phone is activated."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problem with activation"</string>
     <string name="ota_listen" msgid="162923839877584937">"Follow the spoken instructions until you hear that activation is complete."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Keypad"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Speaker"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Please wait while your phone is being programmed."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programming Unsuccessful"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Please wait while your phone is being programmed."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programming unsuccessful"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Your phone is now activated. It may take up to 15 minutes for service to start."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Your phone did not activate. "\n"You may need to find an area with better coverage (near a window or outside). "\n\n"Try again or call customer service for more options."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Your phone didn\'t activate. "\n"You may need to find an area with better coverage (near a window or outside). "\n\n"Try again or call customer service for more options."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"EXCESS SPC FAILURES"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Back"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Try again"</string>
     <string name="ota_next" msgid="3904945374358235910">"Next"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Back"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Entered Emergency Callback Mode"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Emergency Callback Mode"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"No data connection for <xliff:g id="COUNT">%s</xliff:g> minutes"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"The phone will be in emergency callback mode for <xliff:g id="COUNT">%s</xliff:g> minute(s). While in this mode, no applications using a data connection can be used. Would you like to exit now?"</item>
-    <item quantity="other" msgid="3231879566243957821">"The phone will be in emergency callback mode for <xliff:g id="COUNT">%s</xliff:g> minutes. While in this mode, no applications using a data connection can be used. Would you like to exit now?"</item>
+    <item quantity="one" msgid="8060210887681426682">"The phone will be in Emergency Callback mode for <xliff:g id="COUNT">%s</xliff:g> minute. While in this mode no apps using a data connection can be used. Do you want to exit now?"</item>
+    <item quantity="other" msgid="8617116564023933114">"The phone will be in Emergency Callback mode for <xliff:g id="COUNT">%s</xliff:g> minutes. While in this mode no applications using a data connection can be used. Do you want to exit now?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"The action selected is not available while in the emergency callback mode. The phone will be in this mode for <xliff:g id="COUNT">%s</xliff:g> minute(s). Would you like to exit now?"</item>
-    <item quantity="other" msgid="3489076611710869904">"The action selected is not available while in the emergency callback mode. The phone will be in this mode for <xliff:g id="COUNT">%s</xliff:g> minutes. Would you like to exit now?"</item>
+    <item quantity="one" msgid="2585506997024726599">"The selected action isn\'t available while in the Emergency Callback mode. The phone will be in this mode for <xliff:g id="COUNT">%s</xliff:g> minute. Do you want to exit now?"</item>
+    <item quantity="other" msgid="6115622137771382224">"The action selected isn\'t available while in the Emergency Callback mode. The phone will be in this mode for <xliff:g id="COUNT">%s</xliff:g> minutes. Do you want to exit now?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"The action selected is not available while in an emergency call"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Exiting Emergency Callback Mode"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"The action selected isn\'t available during an emergency call."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Exiting Emergency Callback mode"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Yes"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"No"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Dismiss"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Voicemail settings"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;not set&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Voicemail service"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Settings for <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Service"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Setup"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Not set&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Other call settings"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Dial"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Calling via ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Drag right to answer"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Drag left to silence ringer"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Drag left to decline"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Drag right to answer and"\n"hold active call"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Drag right to answer and"\n"end active call"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Drag right to answer and"\n"end call on hold"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Answer"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Decline"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Calling via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"contact photo"</string>
     <string name="goPrivate" msgid="865837794424530980">"go private"</string>
     <string name="selectContact" msgid="781975788478987237">"select contact"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Internet call settings"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Internet calling (SIP) accounts"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Accounts"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Manage Internet calling (SIP) accounts and status"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Receive incoming calls"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Reduces battery life"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Configure call options"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Use Internet calling"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Use Internet calling (Wi-Fi only)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"For all calls when data network is available"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Only for Internet calls"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Ask for each call"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"For all calls"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Auto-registration"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Outgoing call via SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Place call"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Use Internet calling account:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Always use to place Internet calls"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"You can use the Call Settings to change which Internet calling account to use by default when placing calls, by selecting a different account under Internet call settings"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"You can change which Internet calling account to use by default from the Phone &gt; Settings &gt; Internet call settings &gt; Accounts screen."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Mobile phone call"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Internet call"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"No Internet calling account"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"There are no Internet calling accounts on this phone. Add one now?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"There are no Internet calling accounts on this phone. Do you want to add one now?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Add"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Add account"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Remove account"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP accounts"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Saving the account..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Removing the account..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Saving the account…"</string>
+    <string name="removing_account" msgid="7183999896088628100">"Removing the account…"</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Save"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Discard"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Close the profile"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Close"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Primary"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Make this my primary account"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Used for outgoing calls"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Advanced settings"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Primary account. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Checking status..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Registering..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Still trying..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Not receiving calls"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Account registration stopped because there is no Internet connection"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Account registration stopped because there is no Wi-Fi connection"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Account registration unsuccessful"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Receiving calls"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registering…"</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Still trying..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Not receiving calls"</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Account registration stopped because there is no Internet connection."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Account registration stopped because there is no Wi-Fi connection."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Account registration unsuccessful."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Receiving calls."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Account registration unsuccessful: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); will try later"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Account registration failed: incorrect username or password"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Account registration unsuccessful: check the server name"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"This account is currently in use by the <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> application"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Account registration unsuccessful: Incorrect username or password."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Account registration unsuccessful: Check the server name."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"This account is currently in use by the <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> app."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIP account details"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP account details"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Server"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Port number"</string>
     <string name="transport_title" msgid="8253139511847746640">"Transport type"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Send keep-alive"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Send SIP keep-alive messages"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Auto-registration"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Register the profile automatically"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Set as primary account"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Used for outgoing calls"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Optional settings"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Optional&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Touch to show all"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Touch to hide all"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> is required; cannot be left blank"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Port number should be within 1000 and 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> is required and can\'t be left blank."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Port number should be within 1000 and 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"No Internet connection"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"No Wi-Fi connection"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"To place an Internet call, check your Internet connection first"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"You must be connected to a Wi-Fi network for Internet calls (use the Wireless &amp; Network settings)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"To make an Internet call, check your Internet connection first."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"You need to be connected to a Wi-Fi network for Internet calls (use the Wireless &amp; Network settings)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Internet calling not supported"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automatic"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Always send"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"I\'ll call you right back."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"I\'ll call you later."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Can\'t talk now. Call me later?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Customised message..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Customised message"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Quick responses"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edit quick responses"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"star"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"pound"</string>
-    <string name="description_search_button" msgid="239929880630534731">"search"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"dial"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Speakerphone enabled."</string>
@@ -715,9 +615,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Decline"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrate"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrate"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ringtone"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Always"</item>
     <item msgid="1595097872875714252">"Only when silent"</item>
     <item msgid="1458182414036878616">"Never"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Phone ringtone"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrate when ringing"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Dial pad touch tones"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ringtone"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 734e39568..02b6059fc 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Número privado"</string>
     <string name="payphone" msgid="1931775086311769314">"Teléfono pago"</string>
     <string name="onHold" msgid="9035493194749959955">"En espera"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Llamada actual"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Línea ocupada"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Red ocupada"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"No hay respuesta, tiempo de espera agotado"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Servidor inaccesible"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"No se puede establecer la llamada"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nombre de usuario o contraseña incorrecto"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Llamó desde fuera de la red"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"La llamada se realizó desde fuera de la red."</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Error de servidor. Inténtalo nuevamente más tarde."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"No hay señal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Se excedió el límite de ACM"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio apagada"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Sin SIM o error de SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"No se encuentra la tarjeta SIM o se produjo un error relacionado con ella."</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Área fuera de servicio"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Las llamadas salientes están restringidas por NMF."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"No puedes realizar llamadas salientes cuando está activada la restricción de llamadas."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"No puedes realizar llamadas salientes cuando la restricción de llamadas está activa."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Todas las llamadas están restringidas por control de acceso."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Las llamadas de emergencia están restringidas por control de acceso."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Las llamadas normales están restringidas por control de acceso."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: dispositivo bloqueado hasta el ciclo de activación."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: llamada perdida."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: llamada interceptada."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: reordenar."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: rechazo de la opción de servicio."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: intentar nuevamente la orden."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: no se inició sesión correctamente."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: desplazado."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Sólo es posible realizar llamadas de emergencia."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Número no válido"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"El número no es válido."</string>
     <string name="confCall" msgid="1904840547188336828">"Llamada en conferencia"</string>
     <string name="call_lost" msgid="317670617901479594">"La llamada se ha perdido."</string>
-    <string name="retry" msgid="8462986804300767852">"Intentar nuevamente"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Llamada perdida"</string>
     <string name="ok" msgid="3811371167865772377">"Aceptar"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Código de MMI iniciado"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Ejecutando código USSD..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Auriculares con cable"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"¿Deseas enviar los siguientes tonos?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Enviando tonos"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Enviando tono"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Enviar"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Sí"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"No"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Reemplazar el carácter comodín con"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Reemplazar el carácter comodín con"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Falta el número de correo de voz"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"No hay un número de correo de voz almacenado en la tarjeta SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Agregar número"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Cargando…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Escribe el código PIN para desbloquear la tarjeta SIM:"</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM desbloqueado"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Nuevo código de PIN de tarjeta SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Vuelve a escribir el código PIN nuevo de la tarjeta SIM para confirmarlo"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Los códigos PIN de tarjeta SIM que has ingresado no coinciden. Vuelve a intentarlo."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Escribe el código PUK para desbloquear la tarjeta SIM"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Código PUK incorrecto."</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Continuar"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Tu tarjeta SIM ha sido desbloqueada. Tu dispositivo está desbloqueando..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN de desbloqueo de red de tarjeta SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Desbloquear"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Solicitando desbloqueo de red..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Solicitud de desbloqueo de red incorrecta."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Desbloqueo de red correcto."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Config. de llam. GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Configuración de llamadas de CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Nombres de puntos de acceso"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Configuración de llamadas de CDMA adicionales únicamente"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Configuración de servicios de red"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"ID de llamada entrante"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Cargando la configuración…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Número escondido en llamadas salientes"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Número visualizado en llamadas salientes"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Utilizar configuración del operador predeterminada para visualizar mi número en las llamadas salientes"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Número cuando está ocupado"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Reenviar a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Desactivado"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Tu proveedor no es compatible con la desactivación del reenvío de llamadas cuando tu teléfono esté ocupado."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Tu proveedor no admite la inhabilitación del desvío de llamadas cuando tu teléfono está ocupado."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Reenviar si no contesta"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Número cuando no contesta"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Reenviar a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Deshabilitado"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Tu proveedor no es compatible con la desactivación del reenvío de llamadas cuando tu teléfono no conteste."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Tu proveedor no admite la inhabilitación del desvío de llamadas cuando tu teléfono no responde."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Reenv. si no se alcanza"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Número cuando no se puede alcanzar"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Reenviar a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Desactivado"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Tu proveedor no es compatible con la desactivación del reenvío de llamadas cuando tu teléfono se encuentre inaccesible."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Tu proveedor no admite la inhabilitación del desvío de llamadas cuando no se puede acceder a tu teléfono."</string>
     <string name="updating_title" msgid="6146755386174019046">"Config. de llamada"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Error en configuración de llamada"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Leyendo configuración..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Revirtiendo configuraciones..."</string>
     <string name="response_error" msgid="6674110501330139405">"Respuesta inesperada de la red."</string>
     <string name="exception_error" msgid="7027667130619518211">"Error en la red o en la tarjeta SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Sólo se permiten operaciones a números de marcación fija."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Enciende la radio antes de ver esta configuración."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Está activada la configuración de los números de marcación fija de tu teléfono. Por lo tanto, algunas de las características relacionados con las llamadas no funcionan."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Enciende la radio antes de ver esta configuración."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Aceptar"</string>
     <string name="enable" msgid="1059008390636773574">"Activar"</string>
     <string name="disable" msgid="7274240979164762320">"Desactivar"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Ocultar número"</item>
     <item msgid="1108394741608734023">"Mostrar número"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Guardar número de correo de voz"</string>
     <string name="vm_changed" msgid="380744030726254139">"Número de correo de voz cambiado."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"No se ha realizado correctamente el cambio del buzón de voz. "\n"Comunícate con tu proveedor si el problema continúa."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"No se ha realizado correctamente el cambio del número de desvío. "\n"Comunícate con tu proveedor si el problema continúa."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"No se pudo cambiar el número del buzón de voz."\n"Si el problema continua, ponte en contacto con tu proveedor."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"No se pudo cambiar el número de desvío."\n"Si el problema continua, ponte en contacto con tu proveedor."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"No se pudo recuperar ni guardar la configuración del número actual de reenvío."\n"¿Deseas cambiar de proveedor de todos modos?"</string>
     <string name="no_change" msgid="3186040086622435212">"No se realizaron cambios."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Elegir servicio de buzón de voz"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Buscar redes"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Error al buscar redes."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrando en <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Tu tarjeta SIM no permite una conexión a esta red."</string>
-    <string name="connect_later" msgid="500090982903469816">"No se ha podido conectar con la red en este momento. Vuelve a intentarlo más tarde."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Tu tarjeta SIM no permite una conexión con esta red."</string>
+    <string name="connect_later" msgid="2308119155752343975">"No se puede establecer una conexión con la red en este momento. Vuelve a intentarlo más adelante."</string>
     <string name="registration_done" msgid="495135664535876612">"Registrado en la red."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Seleccionar un operador de red"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Elige un proveedor de red."</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Buscar todas las redes disponibles"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Seleccionar automáticamente"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Seleccionar la red preferida automáticamente"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Registro automático..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Elegir automáticamente"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Elegir la red preferida automáticamente"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Registro automático…"</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Modo de red"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Cambiar el modo operativo de la red"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Modo de red preferido"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Modo de red preferido: solo EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modo de red preferido: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"EvDo solamente"</item>
     <item msgid="454610224530856274">"CDMA sin EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA/EvDo automático"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA automático"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo automático"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA automático"</item>
     <item msgid="5189164180446264504">"WCDMA solamente"</item>
     <item msgid="5714714953966979187">"GSM solamente"</item>
-    <item msgid="4775796025725908913">"GSM/WCDMA preferidas"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA preferido"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Usar paquete de datos"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Roaming de datos"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Conectar a servicios de datos en roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Conectar a servicios de datos en roaming"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Has perdido la conectividad de los datos porque has dejado la red doméstica con roaming de datos desactivado."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Perdiste la conectividad de datos porque se desactivó la itinerancia de datos de tu red doméstica."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"¿Deseas permitir el roaming de datos? Ten en cuenta que podrás incurrir en gastos significativos."</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Opciones de GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Opciones de CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Utilización de datos"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Política de datos del proveedor"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Datos utilizados en el período actual"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Período de utilización de datos"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Política de velocidad de transferencia de datos"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>% del ciclo transcurrido"\n"El siguiente período comienza en <xliff:g id="USED_1">%2$d</xliff:g> días (<xliff:g id="USED_2">%3$s</xliff:g>)."</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"La velocidad de la transferencia de datos se reduce a <xliff:g id="USED">%1$d</xliff:g> Kb/seg. si se excede el límite de utilización de datos."</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Más información acerca de la política de utilización de datos de la red móvil de tu proveedor de servicios de telefonía móvil"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS de emisión celular"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS de emisión celular"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS de emisión celular"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS de emisión celular activado"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Coreano"</item>
     <item msgid="1933212028684529632">"Chino"</item>
     <item msgid="1908428006803639064">"Hebreo"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Idiomas"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Clima local"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Oportunidades de empleo"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Oportunidades de empleo activadas"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Oportunidades de empleo desactivadas"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Medicina, salud y hospitales"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Medicina, salud y hospitales activado"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Medicina, salud y hospitales desactivado"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Servicios de medicina, salud y hospitales"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Se habilitaron los servicios de medicina, salud y hospitales."</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Se inhabilitaron los servicios de medicina, salud y hospitales."</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Noticias de tecnología"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Noticias de tecnología desactivadas"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Noticias de tecnología activadas"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"WCDMA solamente"</item>
     <item msgid="8776934131146642662">"GSM solamente"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA preferido)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Utilizar sólo redes 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Ahorra batería"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Sistema seleccionado"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Cambiar el modo de roaming de CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Cambiar el modo itinerancia CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistema seleccionado"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Página principal solamente"</item>
     <item msgid="1205664026446156265">"Automático"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Modo de roaming CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Cambiar el modo de roaming de CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Modo de roaming CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Redes de inicio solamente"</item>
-    <item msgid="8174642753290624634">"Redes afiliadas"</item>
-    <item msgid="2241951431403168661">"Cualquier red"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Suscripción CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Preferencias de red CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Aún no está implementado"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Preferencia de red CDMA"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"CDMA solamente"</item>
     <item msgid="2683555124647197574">"EvDo solamente"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Suscripción CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Cambiar entre RUIM/SIM y NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"suscripción"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activar dispositivo"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurar servicio de datos"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Administrar números de marcación fija"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Cambiar PIN para acceso de NMF"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Administrar lista de números de teléfono"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Privacidad de voz"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Privacidad de voz"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Activar modo de privacidad mejorada"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Modo TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Activar modo TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Modo TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Establecer modo de TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Reintento automático"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Activar modo Reintento automático"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Reintento automático"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Activar el modo de reintento automático"</string>
     <string name="menu_add" msgid="1882023737425114762">"Agregar contacto"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Editar contacto"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Eliminar contacto"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Ingresar PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Ingresar el PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Nombre"</string>
     <string name="number" msgid="7905950798349903858">"Número"</string>
     <string name="save" msgid="4094274636321939086">"Guardar"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Eliminar número de marcación fija"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Eliminando número de marcación fija..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Número de marcación fija eliminado"</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN (Número fijo) desactualizado: Ingresaste un NIP incorrecto."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN (Número fijo) desactualizado: El número no puede exceder los 20 dígitos."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"No se actualizó el FDN porque ingresaste un PIN incorrecto."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"No se actualizó el FDN porque el número no puede superar los 20 dígitos."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"No se actualizó el FDN. El PIN2 era incorrecto o se rechazó el número de teléfono."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Leyendo la tarjeta SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"No hay contactos en tu tarjeta SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Seleccionar contactos para importar"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Para importar los contactos de la tarjeta SIM, desactiva el modo de avión."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Para importar contactos de la tarjeta SIM, desactiva primero el modo de avión."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Activar/desactivar PIN de tarjeta SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Cambiar PIN de tarjeta SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN de tarjeta SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"PIN anterior"</string>
     <string name="newPinLabel" msgid="207488227285336897">"PIN nuevo"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Confirmar PIN nuevo"</string>
-    <string name="badPin" msgid="4154316827946559447">"El PIN anterior ingresado no es correcto. Vuelve a intentarlo."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Los PIN que has ingresado no coinciden. Vuelve a intentarlo."</string>
+    <string name="badPin" msgid="8955102849303984935">"El antiguo PIN que ingresaste es incorrecto. Vuelve a intentarlo."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Los PIN que ingresaste no coinciden. Vuelve a intentarlo."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Escribe un PIN que tenga de 4 a 8 números."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Desactivar PIN de tarjeta SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Activar PIN de tarjeta SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Espera, por favor..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"El PIN de la tarjeta SIM está activado"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"El PIN de la tarjeta SIM está desactivado"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"El PIN que has ingresado es incorrecto"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"El PIN de la tarjeta SIM se ha cambiado correctamente"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"Se activó el código PIN de la tarjeta SIM."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"Se desactivó el PIN de la tarjeta SIM."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"El PIN que ingresaste era incorrecto."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"El PIN de la tarjeta SIM se modificó correctamente."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Contraseña incorrecta. La tarjeta SIM está bloqueada. Se solicitó PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Reenviar cuando está ocupado"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 nuevo"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Confirmar PIN2 nuevo"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"El PUK2 ingresado no es correcto. Vuelve a intentarlo."</string>
-    <string name="badPin2" msgid="515218795152422178">"El PIN2 anterior ingresado no es correcto. Vuelve a intentarlo."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Los PIN2 ingresados no coinciden. Vuelve a intentarlo."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"El PUK2 que ingresaste es incorrecto. Vuelve a intentarlo."</string>
+    <string name="badPin2" msgid="1041576234483629991">"El antiguo PIN2 que ingresaste es incorrecto. Vuelve a intentarlo."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Los PIN2 que ingresaste no coinciden. Vuelve a intentarlo."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Escribe un PIN2 que tenga de 4 a 8 números."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Escribe un PUK2 de 8 cifras."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN 2 cambiado correctamente"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"El PIN2 se modificó correctamente."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Escribir código PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Contraseña incorrecta. Cambia el PIN2 y vuelve a intentarlo."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Contraseña incorrecta. La tarjeta SIM está bloqueada. Se solicitó PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Contraseña incorrecta. Cambia el PIN2 y vuelve a intentarlo."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Contraseña incorrecta, se bloqueó la tarjeta SIM. Se solicita el PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Finalizado"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Llamada en conferencia <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Volver a la llamada"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Continuar sin tarjeta SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"No se encontró tarjeta SIM. Coloca una en el dispositivo."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Descartar"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Desbloquear"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Autenticando PIN..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Núm. de correo de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Marcando"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Intentando nuevamente"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Llamada en conferencia"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Llamada entrante"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Llamada en espera de CDMA"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Llamada finalizada"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"En espera"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Colgando"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Llamadas perdidas"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> llamadas perdidas"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Se perdieron las llamadas de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Llamada actual (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Llamada en curso"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"En espera"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Llamada entrante"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Correo de voz nuevo"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número de correo de voz desconocido"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Sin servicio"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"La red seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) no está disponible"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Colgar"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Devolver llamada"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensaje"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Para realizar una llamada, primero debes desactivar el modo de avión."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"No registrado en la red."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"La red móvil no está disponible."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Llamada no enviada. No se ingresó un número válido."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Llamada no enviada."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iniciar la secuencia de MMI"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Iniciando secuencia de códigos de función..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Servicio no admitido."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"No es posible cambiar llamadas."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"No es posible separar la llamada."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Llamada de emergencia"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Encendiendo radio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Área fuera de servicio. Intentando nuevamente..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Llamada no enviada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no es un número de emergencia."</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"La llamada no pudo enviarse. ¡Marca un número de emergencia!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"No se realizó la llamada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no es un número de emergencia."</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"No se realizó la llamada. Marca un número de emergencia."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilizar teclado para marcar"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Teclado de tonos del dispositivo"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Retener"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"No retener"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Finalizar"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Teclado telefónico"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Ocultar"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Altavoces"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Silenciar"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Agreg. Llam."</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Combinar llamadas"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Cambiar"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Texto de ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Tonos de DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Tonos DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Establecer la longitud de los tonos de DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Largo"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Mensaje de red"</string>
+    <string name="network_message" msgid="4483886461245213802">"Mensaje de red"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activar tu teléfono"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Es necesario realizar una llamada especial para activar tu servicio de teléfono."\n\n"Luego de presionar \"Activar\", escucha las instrucciones suministradas para activar tu teléfono."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Toca “Activar” para colocar una llamada especial que active tu teléfono en la red móvil de tu proveedor de servicios de telefonía móvil, para que puedas colocar llamadas y conectarte con redes de datos móviles."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"¿Deseas omitir la activación?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Si omites la activación, no puedes colocar llamadas o conectarte con redes móviles de datos (a pesar de que te puedes conectar a redes de Wi-Fi). Hasta que actives tu teléfono, se te solicitará que lo actives cada vez que lo enciendas."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Omitir"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Activar"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Activar"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"¡Se activó el teléfono!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Se activó el teléfono."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problema con la activación"</string>
     <string name="ota_listen" msgid="162923839877584937">"Sigue las instrucciones habladas hasta que escuches que la activación se completó."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Teclado numérico"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Altavoces"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Espera mientras se programa tu teléfono"</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programación incorrecta"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Aguarda mientras se programa el teléfono."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programación incorrecta"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Ahora tu teléfono se encuentra activado. Puede tomar hasta unos 15 minutos para que comience el servicio."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Tu teléfono no se activó. "\n" Es posible que necesites encontrar un área con mejor cobertura (cerca de una ventana, o afuera). "\n\n"Vuelve a intentarlo o llama al servicio para el cliente para más opciones."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"No se activó tu teléfono. "\n"Puede que tengas que trasladarte hasta un área con mejor cobertura (cerca de una ventana o afuera). "\n\n"Vuelve a intentarlo o llama al servicio de atención al cliente para más opciones."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ERROR EN SPC EN EXCESO"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Atrás"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Vuelve a intentarlo"</string>
     <string name="ota_next" msgid="3904945374358235910">"Siguiente"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Atrás"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Modo de devolución de llamada de emergencia ingresado"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Modo de devolución de llamada de emergencia"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"Sin conexión de datos por <xliff:g id="COUNT">%s</xliff:g> minutos"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"El teléfono estará en modo de devolución de llamada de emergencia por <xliff:g id="COUNT">%s</xliff:g> minuto. Mientras se encuentre en este modo, no se pueden utilizar las aplicaciones que usen una conexión de datos. ¿Deseas salir ahora?"</item>
-    <item quantity="other" msgid="3231879566243957821">"El teléfono estará en modo de devolución de llamada de emergencia por <xliff:g id="COUNT">%s</xliff:g> minutos. Mientras se encuentre en este modo, no se pueden utilizar las aplicaciones que usen una conexión de datos. ¿Deseas salir ahora?"</item>
+    <item quantity="one" msgid="8060210887681426682">"El teléfono permanecerá en el modo de llamada de retorno de emergencia <xliff:g id="COUNT">%s</xliff:g> minuto. Mientras el teléfono se encuentre en este modo, no se podrá usar ninguna aplicación que requiera de una conexión de datos. ¿Deseas salir ahora?"</item>
+    <item quantity="other" msgid="8617116564023933114">"El teléfono permanecerá en el modo de llamada de retorno de emergencia <xliff:g id="COUNT">%s</xliff:g> minutos. Mientras el teléfono se encuentre en este modo, no se podrá usar ninguna aplicación que requiera de una conexión de datos. ¿Deseas salir ahora?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"La acción seleccionada no está disponible en el modo de devolución de llamada de emergencia. El teléfono estará en este modo por <xliff:g id="COUNT">%s</xliff:g> minuto. ¿Deseas salir ahora?"</item>
-    <item quantity="other" msgid="3489076611710869904">"La acción seleccionada no está disponible en el modo de devolución de llamada de emergencia. El teléfono estará en este modo por <xliff:g id="COUNT">%s</xliff:g> minutos. ¿Deseas salir ahora?"</item>
+    <item quantity="one" msgid="2585506997024726599">"La acción seleccionada no está disponible cuando el teléfono se encuentra en el modo de llamada de retorno de emergencia. El teléfono permanecerá en este modo <xliff:g id="COUNT">%s</xliff:g> minuto. ¿Deseas salir ahora?"</item>
+    <item quantity="other" msgid="6115622137771382224">"La acción seleccionada no está disponible cuando el teléfono se encuentra en el modo de llamada de retorno de emergencia. El teléfono permanecerá en este modo <xliff:g id="COUNT">%s</xliff:g> minutos. ¿Deseas salir ahora?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"La acción seleccionada no está disponible mientras se realice una llamada de emergencia"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Saliendo de modo de devolución de llamada de emergencia"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"La acción seleccionada no está disponible durante una llamada de emergencia."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Saliendo del modo de llamada de retorno de emergencia"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Sí"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"No"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Descartar"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Config. de correo de voz"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;no establecido&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Serv. de correo de voz"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Configuraciones para <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Servicio"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Configuración"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Sin configurar&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Otras configuraciones de llamada"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Marcar"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Llamar mediante ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Arrastrar a la derecha para responder"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Arrastra a la izquierda para silenciar el timbre"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Arrastra a la izquierda para rechazar"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Arrastra a la derecha para responder y"\n" mantener la llamada activa."</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Arrastra a la derecha para responder y"\n" finalizar la llamada activa."</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Arrastra a la derecha para responder y"\n"finalizar la llamada en espera."</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Respuesta"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Rechazar"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Llamada a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"foto de contacto"</string>
     <string name="goPrivate" msgid="865837794424530980">"pasar a modo privado"</string>
     <string name="selectContact" msgid="781975788478987237">"seleccionar contacto"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Configuraciones de llamada de Internet"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Cuentas para llamadas por Internet (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Cuentas"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Administrar el estado y las cuentas para llamadas (SIP) por Internet"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Recibir llamadas entrantes"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Reduce la vida útil de la batería"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Configurar opciones de llamada"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Usar la llamada por Internet"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Usar la llamada por Internet (sólo Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Para todas las llamadas cuando la red de datos esté disponible"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Sólo para llamadas por Internet"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Preguntar para cada llamada"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Para todas las llamadas"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Registro automático"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Llamada saliente a través de SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Haz una llamada"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Usa la cuenta de llamadas por Internet:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Usar siempre para realizar llamadas por Internet"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Puedes usar la Configuración de llamada para cambiar la cuenta para llamadas por Internet que quieres usar de manera predeterminada al hacer las llamadas. Para eso selecciona una cuenta diferente bajo las configuraciones de llamadas por Internet"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Para cambiar la cuenta de llamadas por Internet predeterminada, ve a Teléfono &gt; Configuración &gt; Configuraciones de llamada de Internet &gt; Cuentas."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Llamada de teléfono celular"</string>
     <string name="internet_phone" msgid="1147922660195095810">"llamada por Internet"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Sin cuenta de llamadas por Internet"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"No hay cuentas para llamadas por Internet en este teléfono. ¿Deseas agregar una ahora?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"No se encuentran cuentas de llamadas por Internet en este teléfono. ¿Deseas agregar una ahora?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Agregar"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Agregar cuenta"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Eliminar cuenta"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Cuentas SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Guardando la cuenta..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Eliminando la cuenta..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Guardando la cuenta…"</string>
+    <string name="removing_account" msgid="7183999896088628100">"Eliminando la cuenta…"</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Guardar"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Descartar"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Cerrar el perfil"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"Aceptar"</string>
     <string name="close_profile" msgid="6886968271423155284">"Cerrar"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Principal"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Establecer como mi cuenta principal"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Utilizado para llamadas salientes"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Configuraciones avanzadas"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Cuenta principal. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Comprobando el estado..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Registrando..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Sigue intentando..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"No se están recibiendo llamadas."</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Se detuvo el registro de la cuenta porque no hay conexión a Internet"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Se detuvo el registro de la cuenta porque no hay conexión Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"La cuenta no se registró correctamente."</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Recibiendo llamadas"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registrando…"</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Intento en curso..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"No se están recibiendo llamadas."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Se detuvo el registro de cuenta porque no hay conexión a Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Se detuvo el registro de la cuenta porque no hay conexión Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"La cuenta no se registró correctamente."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Recibiendo llamadas."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"La cuenta no se registró correctamente: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); se intentará de nuevo más adelante."</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"La cuenta no se registró correctamente: nombre de usuario o contraseña incorrectos."</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"La cuenta no se registró correctamente: verifica el nombre del servidor."</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Esta cuenta está siendo usada por la aplicación <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"La cuenta no se registró correctamente: contraseña o nombre de usuario incorrectos."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"La cuenta no se registró correctamente: verifica el nombre del servidor."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"La aplicación <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> está usando esta cuenta en este momento."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Detalles de la cuenta SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Detalles de la cuenta SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Servidor"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Número de puerto"</string>
     <string name="transport_title" msgid="8253139511847746640">"Tipo de transporte"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Enviar mantenimiento de conexión"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Enviar mensajes de mantenimiento de conexión de SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Registro automático"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Registrar el perfil automáticamente"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Definir como cuenta principal"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Utilizado para llamadas salientes"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Configuración opcional"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Opcional&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Tocar para mostrar todo"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽Tocar para ocultar todo"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> requerido, no se puede dejar en blanco"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"El número de puerto debe estar entre 1000 y 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"El campo <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> es obligatorio y  no puede quedar en blanco."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"El número de puerto debe estar dentro de 1000 y 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"No hay conexión a Internet"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"No hay conexión Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Para hacer una llamada por Internet, primero verifica tu conectividad"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Debes estar conectado a un red WiFi para hacer llamadas por Internet (usa Configuración de Redes inalámbricas y redes)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Para realizar una llamada por Internet, primero verifica tu conexión a Internet."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Tienes que conectarte a una red Wi-Fi para realizar y recibir llamadas por Internet (usa la configuración de Conexiones inalámbricas y redes)."</string>
     <string name="no_voip" msgid="8901474054537199865">"No admite llamadas por Internet"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automático"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Enviar mensajes siempre"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Te llamo enseguida."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Te llamo más tarde."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"No puedo hablar ahora. ¿Me llamas más tarde?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Mensaje personalizado..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Mensaje personalizado"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respuestas rápidas"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editar respuestas rápidas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"estrella"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"cero"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"numeral"</string>
-    <string name="description_search_button" msgid="239929880630534731">"búsqueda"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"retroceso"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Altavoz habilitado"</string>
@@ -715,9 +615,20 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Rechazar"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Tono de llamada"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Siempre"</item>
-    <item msgid="1595097872875714252">"Sólo cuando esté en silencio"</item>
+    <item msgid="1595097872875714252">"Solo en modo silencioso"</item>
     <item msgid="1458182414036878616">"Nunca"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Tono del dispositivo"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar al sonar"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tonos táctiles del teclado de marcado"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Tono de llamada"</string>
+    <string name="advanced_setting">Configuración Avanzada</string>
+    <string name="vibrate_outgoing">Vibra al Contestar</string>
+    <string name="vibrate_45">Vibrar cada 45 Segundos</string>
+    <string name="vibrate_45_sum">Vibra durante el segundo 45 de cada minuto de una llamada saliente</string>
+    <string name="vibrate_hangup">Vibrar al Colgar</string>
+    <string name="vibrate_call_waiting">Vibrar en Llamada en Espera</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 64e1c542b..65a88da57 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -25,42 +25,30 @@
     <string name="private_num" msgid="6713286113000232309">"Número privado"</string>
     <string name="payphone" msgid="1931775086311769314">"Teléfono público"</string>
     <string name="onHold" msgid="9035493194749959955">"En espera"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Llamada actual"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Línea ocupada"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Red ocupada"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"No hay respuesta; se ha agotado el tiempo de espera."</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"No se puede establecer conexión con el servidor."</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"No se puede establecer la llamada."</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Contraseña o nombre de usuario incorrectos"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Llamada desde fuera de la red"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Llamada desde fuera de la red"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Error del servidor, inténtalo de nuevo más tarde."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"No hay señal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Se ha superado el límite de ACM."</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Señal móvil desactivada"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"No hay tarjeta SIM o se ha producido un error de tarjeta SIM."</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"No hay tarjeta SIM o se ha producido un error relacionado con la misma."</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Área fuera de servicio"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Las llamadas salientes están restringidas por FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"No se pueden realizar llamadas salientes mientras esté activada la restricción de llamadas."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"No se pueden realizar llamadas mientras esté activada la restricción de llamadas."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Todas las llamadas están limitadas por el control de acceso."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Las llamadas de emergencia están limitadas por el control de acceso."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Las llamadas normales están limitadas por el control de acceso."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: teléfono bloqueado hasta el próximo ciclo de carga"</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: llamada finalizada"</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: llamada interceptada"</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: reorganización"</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: rechazo de opción de servicio"</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: orden de reintento"</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: error al acceder"</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: reemplazada"</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Solo es posible realizar llamadas de emergencia."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Número no válido"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Número no válido"</string>
     <string name="confCall" msgid="1904840547188336828">"Conferencia telefónica"</string>
     <string name="call_lost" msgid="317670617901479594">"La llamada se ha perdido."</string>
-    <string name="retry" msgid="8462986804300767852">"Reintentar"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Llamada perdida"</string>
     <string name="ok" msgid="3811371167865772377">"Aceptar"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"El código MMI se ha iniciado."</string>
-    <string name="ussdRunning" msgid="485588686340541690">"Código USSD en ejecución..."</string>
+    <string name="ussdRunning" msgid="485588686340541690">"Código USSD en ejecución\u2026"</string>
     <string name="mmiCancelled" msgid="2771923949751842276">"El código MMI se ha cancelado."</string>
     <string name="cancel" msgid="5044513931633602634">"Cancelar"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Administrar conferencia telefónica"</string>
@@ -69,37 +57,28 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Auriculares con cable"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"¿Quieres enviar los siguientes tonos?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Enviando tonos"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Enviando tonos"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Enviar"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Sí"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"No"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Sustituir el carácter comodín por"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Sustituir el carácter comodín por"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Falta el número del buzón de voz."</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"No se ha almacenado ningún número de buzón de voz en la tarjeta SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Añadir número"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Cargando..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Introduce el código PIN para desbloquear la tarjeta SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"La tarjeta SIM se ha desbloqueado."</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Nuevo código PIN de tarjeta SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Vuelve a introducir el nuevo código PIN de la tarjeta SIM para confirmarlo."</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Los códigos PIN de tarjeta SIM introducidos no coinciden. Inténtalo de nuevo."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Introduce el código PUK para desbloquear la tarjeta SIM."</string>
-    <string name="badPuk" msgid="3213017898690275965">"El código PUK es incorrecto."</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Seguir"</string>
-    <string name="puk_unlocked" msgid="2284912838477558454">"La tarjeta SIM se ha desbloqueado. El teléfono se está desbloqueando..."</string>
+    <string name="puk_unlocked" msgid="2284912838477558454">"La tarjeta SIM se ha desbloqueado. El teléfono se está desbloqueando\u2026"</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN de desbloqueo de red de tarjeta SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Desbloquear"</string>
     <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Descartar"</string>
-    <string name="requesting_unlock" msgid="6412629401033249351">"Solicitando desbloqueo de red..."</string>
+    <string name="requesting_unlock" msgid="6412629401033249351">"Solicitando desbloqueo de red\u2026"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"La solicitud de desbloqueo de red no se ha realizado correctamente."</string>
     <string name="unlock_success" msgid="6770085622238180152">"El desbloqueo de red se ha realizado correctamente."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Ajustes de llamadas GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Ajustes de llamadas CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"APN"</string>
     <string name="settings_label" msgid="3876743539816984008">"Configuración de red"</string>
     <string name="voicemail" msgid="8693759337917898954">"Buzón de voz"</string>
+    <string name="mwi_notification_title">Indicador mensaje de voz</string>
+    <string name="mwi_notification_summary">Mostrar notificación para los mensajes de voz en espera</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"Buzón de voz:"</string>
     <string name="networks" msgid="8873030692174541976">"Operadores de red"</string>
     <string name="call_settings" msgid="6112441768261754562">"Ajustes de llamadas"</string>
@@ -109,12 +88,13 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Configuración adicional de llamadas solo CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Configuración del servicio de red"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"ID de emisor"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Cargando ajustes\u2026"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Número oculto en llamadas salientes"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Número mostrado en llamadas salientes"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Utilizar la configuración de operador predeterminada para mostrar mi número en las llamadas salientes"</string>
     <string name="labelCW" msgid="6120513814915920200">"Llamada en espera"</string>
-    <string name="sum_cw_enabled" msgid="8083061901633671397">"Informarme de las llamadas entrantes durante las llamadas"</string>
-    <string name="sum_cw_disabled" msgid="3648693907300104575">"Informarme de las llamadas entrantes durante las llamadas"</string>
+    <string name="sum_cw_enabled" msgid="8083061901633671397">"Notificarme de llamadas entrantes durante una llamada"</string>
+    <string name="sum_cw_disabled" msgid="3648693907300104575">"Notificarme de las llamadas entrantes durante las llamadas"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Ajustes de desvío de llamada"</string>
     <string name="labelCF" msgid="2574386948026924737">"Desvío de llamada"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Siempre"</string>
@@ -127,26 +107,26 @@
     <string name="messageCFB" msgid="3711089705936187129">"Número cuando la línea esté ocupada"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Desviando a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Inhabilitado"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Tu operador no permite inhabilitar el desvío de llamadas cuando el teléfono está ocupado."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Tu operador no permite inhabilitar el desvío de llamadas si el teléfono está ocupado."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Llamada sin respuesta"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Número cuando no se responde la llamada"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Desviando a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Inhabilitado"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Tu operador no permite inhabilitar el desvío de llamadas cuando el teléfono no responde."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Tu operador no permite inhabilitar el desvío de llamadas si el teléfono no responde."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"No se establece la llamada"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Número cuando no se puede establecer la llamada"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Desviando a <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Inhabilitado"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Tu operador no permite inhabilitar el desvío de llamadas cuando el teléfono no puede establecer la llamada."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Tu operador no permite inhabilitar el desvío de llamadas si no se puede establecer la llamada."</string>
     <string name="updating_title" msgid="6146755386174019046">"Ajustes de llamadas"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Error de configuración de llamada"</string>
-    <string name="reading_settings" msgid="1920291699287055284">"Leyendo configuración..."</string>
-    <string name="updating_settings" msgid="8171225533884883252">"Actualizando configuración..."</string>
-    <string name="reverting_settings" msgid="4752151682666912828">"Restableciendo configuración…"</string>
+    <string name="reading_settings" msgid="1920291699287055284">"Leyendo configuración\u2026"</string>
+    <string name="updating_settings" msgid="8171225533884883252">"Actualizando configuración\u2026"</string>
+    <string name="reverting_settings" msgid="4752151682666912828">"Restableciendo configuración\u2026"</string>
     <string name="response_error" msgid="6674110501330139405">"Respuesta inesperada de la red"</string>
     <string name="exception_error" msgid="7027667130619518211">"Error en la tarjeta SIM o en la red."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Solo puedes realizar operaciones en los números de marcación fija."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Activar la señal móvil antes de ver esta configuración"</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"La opción de marcación fija de la aplicación Teléfono está activada. Por ello, algunas funciones relacionadas con las llamadas no funcionan correctamente."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Para ver esta configuración, debes activar la señal móvil."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Aceptar"</string>
     <string name="enable" msgid="1059008390636773574">"Habilitar"</string>
     <string name="disable" msgid="7274240979164762320">"Inhabilitar"</string>
@@ -156,29 +136,28 @@
     <item msgid="7876195870037833661">"Ocultar número"</item>
     <item msgid="1108394741608734023">"Mostrar número"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Guardar número de buzón de voz"</string>
     <string name="vm_changed" msgid="380744030726254139">"El número del buzón de voz se ha cambiado."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"El cambio de número de buzón de voz no se ha realizado correctamente."\n"Si el problema persiste, ponte en contacto con tu operador."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"El cambio de número de desvío no se ha realizado correctamente."\n"Si el problema persiste, ponte en contacto con tu operador."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"No se ha podido cambiar el número del buzón de voz."\n"Ponte en contacto con tu operador si la incidencia persiste."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"No se ha podido cambiar el número de desvío."\n"Ponte en contacto con tu operador si la incidencia persiste."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"No se ha podido recuperar y guardar la configuración del número de desvío actual."\n"¿Quieres cambiar al nuevo proveedor de todos modos?"</string>
     <string name="no_change" msgid="3186040086622435212">"No se ha realizado ningún cambio."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Seleccionar servicio de buzón de voz"</string>
     <string name="voicemail_default" msgid="5902099213882352338">"Mi operador"</string>
     <string name="mobile_networks" msgid="5540397602919106177">"Configuración de red móvil"</string>
     <string name="label_available" msgid="1181658289009300430">"Redes disponibles"</string>
-    <string name="load_networks_progress" msgid="5230707536168902952">"Buscando..."</string>
+    <string name="load_networks_progress" msgid="5230707536168902952">"Buscando\u2026"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"No se ha encontrado ninguna red."</string>
     <string name="search_networks" msgid="1601136049300882441">"Buscar redes"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Se ha producido un error al buscar redes."</string>
-    <string name="register_on_network" msgid="9055203954040805084">"Registrándose en <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"La tarjeta SIM no permite una conexión a esta red."</string>
-    <string name="connect_later" msgid="500090982903469816">"No se puede establecer conexión con la red, inténtalo de nuevo más tarde."</string>
+    <string name="register_on_network" msgid="9055203954040805084">"Registrándose en <xliff:g id="NETWORK">%s</xliff:g>\u2026"</string>
+    <string name="not_allowed" msgid="5613353860205691579">"La tarjeta SIM no permite establecer conexión con esta red."</string>
+    <string name="connect_later" msgid="2308119155752343975">"No se puede conectar a la red en este momento. Inténtalo de nuevo más tarde."</string>
     <string name="registration_done" msgid="495135664535876612">"Conexión con la red establecida"</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Seleccionar un operador de red"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Seleccionar un operador de red"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Buscar todas las redes disponibles"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Seleccionar automáticamente"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Seleccionar la red preferida de forma automática"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Registro automático..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Seleccionar automáticamente"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Seleccionar red preferida automáticamente"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Registro automático\u2026"</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Modo de red"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Cambiar el modo operativo de la red"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Preferencia de modo de red"</string>
@@ -186,36 +165,48 @@
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Modo de red preferido: solo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Modo de red preferido: solo WCDMA"</string>
     <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"Modo de red preferido: GSM / WCDMA"</string>
-    <string name="preferred_network_mode_cdma_summary" msgid="3175690187294334241">"Preferencia de modo de red: CDMA"</string>
-    <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Preferencia de modo de red: CDMA / EvDo"</string>
+    <string name="preferred_network_mode_cdma_summary" msgid="3175690187294334241">"Modo de red preferido: CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Modo de red preferido: CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Modo de red preferido: solo CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Modo de red preferida: solo EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modo de red preferido: LTE / CDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_summary">Modo de red preferido: LTE / WCDMA/GSM</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary">Modo de red preferido: LTE / CDMA / EvDo</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">Modo de red preferido: LTE / CMDA / EvDo / GSM/WCDMA</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item>"Global"</item>
     <item msgid="3273348576277144124">"Solo EvDo"</item>
     <item msgid="454610224530856274">"CDMA sin EvDo"</item>
-    <item msgid="8928247118825616081">"Modo automático de CDMA/EvDo"</item>
-    <item msgid="8595462903294812666">"Modo automático de GSM/WCDMA"</item>
-    <item msgid="5189164180446264504">"Solo WCDMA"</item>
-    <item msgid="5714714953966979187">"Solo GSM"</item>
-    <item msgid="4775796025725908913">"Preferencia de GSM/WCDMA"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo automático"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA automático"</item>
+    <item msgid="5189164180446264504">"WCDMA sólo"</item>
+    <item msgid="5714714953966979187">"GSM sólo"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA preferido"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item>LTE sólo</item>
+    <item>LTE/CMDA/EvDo/GSM/WCDMA</item>
+    <item>LTE/CDMA/EvDo</item>
+    <item>LTE/CDMA</item>
+    <item>CDMA/EvDo automático</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_lte_gsm">
+    <item>LTE/GSM/WCDMA</item>
+    <item>GSM/WCDMA preferido</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Habilitar datos"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Permitir el acceso a los datos a través de la red móvil"</string>
     <string name="roaming" msgid="8871412572928323707">"Itinerancia de datos"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Establecer conexión con servicios de datos en itinerancia"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Establecer conexión con servicios de datos en itinerancia"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Has perdido la conectividad de datos porque has dejado desactivada la itinerancia de datos de tu red doméstica."</string>
+    <string name="national_roaming">Itinerancia de datos nacional</string>
+    <string name="national_roaming_enable">Establecer conexión con servicios de datos en itinerancia nacional</string>
+    <string name="national_roaming_disable">No establecer conexión con servicios de datos en itinerancia nacional</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Has perdido la conectividad de datos porque has dejado desactivada la itinerancia de datos de tu red doméstica."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"¿Permitir itinerancia de datos? Los costes de itinerancia que deberás asumir pueden ser significativos."</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Opciones GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Opciones de CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Uso de datos"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Polít datos operador"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Datos del período actual"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Período uso datos"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Política velocidad datos"</string>
@@ -230,7 +221,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>% del ciclo transcurrido."\n"Próx período en <xliff:g id="USED_1">%2$d</xliff:g> días (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Frec datos se reduce a <xliff:g id="USED">%1$d</xliff:g> Kb/s si se supera límite uso datos"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Más información sobre política de uso de datos móviles de tu operador"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS de difusión móvil"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS de difusión móvil"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS de difusión móvil"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS de difusión móvil habilitado"</string>
@@ -271,15 +261,6 @@
     <item msgid="1858401628368130638">"Coreano"</item>
     <item msgid="1933212028684529632">"Chino"</item>
     <item msgid="1908428006803639064">"Hebreo"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Idiomas"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Información meteorológica local"</string>
@@ -309,9 +290,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Oportunidades de empleo"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Oportunidades de empleo habilitadas"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Oportunidades de empleo inhabilitadas"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Servicios médicos, sanitarios y hospitalarios"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Servicios médicos, sanitarios y hospitalarios habilitados"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Servicios médicos, sanitarios y hospitalarios inhabilitados"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Servicios médicos, sanitarios y hospitalarios"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Servicios médicos, sanitarios y hospitalarios habilitados"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Servicios médicos, sanitarios y hospitalarios inhabilitados"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Noticias tecnológicas"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Noticias tecnológicas habilitadas"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Noticias tecnológicas inhabilitadas"</string>
@@ -326,35 +307,17 @@
     <item msgid="8912042051809329533">"Solo WCDMA"</item>
     <item msgid="8776934131146642662">"Solo GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (preferencia de WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Utilizar solo redes 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Ahorrar batería"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Selección de sistema"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Cambiar modo de itinerancia CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Cambiar modo de itinerancia CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selección de sistema"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Solo sistema doméstico"</item>
     <item msgid="1205664026446156265">"Automático"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Modo de itinerancia CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Cambiar modo de itinerancia CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"modo de itinerancia CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Solo redes domésticas"</item>
-    <item msgid="8174642753290624634">"Redes afiliadas"</item>
-    <item msgid="2241951431403168661">"Cualquier red"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Suscripción CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Preferencias de red CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Aún no se ha implementado."</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Preferencias de red CDMA"</string>
@@ -363,29 +326,19 @@
     <item msgid="6143696847467859795">"Solo CDMA"</item>
     <item msgid="2683555124647197574">"Solo EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Suscripción CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Cambiar entre RUIM/SIM y NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"suscripción"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activar dispositivo"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurar servicio de datos"</string>
     <string name="fdn" msgid="7878832555095183202">"Marcación fija"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Lista de FDN"</string>
     <string name="fdn_activation" msgid="2156479741307463576">"Activación de FDN"</string>
-    <string name="fdn_enabled" msgid="5238109009915521240">"Los números de marcación fija están habilitados."</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"Los números de marcación fija están inhabilitados."</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"Los números de marcación fija están habilitados"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"Los números de marcación fija están inhabilitados"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"Habilitar FDN"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"Inhabilitar FDN"</string>
     <string name="change_pin2" msgid="2153563695382176676">"Cambiar PIN2"</string>
@@ -394,80 +347,72 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Administrar números de marcación fija"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Cambiar PIN para acceso de FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Administrar lista de números de teléfono"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Privacidad de voz"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Privacidad de voz"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Habilitar modo de privacidad mejorado"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Modo TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Habilitar modo TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Modo TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Establecer modo TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Reintento automático"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Habilitar modo de reintento automático"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Reintento automático"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Habilitar modo de reintento automático"</string>
     <string name="menu_add" msgid="1882023737425114762">"Añadir contacto"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Editar contacto"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Eliminar contacto"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Introducir PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Introducir código PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Nombre"</string>
     <string name="number" msgid="7905950798349903858">"Número"</string>
     <string name="save" msgid="4094274636321939086">"Guardar"</string>
     <string name="add_fdn_contact" msgid="2481915899633353976">"Añadir número de marcación fija"</string>
-    <string name="adding_fdn_contact" msgid="7627379633721940991">"Añadiendo número de marcación fija..."</string>
+    <string name="adding_fdn_contact" msgid="7627379633721940991">"Añadiendo número de marcación fija\u2026"</string>
     <string name="fdn_contact_added" msgid="7458335758501736665">"Se ha añadido el número de marcación fija."</string>
     <string name="edit_fdn_contact" msgid="7976936035587081480">"Editar número de marcación fija"</string>
-    <string name="updating_fdn_contact" msgid="8370929876849803600">"Actualizando número de marcación fija..."</string>
+    <string name="updating_fdn_contact" msgid="8370929876849803600">"Actualizando número de marcación fija\u2026"</string>
     <string name="fdn_contact_updated" msgid="5497828782609005017">"Se ha actualizado el número de marcación fija."</string>
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Eliminar número de marcación fija"</string>
-    <string name="deleting_fdn_contact" msgid="5669163206349319969">"Eliminando número de marcación fija..."</string>
+    <string name="deleting_fdn_contact" msgid="5669163206349319969">"Eliminando número de marcación fija\u2026"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Se ha eliminado el número de marcación fija."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN no actualizado: has introducido un PIN incorrecto."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN no actualizado: el número no puede superar los 20 dígitos."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Leyendo desde tarjeta SIM…"</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"No se ha actualizado FDN porque el código PIN que has introducido es incorrecto."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"No se ha actualizado FDN porque el número no puede superar los 20 dígitos."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN no actualizado. El código PIN2 era incorrecto o se ha rechazado el número de teléfono."</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Leyendo desde tarjeta SIM\u2026"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"No hay ningún contacto en la tarjeta SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Seleccionar contactos para importar"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Para importar contactos de la tarjeta SIM, desactiva el modo avión."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Para importar contactos de la tarjeta SIM, desactiva el modo avión."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Habilitar/inhabilitar PIN de tarjeta SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Cambiar PIN de tarjeta SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN de tarjeta SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"PIN antiguo"</string>
     <string name="newPinLabel" msgid="207488227285336897">"PIN nuevo"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Confirmar PIN nuevo"</string>
-    <string name="badPin" msgid="4154316827946559447">"El PIN antiguo que has introducido no es correcto. Inténtalo de nuevo."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Los códigos PIN introducidos no coinciden. Inténtalo de nuevo."</string>
+    <string name="badPin" msgid="8955102849303984935">"El código PIN antiguo que has introducido no es correcto. Inténtalo de nuevo."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"El código PIN que has introducido no coincide. Inténtalo de nuevo."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Introduce un código PIN con una longitud comprendida entre cuatro y ocho dígitos."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Inhabilitar PIN de tarjeta SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Habilitar PIN de tarjeta SIM"</string>
-    <string name="enable_in_progress" msgid="3695303775100109650">"Por favor, espera..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"El PIN de la tarjeta SIM se ha habilitado."</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"El PIN de la tarjeta SIM está inhabilitado."</string>
-    <string name="pin_failed" msgid="6597695909685242127">"El PIN que has introducido no es correcto."</string>
-    <string name="pin_changed" msgid="9000716792724195093">"El PIN de la tarjeta SIM se ha modificado correctamente."</string>
+    <string name="enable_in_progress" msgid="3695303775100109650">"Por favor, espera\u2026"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"Se ha habilitado el código PIN de la tarjeta SIM."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"El código PIN de la tarjeta SIM está inhabilitado."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"El código PIN que has introducido era incorrecto."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"El código PIN de la tarjeta SIM se ha cambiado correctamente."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Contraseña incorrecta; la tarjeta SIM está bloqueada. Se ha solicitado el código PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 antiguo"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 nuevo"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Confirmar PIN2 nuevo"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"El PUK2 que has introducido no es correcto. Inténtalo de nuevo."</string>
-    <string name="badPin2" msgid="515218795152422178">"El PIN2 antiguo que has introducido no es correcto. Inténtalo de nuevo."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Los códigos PIN2 introducidos no coinciden. Inténtalo de nuevo."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"El código PUK2 que has introducido no es correcto. Inténtalo de nuevo."</string>
+    <string name="badPin2" msgid="1041576234483629991">"El código PIN2 antiguo que has introducido no es correcto. Inténtalo de nuevo."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"El código PIN2s que has introducido no coincide. Inténtalo de nuevo."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Introduce un código PIN2 con una longitud comprendida entre cuatro y ocho dígitos."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Introduce un código PUK2 con una longitud de 8 dígitos."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"El PIN2 se ha cambiado correctamente."</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"El código PIN2 se ha cambiado correctamente."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Introducir código PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Contraseña incorrecta; cambia el PIN2 e inténtalo de nuevo."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Contraseña incorrecta; la tarjeta SIM está bloqueada. Se ha solicitado el código PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Contraseña incorrecta. Cambia el código PIN2 y vuelve a intentarlo."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Contraseña incorrecta; la tarjeta SIM está bloqueada. Se ha solicitado el código PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Listo"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Conferencia telefónica<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Volver a la llamada"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Continuar sin tarjeta SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"No se ha encontrado ninguna tarjeta SIM. Inserta una tarjeta SIM en el teléfono."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Descartar"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Desbloquear"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Autenticando PIN..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número del buzón de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Llamando"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Reintentando"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conferencia telefónica"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Llamada entrante"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Llamada en espera de CDMA"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Llamada finalizada"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"En espera"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Colgando"</string>
@@ -477,7 +422,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Llamadas perdidas"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> llamadas perdidas"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Llamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Llamada actual (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Llamada en curso"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"En espera"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Llamada entrante"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nuevo mensaje de voz"</string>
@@ -486,13 +431,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número del buzón de voz desconocido"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Sin servicio"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"La red seleccionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) no está disponible."</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Colgar"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Volver a llamar"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensaje"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Para realizar una llamada, primero debes desactivar el modo avión."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"No se ha podido conectar a la red"</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"La red móvil no está disponible."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"No se ha realizado la llamada; el número introducido no es válido."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"La llamada no se ha enviado."</string>
-    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iniciando secuencia MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Iniciando secuencia de código de función…"</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iniciando secuencia MMI\u2026"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Servicio no admitido"</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"No se ha podido cambiar de llamada."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"No se ha podido desvincular la llamada."</string>
@@ -502,20 +449,15 @@
     <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"No es posible finalizar las llamadas activas."</string>
     <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Llamada por Internet"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Llamada de emergencia"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activando señal móvil…"</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Área fuera de servicio; reintentando..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"No se ha realizado la llamada; <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no es un número de emergencia."</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"La llamada no se ha enviado; marca un número de emergencia."</string>
+    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activando señal móvil\u2026"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Área fuera de servicio; reintentando\u2026"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"No se ha enviado la llamada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> no es un número de emergencia."</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"La llamada no se ha enviado. Marca un número de emergencia."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilizar teclado para marcar"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Teclado táctil de tonos"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Retener"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Soltar"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Finalizar"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Teclado"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Ocultar"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Altavoz"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Silenciar"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Añadir llamada"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Llamada a tres"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Cambiar"</string>
@@ -524,7 +466,7 @@
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"Importar"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"Importar todos"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"Importando contactos de tarjeta SIM..."</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"Importando contactos de tarjeta SIM\u2026"</string>
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"Importar de contactos"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Audífonos"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Activar compatibilidad con audífono"</string>
@@ -534,36 +476,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Texto de ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Tonos DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Tonos DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Establecer la longitud de los tonos DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Largo"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Mensaje de red"</string>
+    <string name="network_message" msgid="4483886461245213802">"Mensaje de red"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activar tu teléfono"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Es necesario realizar una llamada especial para activar el servicio telefónico. "\n\n"Tras pulsar \"Activar\", escucha las instrucciones sobre cómo activar el teléfono."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Toca \"Activar\" para realizar una llamada especial que active el teléfono en la red móvil de tu operador. De este modo, podrás realizar llamadas y conectarte a las redes de datos móviles."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"¿Quieres omitir la activación?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Si omites la activación, no podrás realizar llamadas ni conectarte a las redes de datos móviles (aunque sí podrás conectarte a las redes Wi-Fi). Se te pedirá que actives el teléfono cada vez que lo enciendas hasta que realices la activación."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Omitir"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Activar"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Activar"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"El teléfono está activado."</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"El teléfono está activado."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problema con la activación"</string>
     <string name="ota_listen" msgid="162923839877584937">"Sigue las instrucciones habladas hasta que escuches que la activación se ha completado."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Teclado"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Altavoz"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Espera mientras se programa tu teléfono."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programación incorrecta"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Espera mientras se programa tu teléfono."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programación incorrecta"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Tu teléfono ya está activado. El servicio puede tardar un máximo de 15 minutos en iniciarse."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"El teléfono no se ha activado. "\n"Es posible que necesites situarte en un área con mejor cobertura (cerca de una ventana o en el exterior). "\n\n"Inténtalo de nuevo o llama al servicio de atención al cliente para consultar más opciones."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"El teléfono no se ha activado. "\n"Es posible que tengas que situarte en una zona con más cobertura (cerca de una ventana o en el exterior). "\n\n"Inténtalo de nuevo o ponte en contacto con el servicio de atención al cliente para consultar otras opciones."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"EXCESO DE ERRORES DE SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Atrás"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Volver a intentarlo"</string>
     <string name="ota_next" msgid="3904945374358235910">"Siguiente"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Anterior"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Se ha activado el modo de devolución de llamada de emergencia."</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Modo de devolución de llamada de emergencia"</string>
@@ -573,87 +510,71 @@
     <item quantity="other" msgid="3122217344579273583">"Ninguna conexión de datos durante <xliff:g id="COUNT">%s</xliff:g> minutos"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"El teléfono permanecerá en modo de devolución de llamada de emergencia durante <xliff:g id="COUNT">%s</xliff:g> minuto. Mientras este modo esté activo, no se podrá utilizar ninguna aplicación que utilice una conexión de datos. ¿Quieres salir?"</item>
-    <item quantity="other" msgid="3231879566243957821">"El teléfono permanecerá en modo de devolución de llamada de emergencia durante <xliff:g id="COUNT">%s</xliff:g> minutos. Mientras este modo esté activo, no se podrá utilizar ninguna aplicación que utilice una conexión de datos. ¿Quieres salir?"</item>
+    <item quantity="one" msgid="8060210887681426682">"El teléfono permanecerá en el modo de devolución de llamada de emergencia durante <xliff:g id="COUNT">%s</xliff:g> minuto. Durante este tiempo, no se podrán usar las aplicaciones que utilicen una conexión de datos. ¿Quieres salir ahora?"</item>
+    <item quantity="other" msgid="8617116564023933114">"El teléfono permanecerá en el modo de devolución de llamada durante <xliff:g id="COUNT">%s</xliff:g> minutos. Durante este tiempo, no se podrán usar las aplicaciones que utilicen una conexión de datos. ¿Quieres salir ahora?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"La acción seleccionada no está disponible en el modo de devolución de llamada de emergencia. El teléfono permanecerá en este modo durante <xliff:g id="COUNT">%s</xliff:g> minuto. ¿Quieres salir?"</item>
-    <item quantity="other" msgid="3489076611710869904">"La acción seleccionada no está disponible en el modo de devolución de llamada de emergencia. El teléfono permanecerá en este modo durante <xliff:g id="COUNT">%s</xliff:g> minutos. ¿Quieres salir?"</item>
+    <item quantity="one" msgid="2585506997024726599">"La acción seleccionada no está disponible durante el modo de devolución de llamada de emergencia. El teléfono permanecerá en este modo durante <xliff:g id="COUNT">%s</xliff:g> minutos. ¿Quieres salir ahora?"</item>
+    <item quantity="other" msgid="6115622137771382224">"La acción seleccionada no está disponible en el modo de devolución de llamada de emergencia. El teléfono permanecerá en este modo durante <xliff:g id="COUNT">%s</xliff:g> minutos. ¿Quieres salir ahora?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"La acción seleccionada no está disponible en modo de llamada de emergencia."</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Saliendo del modo de devolución de llamada de emergencia"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"La acción seleccionada no está disponible durante una llamada de emergencia."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Saliendo del modo de devolución de llamada de emergencia"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Sí"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"No"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Descartar"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Configuración de buzón de voz"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;sin definir&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Servicio de buzón de voz"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Configuración de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Servicio"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Configuración"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;No definido&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Otras opciones de llamada"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Llamar"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Llamando a través de ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Arrastrar a la derecha para responder"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Arrastrar a la izquierda para silenciar el timbre"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Arrastrar a la izquierda para rechazar"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Arrastrar a la derecha para responder y"\n"retener una llamada activa"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Arrastrar a la derecha para responder y"\n"finalizar una llamada activa"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Arrastrar a la derecha para responder y"\n"finalizar una llamada en espera"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Responder"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Rechazar"</string>
+    <string name="dialer_ui_settings_title">Ajustes de marcación</string>
+    <string name="dialer_ui_settings_summary">Ajustes del teclado de marcación</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Llamada a través de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"foto de contacto"</string>
     <string name="goPrivate" msgid="865837794424530980">"llamada privada"</string>
     <string name="selectContact" msgid="781975788478987237">"seleccionar contacto"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Ajustes de llamada por Internet"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Cuentas (SIP) de llamadas por Internet"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Cuentas"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Administración de estado y de cuentas (SIP) de llamadas por Internet (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Recibir llamadas"</string>
-    <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Permite ahorrar batería."</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Configurar opciones de llamada"</string>
+    <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Reduce la duración de la batería"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Llamadas por Internet"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Llamadas por Internet (Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Para todas las llamadas cuando haya redes de datos disponibles"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Solo llamadas Internet"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Preguntar cada vez"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"En todas las llamadas"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Registro automático"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Llamada saliente a través de SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Llamadas"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Usar cuenta de llamada por Internet:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Usar siempre para realizar llamadas de Internet"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Puedes utilizar la opción de configuración de llamadas para modificar la cuenta de llamadas por Internet que desees utilizar de forma predeterminada. Selecciona una cuenta diferente en la sección de ajustes de llamadas por Internet."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Para cambiar la cuenta de llamadas por Internet que quieres usar de forma predeterminada, accede a Teléfono &gt; Ajustes &gt; Ajustes de llamada por Internet &gt; Cuentas."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Llamada de teléfono móvil"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Llamada de Internet"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Sin cuentas de llamada por Internet"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"No hay cuentas de llamadas por Internet en este teléfono. ¿Quieres añadir una ahora?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"No hay cuentas de llamadas por Internet en este teléfono. ¿Quieres añadir una cuenta ahora?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Añadir"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Añadir cuenta"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Eliminar cuenta"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Cuentas SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Guardando la cuenta..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Eliminando la cuenta..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Guardando la cuenta\u2026"</string>
+    <string name="removing_account" msgid="7183999896088628100">"Eliminando la cuenta\u2026"</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Guardar"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Descartar"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Cerrar el perfil"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"Aceptar"</string>
     <string name="close_profile" msgid="6886968271423155284">"Cerrar"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Principal"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Establecer como mi cuenta principal"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Se utiliza para llamadas salientes."</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Ajustes avanzados"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Cuenta principal (<xliff:g id="REGISTRATION_STATUS">%s</xliff:g>)"</string>
-    <string name="registration_status_checking_status" msgid="3381868307694056727">"Comprobando estado..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Registrando..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Seguimos intentándolo..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Sin recepción de llamadas"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Se ha detenido el registro de cuenta porque no hay conexión a Internet."</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Se ha detenido el registro de cuenta porque no hay conexión WiFi."</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Error al registrar la cuenta"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Recibiendo llamadas"</string>
+    <string name="registration_status_checking_status" msgid="3381868307694056727">"Comprobando estado\u2026"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registrando\u2026"</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Seguimos intentándolo\u2026"</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Sin recepción de llamadas"</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Se ha detenido el registro de cuenta porque no hay conexión a Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Se ha detenido el registro de cuenta porque no hay conexión Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Registro de cuenta incorrecto"</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Recibiendo llamadas"</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Error al registrar la cuenta: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); inténtalo de nuevo más tarde."</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Error al registrar la cuenta: nombre de usuario o contraseña incorrectos"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Error al registrar la cuenta: comprueba el nombre del servidor."</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"La aplicación <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> está utilizando actualmente esta cuenta."</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Registro de cuenta incorrecto: nombre de usuario o contraseña incorrectos."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Error al registrar la cuenta: comprueba el nombre del servidor."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"La aplicación <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> está utilizando esta cuenta en este momento."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Detalles de cuenta SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Detalles de cuenta SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Servidor"</string>
@@ -664,9 +585,6 @@
     <string name="port_title" msgid="5952939408078626657">"Número de puerto"</string>
     <string name="transport_title" msgid="8253139511847746640">"Tipo de transporte"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Enviar señal conexión"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Enviar mensajes SIP de conexión"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Registro automático"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Registrar el perfil automáticamente"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Establecer como principal"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Se utiliza para llamadas salientes."</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Ajustes opcionales"</string>
@@ -677,12 +595,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Opcional&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Tocar para mostrar todo"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Tocar para ocultar todo"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"El campo <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> es obligatorio; no se puede dejar en blanco."</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"El número de puerto debe estar comprendido entre 1.000 y 65.534."</string>
+    <string name="empty_alert" msgid="6839103946505432390">"El campo <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> es obligatorio y no se puede dejar en blanco."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"El número de puerto debe estar comprendido entre 1.000 y 65.534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Sin conexión a Internet"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Sin conexión Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Para realizar una llamada por Internet, comprueba la conexión."</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Para realizar llamadas por Internet, debes estar conectado a una red WiFi (utiliza la configuración inalámbrica y de red)."</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Para hacer una llamada por Internet, comprueba tu conexión a Internet."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Para hacer llamadas por Internet, debes estar conectado a una red Wi-Fi (usa la opción Conexiones inalámbricas y redes)."</string>
     <string name="no_voip" msgid="8901474054537199865">"No se admiten llamadas por Internet"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automático"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Enviar siempre"</string>
@@ -691,7 +609,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Te llamo en cuanto pueda."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Te llamo más tarde."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"No puedo hablar. Llámame luego."</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Mensaje personalizado..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Mensaje personalizado"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respuestas rápidas"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editar respuestas rápidas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -709,7 +627,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"estrella"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"cero"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
-    <string name="description_search_button" msgid="239929880630534731">"buscar"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"retroceder un espacio"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Altavoz habilitado"</string>
@@ -718,10 +635,31 @@
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Rechazar"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
-    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibración"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Tono"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Siempre"</item>
     <item msgid="1595097872875714252">"Solo en modo silencio"</item>
     <item msgid="1458182414036878616">"Nunca"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Tono del teléfono"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar al sonar"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Sonar al marcar número"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Tono"</string>
+    <string name="perm_change_mobile_network">Cambiar red (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Las aplicaciones con este permiso, pueden en cualquier momento, cambiar entre datos 2G y 3G. 3G es rápido, consume mas batería, y puede costarte mas dinero.</string>
+    <string name="noise_suppression_title">Supresor de ruido</string>
+    <string name="noise_suppression_summary">Activar la supresión de ruido durante las llamadas</string>
+    <string name="phone_number_label">Mi número de teléfono</string>
+    <string name="phone_number_summary">Establecer el número de teléfono para este terminal</string>
+    <string name="advanced_setting">Configuración Avanzada</string>
+    <string name="keep_proximity_sensor_on">Sensor de proximidad encendido</string>
+    <string name="keep_proximity_sensor_on_sum">No apagar el sensor de proximidad si se utilizan auriculares durante una llamada</string>
+    <string name="lockscreen_if_call_ends_with_screenoff">Bloquear al colgar</string>
+    <string name="lockscreen_if_call_ends_with_screenoff_sum">Bloquear de forma automática si al finalizar una llamada la pantalla está apagada</string>
+    <string name="vibrate_outgoing">Vibrar al contestar</string>
+    <string name="vibrate_call_waiting">Vibrar en llamada en espera</string>
+    <string name="vibrate_hangup">Vibrar al colgar</string>
+    <string name="vibrate_45">Vibrar cada 45 segundos</string>
+    <string name="vibrate_45_sum">Vibrar en el segundo 45 de cada minuto de una llamada saliente</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index dbf0d936d..730ca56d6 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Varjatud number"</string>
     <string name="payphone" msgid="1931775086311769314">"Telefoniautomaat"</string>
     <string name="onHold" msgid="9035493194749959955">"Ootel"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Käimasolev kõne"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Liin hõivatud"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Võrk hõivatud"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Vastust ei ole, aegunud"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server on kättesaamatu"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Number pole kättesaadav"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Vale kasutajanimi või parool"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Helistas väljastpoolt võrku"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Helistas väljastpoolt võrku"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Serveri viga. Proovige hiljem uuesti."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Signaal puudub"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-piir ületatud"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Raadioside väljas"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Pole SIM-i ega PIN-i viga"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"SIM-kaart puudub või SIM-kaardi viga"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Teeninduspiirkonnast väljas"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Väljuvad kõned on piiratud FDN-iga."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Väljuvaid kõnesid ei saa teha, kui kõnepiirang on sisse lülitatud."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Väljuvaid kõnesid ei saa teha, kui kõnepiirang on sisse lülitatud."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Kõiki kõnesid piiratakse juurdepääsu juhtimisega"</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Hädaabikõned on piiratud juurdepääsu juhtimisega."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Tavakõned on piiratud juurdepääsu juhtimisega."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: telefon on lukus, kuni lülitate selle välja ja uuesti sisse"</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: kõne katkes."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: kõne katkestati."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: ümberkorraldamine"</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: teenusevalikust keeldumine"</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: proovi uuesti järjestada."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: juurdepääs ebaõnnestus."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: eelisõigusega."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Teha saab ainult hädaabikõnesid."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Kehtetu number"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Vale number"</string>
     <string name="confCall" msgid="1904840547188336828">"Konverentskõne"</string>
     <string name="call_lost" msgid="317670617901479594">"Kõne on katkenud."</string>
-    <string name="retry" msgid="8462986804300767852">"Proovi uuesti"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Kõne katkenud"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-kood käivitus"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-kood töötab ..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Juhtmega peakomplekt"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Kas saata järgmised toonid?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Toonide saatmine"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Toonide saatmine"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Saada"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Jah"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Ei"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Sisesta metamärgi asemele"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Pane metamärgi asemele"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Puudub kõnepostinumber"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"SIM-kaardile pole salvestatud ühtegi kõnepostinumbrit."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Lisa number"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Laadimine ..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Sisestage PIN-kood SIM-kaardi avamiseks."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM avatud"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Uus SIM-i PIN-kood"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Sisestage uus SIM-kaardi PIN-kood kinnitamiseks uuesti"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Sisestatud SIM-i PIN-koodid ei kattu. Proovige uuesti."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Sisestage SIM-kaardi avamiseks PUK-kood"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Vale PUK-kood."</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Jätka"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Teie SIM-kaardi blokeering on tühistatud. Teie telefoni avamine ..."</string>
     <string name="label_ndp" msgid="780479633159517250">"SIM-võrgu avamise PIN-kood"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Ava"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Võrgu avamise taotlemine ..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Võrgu avamise taotlus ebaõnnestus."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Võrgu avamine õnnestus."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM-kõneseaded"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA-kõneseaded"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Pääsupunktide nimed"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Täiendavad „ainult CDMA” kõneseaded"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Võrguteenuse seaded"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Helistaja ID"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Seadete laadimine ..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Number peidetud väljuvate kõnede puhul"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Number kuvatakse väljuvate kõnede puhul"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Kasuta väljuvates kõnedes minu numbri kuvamiseks operaatori vaikeseadeid"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Number, kui on hõivatud"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Edastamine numbrile <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Keelatud"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Teie operaator ei toeta ümbersuunamise keelamist, kui teie telefon on hõivatud."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Teie operaator ei toeta kõneedastuse keelamist, kui teie telefon on hõivatud."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Suuna, kui ei vasta"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Number, kui ei vastata"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Edastamine numbrile <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Keelatud"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Teie operaator ei toeta ümbersuunamise keelamist, kui teie telefon ei vasta."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Teie operaator ei toeta kõneedastuse keelamist, kui teie telefon ei vasta."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Suuna, kui pole kättesaadav"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Number, kui pole kättesaadav"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Edastamine numbrile <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Keelatud"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Teie operaator ei toeta ümbersuunamise keelamist, kui teie telefon on levist väljas."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Teie operaator ei toeta kõneedastuse keelamist, kui teie telefon on levist väljas."</string>
     <string name="updating_title" msgid="6146755386174019046">"Kõneseaded"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Kõneseadete viga"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Seadete lugemine ..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Seadete ennistamine…"</string>
     <string name="response_error" msgid="6674110501330139405">"Ootamatu vastus võrgust."</string>
     <string name="exception_error" msgid="7027667130619518211">"Võrgu või SIM-kaardi viga."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Toimingud on lubatud vaid fikseeritud valimisnumbrite puhul."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Enne nende seadete vaatamist lülitage raadioside sisse."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Telefoni rakenduse Fikseeritud numbrite valimine seaded on sisse lülitatud. Selle tulemusena ei tööta kõik kõnega seotud funktsioonid."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Enne nende seadete vaatamist lülitage raadio sisse."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Luba"</string>
     <string name="disable" msgid="7274240979164762320">"Keela"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Peida number"</item>
     <item msgid="1108394741608734023">"Näita numbrit"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Salvesta kõnepostinumber"</string>
     <string name="vm_changed" msgid="380744030726254139">"Kõnepostinumber muutunud."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Kõnepostinumbri muutmine ei õnnestunud."\n"Probleemi püsimisel võtke ühendust oma operaatoriga."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Ümbersuunamisnumbri muutmine ei õnnestunud."\n"Probleemi püsimisel võtke ühendust oma operaatoriga."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Kõneposti numbrit ei saanud muuta."\n"Kui probleem ei kao, võtke ühendust operaatoriga."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Kõneedastuse numbrit ei saanud muuta."\n"Kui probleem ei kao, võtke ühendust operaatoriga."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Praeguste edastusnumbri seadete toomine ja salvestamine ebaõnnestus."\n"Kas soovite siiski uuele teenusepakkujale ümber lülituda?"</string>
     <string name="no_change" msgid="3186040086622435212">"Muudatusi ei tehtud."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Valige kõnepostiteenus"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Otsi võrke"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Viga võrkude otsimisel."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registreerimine võrku <xliff:g id="NETWORK">%s</xliff:g> ..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Teie SIM-kaart ei võimalda selle võrguga ühendamist."</string>
-    <string name="connect_later" msgid="500090982903469816">"Selle võrguga ei saa praegu ühendust luua. Proovige hiljem uuesti."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Teie SIM-kaart ei võimalda ühendust selle võrguga."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Võrguga ei saa praegu ühendust. Proovige hiljem uuesti."</string>
     <string name="registration_done" msgid="495135664535876612">"Võrku registreeritud."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Valige võrguoperaator"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Võrguoperaatori valimine"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Otsi kõiki saadaolevaid võrke"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Vali automaatselt"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Vali automaatselt eelisvõrk"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automaatne registreerimine ..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Vali automaatselt"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Vali automaatselt eelistatud võrk"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automaatne registreerimine ..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Võrgurežiim"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Muuda võrgu töörežiimi"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Eelistatud võrgurežiim"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Eelistatud võrgurežiim: ainult EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Eelistatud võrgurežiim: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Ainult EvDo"</item>
     <item msgid="454610224530856274">"CDMA ilma EvDo-ta"</item>
-    <item msgid="8928247118825616081">"Automaatne CDMA / EvDo"</item>
-    <item msgid="8595462903294812666">"Automaatne GSM / WCDMA"</item>
+    <item msgid="648505122852496166">"Automaatne CDMA/EvDo"</item>
+    <item msgid="7148247646407324800">"Automaatne GSM/WCDMA"</item>
     <item msgid="5189164180446264504">"Ainult WCDMA"</item>
     <item msgid="5714714953966979187">"Ainult GSM"</item>
-    <item msgid="4775796025725908913">"GSM/WCDMA eelistatud"</item>
+    <item msgid="8508331239546115206">"Eelistatud GSM/WCDMA"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Andmed lubatud"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Andmerändlus"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Ühenda rändluse ajal andmesideteenustega"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Ühenda rändluse ajal andmesideteenustega"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Kaotasite andmesideühenduse, kuna jätsite oma koduvõrgu andmerändluse väljalülitatuks."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Andmesideühendus katkes, kuna lahkusite koduvõrgust ja andmerändlus oli välja lülitatud."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Kas lubada andmerändlus? Teilt võidakse küsida suuri rändlustasusid."</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM-i/UMTS-i valikud"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA valikud"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Andmete kasutus"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Operaatori andmete eeskirjad"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Praegusel perioodil kasutatud andmed"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Andmete kasutamise periood"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Andmeedastuskiiruse eeskirjad"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>?? tsüklist möödunud"\n"Järgmine periood algab <xliff:g id="USED_1">%2$d</xliff:g> päeva pärast (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Kui andmete kasutuslimiit on ületatud, vähendatakse andmeedastuskiirus <xliff:g id="USED">%1$d</xliff:g> kb/s"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Lisateave teie operaatori mobiilsidevõrgu andmete kasutuse eeskirjade kohta"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Kärjeteate-SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Kärjeteate-SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Kärjeteate-SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Kärjeteate-SMS-id lubatud"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Korea"</item>
     <item msgid="1933212028684529632">"Hiina"</item>
     <item msgid="1908428006803639064">"Heebrea"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Keeled"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Kohalik ilm"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Juurutusvõimalused"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Juurutusvõimalused lubatud"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Juurutusvõimalused keelatud"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Meditsiini-, tervishoiu- ja haiglateenused"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Meditsiini-, tervishoiu- ja haiglateenused lubatud"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Meditsiini-, tervishoiu- ja haiglateenused keelatud"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Meditsiini-, tervishoiu- ja haiglateenused"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Meditsiini-, tervishoiu- ja haiglateenused on lubatud"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Meditsiini-, tervishoiu- ja haiglateenused on keelatud"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Tehnoloogiauudised"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Tehnoloogiauudised lubatud"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Tehnoloogiauudised keelatud"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"Ainult WCDMA"</item>
     <item msgid="8776934131146642662">"Ainult GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA eelistatud)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Kasuta ainult 2G-võrke"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Säästab akut"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Süsteemi valik"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Muuda CDMA-rändlusrežiimi"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Muuda CDMA-rändlusrežiimi"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Süsteemi valik"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Ainult kodus"</item>
     <item msgid="1205664026446156265">"Automaatne"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA-rändlusrežiim"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Muuda CDMA-rändlusrežiimi"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA-rändlusrežiim"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Ainult koduvõrgud"</item>
-    <item msgid="8174642753290624634">"Sidusettevõtete võrgud"</item>
-    <item msgid="2241951431403168661">"Kõik võrgud"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA-tellimus"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA-võrgu eelistused"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Pole veel kasutusel."</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA-võrgu eelistused"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"Ainult CDMA"</item>
     <item msgid="2683555124647197574">"Ainult EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA tellimus"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"RUIM-i/SIM-i ja NV vahetamine"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"tellimus"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Seadme aktiveerimine"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Andmesideteenuse häälestamine"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Fikseeritud valimisnumbrite haldamine"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Muuda FDN-juurdepääsuks PIN-koodi"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Telefoninumbrite loendi haldamine"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Hääleprivaatsus"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Häälvestluse privaatsus"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Luba täiendatud privaatsusrežiim"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY-režiim"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Luba TTY-režiim"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY-režiim"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Määra TTY-režiim"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Automaatkatse"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Luba automaatkatserežiim"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Automaatkatse"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Luba automaatkatse režiim"</string>
     <string name="menu_add" msgid="1882023737425114762">"Lisa kontakt"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Muuda kontakti"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Kustuta kontakt"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Sisestage PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Sisestage PIN2-kood"</string>
     <string name="name" msgid="7329028332786872378">"Nimi"</string>
     <string name="number" msgid="7905950798349903858">"Number"</string>
     <string name="save" msgid="4094274636321939086">"Salvesta"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Kustuta fikseeritud valimisnumber"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Fikseeritud valimisnumbri kustutamine…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Fikseeritud valimisnumber kustutatud."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN värskendamata: sisestasite vale PIN-koodi."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN värskendamata: arv ei tohi ületada 20 numbrit."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN-i ei värskendatud, sest sisestasite vale PIN-koodi."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN-i ei värskendatud, sest number ei tohi olla pikem kui 20 kohta."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN-i ei värskendatud. PIN2 oli vale või lükati telefoninumber tagasi."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM-kaardilt lugemine ..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Teie SIM-kaardil pole ühtegi kontakti."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Valige imporditavad kontaktid"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"SIM-kaardilt kontaktide importimiseks lülitage lennukirežiim välja."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Kontaktide importimiseks SIM-kaardilt lülitage esmalt välja lennukirežiim."</string>
     <string name="enable_pin" msgid="5422767284133234860">"SIM-i PIN-koodi lubamine/keelamine"</string>
     <string name="change_pin" msgid="9174186126330785343">"Muuda SIM-i PIN-koodi"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM-i PIN-kood"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Vana PIN-kood"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Uus PIN-kood"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Kinnitage uus PIN-kood"</string>
-    <string name="badPin" msgid="4154316827946559447">"Sisestatud vana PIN-kood pole õige. Proovige uuesti."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Sisestatud PIN-koodid ei kattu. Proovige uuesti."</string>
+    <string name="badPin" msgid="8955102849303984935">"Sisestatud vana PIN-kood ei ole õige. Proovige uuesti."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Sisestatud PIN-koodid ei sobi. Proovige uuesti."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Sisestage 4–8-numbriline PIN-kood."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Keela SIM-i PIN-kood"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Luba SIM-i PIN-kood"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Oodake ..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"SIM-i PIN-kood lubatud"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM-i PIN-kood keelatud"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Sisestasite vale PIN-koodi"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"SIM-i PIN-koodi muutmine õnnestus"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM-kaardi PIN-kood lubatud"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM-kaardi PIN-kood on keelatud."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Sisestasite vale PIN-koodi."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"SIM-kaardi PIN-koodi muutmine õnnestus."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Parool on vale, SIM-kaart on lukus. Vajalik on PUK2-kood."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Vana PIN2-kood"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Uus PIN2-kood"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Kinnitage uus PIN2-kood"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Sisestatud PUK2-kood pole õige. Proovige uuesti."</string>
-    <string name="badPin2" msgid="515218795152422178">"Sisestatud vana PIN2-kood pole õige. Proovige uuesti."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Sisestatud PIN2-koodid ei kattu. Proovige uuesti."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Sisestatud PUK2-kood pole õige. Proovige uuesti."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Sisestatud vana PIN2-kood ei ole õige. Proovige uuesti."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Sisestatud PIN2-koodid ei sobi. Proovige uuesti."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Sisestage 4–8-numbriline PIN-kood."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Sisestage 8-numbriline PUK2."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 muutmine õnnestus"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2-koodi muutmine õnnestus."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Sisestage PUK2-kood"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Parool on vale, muutke PIN2-koodi ja proovige uuesti."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Parool on vale, SIM-kaart on lukus. Vajalik on PUK2-kood."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Parool on vale. Muutke PIN2-koodi ja proovige uuesti."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Parool on vale, SIM-kaart on lukus. Sisestage PUK2-kood."</string>
     <string name="doneButton" msgid="2859593360997984240">"Valmis"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konverentskõne <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Tagasi kõne juurde"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Jätka ilma SIM-kaardita"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"SIM-kaarti ei leitud. Sisestage SIM-kaart telefoni."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Loobu"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Ava"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"PIN-koodi autentimine ..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Kõnepostinumber"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Valimine"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Uuesti proovimine"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konverentskõne"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Sissetulev kõne"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"CDMA-kõne ootel"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Kõne lõppes"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Ootel"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Lõpetamisel"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Vastamata kõned"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> vastamata kõnet"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Vastamata kõne helistajalt <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Käimasolev kõne (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Käimasolev kõne"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Ootel"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Sissetulev kõne"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Uus kõnepost"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Kõneposti number teadmata"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Teenus puudub"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Valitud võrk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) pole saadaval"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Lõpeta kõne"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Helista tagasi"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Sõnum"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Helistamiseks lülitage lennurežiim välja."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ei ole võrku registreeritud."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobiilsidevõrk pole saadaval."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Kõnet ei tehtud, sisestati kehtetu number."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Kõnet ei tehtud."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI-jada alustamine ..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Funktsioonikoodi jada alustamine ..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Toetamata teenus."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Kõnesid ei saa vahetada."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Kõne ei saa eraldada."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Hädaabikõne"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Raadioside sisselülitamine ..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Teeninduspiirkonnast väljas, uuesti proovimine ..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Kõnet ei tehtud, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> pole hädaabinumber."</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Kõnet ei tehtud, valige hädaabinumber."</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Kõnet ei saadetud. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> pole hädaabinumber."</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Kõnet ei edastatud, valige hädaabinumber."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Kasutage valimiseks klaviatuuri"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Puuduta tooniklahvistikku"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Pane ootele"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Jätka"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Lõpeta"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Numbriklahvistik"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Peida"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Kõlar"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Summuta"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Lisa kõne"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Ühenda kõned"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Vaheta"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI-tekst"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF-toonid"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF-toonid"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Määrake DTMF-toonide pikkus"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Tavaline"</item>
     <item msgid="2883365539347850535">"Pikk"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Võrguteade"</string>
+    <string name="network_message" msgid="4483886461245213802">"Võrgusõnum"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Telefoni aktiveerimine"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Telefoniteenuse aktiveerimiseks peate valima konkreetse kõne. "\n\n"Pärast käsu “Aktiveeri“ puudutamist kuulake telefoni aktiveerimise juhiseid."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Puudutage käsku “Aktiveeri“ konkreetse kõne valimiseks, mis aktiveerib teie telefoni teie operaatori mobiilsidevõrgus, et saaksite kõnesid valida ja luua ühendusi mobiilsete andmesidevõrkudega."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Jätan aktiveerimise vahele?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Aktiveerimise vahelejätmisel ei saa te kõnesid valida ega luua ühendust mobiilsete andmevõrkudega (kuid saate luua ühenduse WiFi-võrkudega). Telefoni aktiveerimisprotsessi ajal palutakse teil see aktiveerida iga kord, kui telefoni sisse lülitate."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Jäta vahele"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktiveeri"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktiveeri"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Telefon on aktiveeritud."</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefon on aktiveeritud."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Probleem aktiveerimisega"</string>
     <string name="ota_listen" msgid="162923839877584937">"Järgige hääljuhiseid, kuni kuulete, et aktiveerimine on lõpetatud."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Klaviatuur"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Kõlar"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Oodake, kuni teie telefoni programmeeritakse."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programmeerimine ei õnnestunud"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Oodake, kuni teie telefoni programmeeritakse."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programmeerimine ebaõnnestus"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Teie telefon on nüüd aktiveeritud. Teenuse käivitumiseks võib kuluda kuni 15 minutit."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Teie telefoni ei aktiveeritud. "\n"Peate leidma parema leviga piirkonna (akna lähedal või õues). "\n\n"Proovige uuesti või helistage klienditeenindusse."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Teie telefoni ei aktiveeritud. "\n"Leidke parema leviga piirkond (akna lähedal või õues). "\n\n"Proovige uuesti või helistage klienditeenindusse."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"LIIGSED SPC NURJUMISED"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Tagasi"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Proovige uuesti"</string>
     <string name="ota_next" msgid="3904945374358235910">"Järgmine"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Tagasi"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Sisenetud hädaolukorra tagasihelistusrežiimi"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Hädaolukorra tagasihelistusrežiim"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"Andmeühendus puudub <xliff:g id="COUNT">%s</xliff:g> minutiks"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Telefon on <xliff:g id="COUNT">%s</xliff:g> minutit hädaolukorra tagasihelistusrežiimis. Sel ajal ei saa ühtegi andmeühendust kasutavat rakendust kasutada. Kas soovite kohe väljuda?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Telefon on <xliff:g id="COUNT">%s</xliff:g> minutit hädaolukorra tagasihelistusrežiimis. Sel ajal ei saa ühtegi andmeühendust kasutavat rakendust kasutada. Kas soovite kohe väljuda?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Telefon on hädaolukorra tagasihelistusrežiimis <xliff:g id="COUNT">%s</xliff:g> minut. Selles režiimis ei saa kasutada ühtegi andmesideühendusel põhinevat rakendust. Kas soovite kohe väljuda?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Telefon on hädaolukorra tagasihelistusrežiimis <xliff:g id="COUNT">%s</xliff:g> minutit. Selles režiimis ei saa kasutada ühtegi andmesideühendust kasutavat rakendust. Kas soovite kohe väljuda?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Valitud toiming ei ole hädaolukorra tagasihelistusrežiimis saadaval. Telefon on selles režiimis <xliff:g id="COUNT">%s</xliff:g> minutit. Kas soovite kohe väljuda?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Valitud toiming ei ole hädaolukorra tagasihelistusrežiimis saadaval. Telefon on selles režiimis <xliff:g id="COUNT">%s</xliff:g> minutit. Kas soovite kohe väljuda?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Valitud toiming ei ole hädaolukorra tagasihelistusrežiimis saadaval. Telefon on selles režiimis <xliff:g id="COUNT">%s</xliff:g> minut. Kas soovite kohe väljuda?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Valitud toiming pole hädaolukorra tagasihelistusrežiimis kättesaadav. Telefon on selles režiimis <xliff:g id="COUNT">%s</xliff:g> minut. Kas soovite kohe väljuda?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Valitud toiming ei ole hädaabikõnede ajal saadaval"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Väljumine hädaolukorra tagasihelistusrežiimist"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Valitud toiming ei ole hädaabikõne ajal saadaval."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Väljumine hädaolukorra tagasihelistusrežiimist"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Jah"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Ei"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Loobu"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Kõneposti seaded"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;pole määratud&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Kõnepostiteenus"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Teenusepakkuja <xliff:g id="PROVIDER_NAME">%s</xliff:g> seaded"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Teenus"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Seadistus"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Määramata&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Muud kõneseaded"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Vali"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Helistamine teenusepakkuja ^1"\n<b>"^2"</b>" kaudu"</string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Vastamiseks lohistage paremale"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Helina vaigistamiseks lohistage vasakule"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Keeldumiseks lohistage vasakule"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Lohistage paremale, et vastata ja"\n"panna aktiivne kõne ootele"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Lohistage paremale, et vastata ja"\n"lõpetada aktiivne kõne"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Lohistage paremale, et vastata ja"\n"lõpetada ootel kõne"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Vasta"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Keeldu"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Kõne edastab <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"kontakti foto"</string>
     <string name="goPrivate" msgid="865837794424530980">"aktiveeri privaatrežiim"</string>
     <string name="selectContact" msgid="781975788478987237">"vali kontakt"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Interneti-kõne seaded"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Interneti-kõne (SIP) kontod"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Kontod"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Interneti-kõnede (SIP) kontode ja oleku haldamine"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Sissetulevate kõnede vastuvõtmine"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Vähendab aku kestvust"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Seadista kõnevalikud"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Kasuta Interneti-kõne"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Interneti-kõne kasutamine (ainult WiFi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Kõikide kõnede puhul, kui andmesidevõrk on saadaval"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Ainult Interneti-kõnede jaoks"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Küsi iga kõne puhul"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Kõikide kõnede jaoks"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Automaatne registreerimine"</string>
-    <string name="call_priority" msgid="8374917577270504387">"SIP-i kaudu väljuv kõne"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Kõne valimine"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Kasuta Interneti-kõne kontot:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Kasuta alati Interneti-kõnede tegemiseks"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Selleks et muuta kõne tegemisel vaikimisi kasutatavat Interneti-kõne kontot, kasutage kõneseadeid, valides Interneti-kõne seadete alt teise konto."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Vaikimisi kasutatava Interneti kõnekonto muutmiseks tehke järgmised valikud: Telefon &gt; Seaded &gt; Interneti-kõne seaded &gt; Kontod."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Mobiiltelefonikõne"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Interneti-kõne"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Interneti-kõnede kontot ei ole"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Sellel telefonil puuduvad Interneti-kõne kontod. Kas lisan kohe?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Selles telefonis pole ühtegi Interneti-kõne kontot. Kas soovite praegu ühe lisada?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Lisa"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Lisa konto"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Eemalda konto"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP-kontod"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Konto salvestamine ..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Konto eemaldamine ..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Konto salvestamine ..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Konto eemaldamine ..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Salvestamine"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Loobu"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Profiili sulgemine"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Sule"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Peamine"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Tee see minu peamiseks kontoks"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Kasutatakse väljuvate kõnede jaoks"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Täpsemad seaded"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Peamine konto. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Oleku kontrollimine ..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Registreerimine ..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Üritamine ..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Kõnesid ei võeta vastu"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Konto registreerimine peatatud, sest puudub Interneti-ühendus"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Konto registreerimine on peatatud, sest puudub WiFi-ühendus"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Konto registreerimine ebaõnnestus"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Kõnede vastuvõtmine"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registreerimine ..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Registreerimine jätkub ..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Kõnesid ei võeta vastu."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Konto registreerimine on peatatud, sest puudub Interneti-ühendus."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Konto registreerimine on peatatud, sest puudub WiFi-ühendus."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Konto registreerimine ebaõnnestus."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Kõnede vastuvõtmine."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Konto registreerimine ebaõnnestus: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); proovige hiljem uuesti"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Konto registreerimine ebaõnnestus: vale kasutajanimi või parool"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Konto registreerimine ebaõnnestus: kontrollige serveri nime"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Kontot kasutab praegu konto <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> rakendus"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Konto registreerimine ebaõnnestus: vale kasutajanimi või parool."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Konto registreerimine ebaõnnestus: kontrollige serveri nime."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Kontot kasutab hetkel kontoomaniku <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> rakendus"</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIP-konto andmed"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP-konto andmed"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Server"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Pordi number"</string>
     <string name="transport_title" msgid="8253139511847746640">"Transpordi tüüp"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Saada ülalhoidmise eelistusi"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Saada SIP-i ülalhoidmise eelistuste sõnumeid"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Automaatne registreerimine"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Registreeri profiil automaatselt"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Määra peamiseks kontoks"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Kasutatakse väljuvate kõnede jaoks"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Valikulised seaded"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Valikuline&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷Puudutage kõige kuvamiseks"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽Puudutage kõige peitmiseks"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"Väli <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> on kohustuslik, ei saa jätta tühjaks"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Pordi number peab jääma vahemikku 1000 kuni 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Väli <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> on kohustuslik, seda ei saa tühjaks jätta."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Pordi number peab jääma vahemikku 1000 kuni 65 534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Interneti-ühendus puudub"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"WiFi-ühendust ei ole"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Interneti-kõne tegemiseks kontrollige esmalt Interneti-ühendusest"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Interneti-kõnede jaoks peate olema ühendatud WiFi-võrguga (kasutage traadita võrgu seadeid)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Interneti-kõne tegemiseks kontrollige esmalt Interneti-ühendust."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Interneti-kõnede jaoks peate olema ühendatud WiFi-võrguga (kasutage traadita ühenduse ja võrgu seadeid)"</string>
     <string name="no_voip" msgid="8901474054537199865">"Interneti-kõnesid ei toetata"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automaatne"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Saada alati"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Helistan kohe tagasi."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Helistan sulle hiljem."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Ei saa rääkida. Helistad hiljem?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Kohandatud sõnum ..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Kohandatud sõnum"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Kiirvastused"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Kiirvastuste muutmine"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"tärn"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"null"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"nael"</string>
-    <string name="description_search_button" msgid="239929880630534731">"otsing"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"helista"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"tagasilüke"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Valjuhääldi on sisse lülitatud."</string>
@@ -715,9 +615,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Keeldumine"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibreerimine"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibreerimine"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Helin"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Alati"</item>
     <item msgid="1595097872875714252">"Ainult hääletus režiimis"</item>
     <item msgid="1458182414036878616">"Mitte kunagi"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Telefonihelin"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibreerimine helina ajal"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Valimisklahvistiku puutetoonid"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Helin"</string>
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index da4885d0b..002347a9b 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"شماره خصوصی"</string>
     <string name="payphone" msgid="1931775086311769314">"تلفن سکه ای"</string>
     <string name="onHold" msgid="9035493194749959955">"در انتظار"</string>
-    <string name="ongoing" msgid="8300874342848721367">"تماس فعلی"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"خط مشغول است"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"شبکه مشغول است"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"پاسخی دریافت نشد، زمان پایان یافت"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"سرور غیرقابل دسترسی"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"شماره غیرقابل دسترسی"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"نام کاربر و رمز ورود اشتباه است"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"از خارج از شبکه تماس گرفته شده است"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"از خارج از شبکه تماس گرفته شده است"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"خطای سرور: بعداً دوباره امتحان کنید."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"بدون سیگنال"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"بیش از حد مجاز ACM"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"رادیو خاموش"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"فاقد سیم کارت، یا خطای سیم کارت"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"فاقد سیم، یا خطای سیم"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"خارج از منطقه سرویس"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"تماس های خروجی توسط FDN محدود شده اند."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"هنگام فعال بودن انسداد تماس، برقراری تماس خروجی امکان پذیر نیست."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"هنگام روشن بودن محدودیت تماس، برقراری تماس‌های خروجی امکان‌پذیر نیست."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"همه تماس ها توسط کنترل دسترسی محدود شده اند."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"تماس های اضطراری توسط کنترل دسترسی محدود شده اند."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"تماس های معمولی توسط کنترل دسترسی محدود شده اند."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: تلفن تا زمان روشن و خاموش کردن بعدی قفل شد."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: تماس قطع شد."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: تماس متوقف شد."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: دستور مجدد."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: رد گزینه سرویس."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: دستور را دوباره انجام دهید."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: دسترسی ناموفق است."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: ممانعت شد."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"فقط تماس های اضطراری امکان پذیر است"</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"شماره نامعتبر"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"شماره نامعتبر"</string>
     <string name="confCall" msgid="1904840547188336828">"تماس کنفرانسی"</string>
     <string name="call_lost" msgid="317670617901479594">"تماس قطع شد."</string>
-    <string name="retry" msgid="8462986804300767852">"امتحان مجدد"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"تماس از دست رفته"</string>
     <string name="ok" msgid="3811371167865772377">"تأیید"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"کد MMI راه اندازی شد"</string>
     <string name="ussdRunning" msgid="485588686340541690">"در حال اجرای کد USSD..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"هدست سیمی"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"صداهای زیر ارسال شود؟"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"ارسال صدا ها"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"تون‌های ارسالی"\n</string>
     <string name="send_button" msgid="4106860097497818751">"ارسال"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"بله"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"خیر"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"جایگزینی نویسه نامفهوم با"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"جایگزینی نویسه عمومی با"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"عدم وجود شماره پست صوتی"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"شماره پست صوتی در سیم کارت ذخیره نشده است."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"افزودن شماره"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"در حال بارگیری..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"کد پین را برای باز کردن قفل سیم کارت تایپ کنید."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"قفل سیم باز شد"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"کد پین سیم جدید"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"کد پین سیم جدید را دوباره برای تأیید تایپ کنید"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"کدهای پین 2 سیم که تایپ کردید مطابقت ندارند. لطفاً دوباره امتحان کنید."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"کد PUK را برای باز کردن قفل سیم کارت تایپ کنید"</string>
-    <string name="badPuk" msgid="3213017898690275965">"کد PUK نادرست!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"ادامه"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"قفل سیم کارت شما باز شده است. قفل گوشی در حال باز شدن است..."</string>
     <string name="label_ndp" msgid="780479633159517250">"پین بازگشایی قفل شبکه سیم"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"بازگشایی قفل"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"در حال درخواست بازگشایی قفل شبکه..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"درخواست قفل گشایی شبکه ناموفق بود."</string>
     <string name="unlock_success" msgid="6770085622238180152">"قفل گشایی شبکه با موفقیت انجام شد."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"تنظیمات تماس GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"تنظیمات تماس CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"نام های نقاط دسترسی"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"سایر تنظیمات تماس فقط CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"تنظیمات سرویس شبکه"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"شناسه تماس گیرنده"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"درحال بارگیری تنظیمات..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"شماره پنهان در تماس های خروجی"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"شماره نمایش داده شده در تماس های خروجی"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"از تنظیمات اپراتور پیش فرض برای نمایش شماره من در تماس های خروجی استفاده شود"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"شماره هنگام مشغول بودن"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"هدایت به <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"غیر فعال شد"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"شرکت مخابراتی شما از غیر فعال کردن هدایت تماس هنگامی که تلفن شما مشغول است، پشتیبانی نمی کند."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"اپراتور شمااز غیرفعال کردن هدایت تماس هنگامی که تلفن شما مشغول است، پشتیبانی نمی‌کند."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"هدایت هنگام عدم پاسخگویی"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"شماره هنگام عدم پاسخگویی"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"هدایت به <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"غیر فعال شد"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"شرکت مخابراتی شما از غیر فعال کردن هدایت تماس هنگامی که تلفن شما مشغول است، پشتیبانی نمی کند."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"اپراتور شما از غیر فعال کردن هدایت تماس هنگامی که تلفن شما پاسخ نمی‌دهد، پشتیبانی نمی‌کند."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"هدایت هنگام عدم دسترسی"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"شماره در صورت عدم دسترسی"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"هدایت به <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"غیر فعال شد"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"شرکت مخابراتی شما از غیر فعال کردن هدایت تماس هنگامی که تلفن شما در دسترس نیست پشتیبانی نمی کند."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"شرکت مخابراتی شما از غیرفعال کردن هدایت تماس هنگامی که تلفن شما در دسترس نیست پشتیبانی نمی‌کند."</string>
     <string name="updating_title" msgid="6146755386174019046">"تنظیمات تماس"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"خطای تنظیمات تماس"</string>
     <string name="reading_settings" msgid="1920291699287055284">"در حال خواندن تنظیمات..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"در حال بازیابی تنظیمات..."</string>
     <string name="response_error" msgid="6674110501330139405">"پاسخ پیش بینی نشده از شبکه."</string>
     <string name="exception_error" msgid="7027667130619518211">"خطای شبکه یا سیم کارت."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"عملکردها فقط برای شماره های شماره گیری ثابت مجاز است."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"لطفاً قبل از مشاهده این تنظیمات، رادیو را روشن کنید."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"تنظیم اعداد شماره‌گیری ثابت برنامه‌های تلفن شما غیرفعال است. درنتیجه، برخی از ویژگی‌های مربوط به تماس کار نمی‌کند."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"قبل از مشاهده این تنظیمات، رادیو را روشن کنید."</string>
     <string name="close_dialog" msgid="2365884406356986917">"تأیید"</string>
     <string name="enable" msgid="1059008390636773574">"فعال کردن"</string>
     <string name="disable" msgid="7274240979164762320">"غیرفعال کردن"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"پنهان کردن شماره"</item>
     <item msgid="1108394741608734023">"نمایش شماره"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"ذخیره شماره پست صوتی"</string>
     <string name="vm_changed" msgid="380744030726254139">"شماره پست صوتی تغییر کرد."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"تغییر شماره پست صوتی ناموفق بود. "\n"در صورت بروز مجدد مشکل، با شرکت مخابراتی خود تماس بگیرید."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"تغییر شماره هدایت تماس ناموفق بود."\n"در صورت بروز مجدد مشکل، با شرکت مخابراتی خود تماس بگیرید."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"نمی‌توان شماره صندوق صوتی را تغییر داد."\n"در صورتی که این مشکل همچنان ادامه دارد با شرکت مخابراتی خود تماس بگیرید."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"نمی‌توان شماره هدایت تماس را تغییر داد."\n"در صورتی که این مشکل همچنان ادامه دارد با شرکت مخابراتی خود تماس بگیرید."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"نمی‌توان تنظیمات هدایت شماره فعلی را بازیابی و ذخیره کرد."\n"به هر حال به ارائه دهنده جدید تغییر کند؟"</string>
     <string name="no_change" msgid="3186040086622435212">"تغییری انجام نشده است."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"انتخاب سرویس پست صوتی"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"جستجوی شبکه ها"</string>
     <string name="network_query_error" msgid="6828516148953325006">"خطا هنگام جستجو برای شبکه ها."</string>
     <string name="register_on_network" msgid="9055203954040805084">"در حال ثبت در <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"سیم کارت شما اجازه اتصال به این شبکه را نمی دهد."</string>
-    <string name="connect_later" msgid="500090982903469816">"اتصال به این شبکه در حال حاضر امکان پذیر نیست. لطفاً بعداً دوباره امتحان کنید."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"سیم کارت شما اجازه اتصال به این شبکه را نمی‌دهد."</string>
+    <string name="connect_later" msgid="2308119155752343975">"اتصال به این شبکه در حال حاضر امکان پذیر نیست. بعداً دوباره امتحان کنید."</string>
     <string name="registration_done" msgid="495135664535876612">"در شبکه ثبت شد."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"انتخاب یک اپراتور شبکه"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"انتخاب یک اپراتور شبکه"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"جستجوی همه شبکه های موجود"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"انتخاب خودکار"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"انتخاب خودکار شبکه برگزیده"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"ثبت خودکار..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"انتخاب به طور خودکار"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"به صورت خودکار شبکه برگزیده را انتخاب کنید"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"ثبت خودکار..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"حالت شبکه"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"تغییر حالت عملکرد شبکه"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"حالت شبکه برگزیده"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"حالت شبکه برگزیده: فقط EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"حالت شبکه برگزیده: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"فقط EvDo"</item>
     <item msgid="454610224530856274">"CDMA بدون EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo خودکار"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA خودکار"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo خودکار"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA خودکار"</item>
     <item msgid="5189164180446264504">"فقط WCDMA"</item>
     <item msgid="5714714953966979187">"فقط GSM"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA برگزیده"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA برگزیده"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"داده ها فعال شدند"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"رومینگ داده"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"اتصال به سرویس های داده هنگام رومینگ"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"اتصال به سرویس های داده هنگام رومینگ"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"چون از شبکه اصلی خود با رومینگ داده خاموش خارج شدید، اتصال داده ای خود را از دست دادید."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"اتصال داده خود را از دست داده‌اید، زیرا از شبکه اصلی خود خارج شدید و رومینگ داده خاموش است،"</string>
     <string name="roaming_warning" msgid="7820963598559553967">"رومینگ داده مجاز است؟ ممکن است هزینه های رومینگ زیادی برای شما در بر داشته باشد!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"گزینه های GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"گزینه های CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"مصرف داده"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"خط مشی داده شرکت مخابراتی"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"داده های مورد استفاده در دوره زمانی فعلی"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"مدت زمان مصرف داده"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"قانون نرخ داده"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ از دوره سپری شده"\n"دوره زمانی بعدی بعد از <xliff:g id="USED_1">%2$d</xliff:g> روز شروع می شود (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"در صورت فراتر رفتن مصرف داده از حد مجاز، نرخ داده ها به <xliff:g id="USED">%1$d</xliff:g> کیلو بیت در ثانیه کاهش می یابد."</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"اطلاعات بیشتر درباره خط مشی استفاده از داده شبکه تلفن همراه شرکت مخابراتی شما"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"پیامک پخش سلولی"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"پیامک پخش سلولی"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"پیامک پخش سلولی"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"پیامک پخش سلولی فعال شد"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"کره ای"</item>
     <item msgid="1933212028684529632">"چینی"</item>
     <item msgid="1908428006803639064">"عبری"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"زبان ها"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"وضعیت هوای محلی"</string>
@@ -305,52 +271,25 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"فرصت های شغلی"</string>
     <string name="eo_enable" msgid="8623559062015685813">"فرصت های شغلی فعال شد"</string>
     <string name="eo_disable" msgid="3863812478090907609">"فرصت های شغلی غیر فعال شد"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"پزشکی، سلامت و بیمارستان"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"پزشکی، سلامت و بیمارستان فعال شد"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"پزشکی، سلامت و بیمارستان غیر فعال شد"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"پزشکی، سلامت و بیمارستان"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"پزشکی، سلامت و بیمارستان فعال شد"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"پزشکی، سلامت و بیمارستان غیرفعال شد"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"اخبار فناوری"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"اخبار فناوری فعال شد"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"اخبار فناوری غیر فعال شد"</string>
     <string name="enable_disable_multi_category" msgid="626771003122899280">"دسته های متعدد"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"دسته های متعدد فعال شد"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"دسته های متعدد غیر فعال شد"</string>
-    <string name="gsm_umts_network_preferences_title" msgid="4834419333547382436">"موارد برگزیده شبکه GSM/UMTS"</string>
-    <string name="gsm_umts_network_preferneces_summary" msgid="1905018644156819521">"هنوز اجرا نشده است!"</string>
-    <string name="gsm_umts_network_preferences_dialogtitle" msgid="6356332580813229898">"موارد برگزیده شبکه GSM/UMTS"</string>
-  <string-array name="gsm_umts_network_preferences_choices">
-    <item msgid="935612021902787683">"GSM/WCDMA (حالت خودکار)"</item>
-    <item msgid="8912042051809329533">"فقط WCDMA"</item>
-    <item msgid="8776934131146642662">"فقط GSM"</item>
-    <item msgid="4684679567848300935">"GSM/WCDA (WCDMA برگزیده)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
-  </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"فقط استفاده از شبکه های 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"باتری را ذخیره می کند"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"انتخاب سیستم"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"تغییر حالت رومینگ cdma"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"تغییر حالت رومینگ CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"انتخاب سیستم"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"فقط خانه"</item>
     <item msgid="1205664026446156265">"خودکار"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"حالت رومینگ CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"تغییر حالت رومینگ cdma"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"حالت رومینگ CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"فقط شبکه های خانگی"</item>
-    <item msgid="8174642753290624634">"شبکه های وابسته"</item>
-    <item msgid="2241951431403168661">"هر شبکه ای"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"اشتراک CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"موارد برگزیده شبکه CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"هنوز اجرا نشده است!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"موارد برگزیده شبکه CDMA"</string>
@@ -359,21 +298,11 @@
     <item msgid="6143696847467859795">"فقط CDMA"</item>
     <item msgid="2683555124647197574">"فقط EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"اشتراک CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"تغییر بین RUIM/SIM و NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"اشتراک"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"فعال کردن دستگاه"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"راه اندازی سرویس داده"</string>
@@ -390,18 +319,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"مدیریت شماره های شماره گیری ثابت"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"تغییر پین برای دسترسی FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"مدیریت لیست شماره تلفن"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"رازداری صوتی"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"حریم خصوصی صوتی"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"فعال کردن حالت رازداری پیشرفته"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"حالت TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"فعال کردن حالت TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"حالت TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"تنظیم حالت TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"سعی مجدد خودکار"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"فعال کردن حالت امتحان مجدد خودکار"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"سعی مجدد خودکار"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"فعال کردن حالت سعی مجدد خودکار"</string>
     <string name="menu_add" msgid="1882023737425114762">"افزودن مخاطب"</string>
     <string name="menu_edit" msgid="7143003705504672374">"ویرایش مخاطب"</string>
     <string name="menu_delete" msgid="3977150783449642851">"حذف مخاطب"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"پین 2 را وارد کنید"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"تایپ پین 2"</string>
     <string name="name" msgid="7329028332786872378">"نام"</string>
     <string name="number" msgid="7905950798349903858">"تعداد"</string>
     <string name="save" msgid="4094274636321939086">"ذخیره"</string>
@@ -414,56 +341,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"حذف شماره شماره گیری ثابت"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"در حال حذف شماره شماره گیری ثابت..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"شماره شماره گیری ثابت حذف شد."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN به روز نشد: یک پین نادرست وارد کردید."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN به روز نشد: شماره نمی تواند دارای بیش از 20 رقم باشد."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN به‌روز نشد زیرا یک پین نادرست تایپ کردید."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN به‌روزرسانی نشد زیرا شماره نمی‌تواند بیشتر از 20 رقم باشد."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN به‌روز نشد. پین 2 اشتباه بود یا شماره تلفن رد شد."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"در حال خواندن سیم کارت..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"مخاطبی در سیم کارت شما موجود نیست."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"انتخاب مخاطبین برای ورود"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"برای وارد کردن مخاطبین از سیم‌کارت‌ها، لطفاً حالت هواپیما را خاموش کنید."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"برای وارد کردن مخاطبین از سیم کارت، ابتدا حالت هواپیما را خاموش کنید."</string>
     <string name="enable_pin" msgid="5422767284133234860">"فعال کردن/غیر فعال کردن پین سیم"</string>
     <string name="change_pin" msgid="9174186126330785343">"تغییر پین سیم"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"پین سیم:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"پین قدیمی"</string>
     <string name="newPinLabel" msgid="207488227285336897">"پین جدید"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"تأیید پین جدید"</string>
-    <string name="badPin" msgid="4154316827946559447">"پین قدیمی که تایپ کردید نادرست است. لطفاً دوباره امتحان کنید."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"کدهای پینی که تایپ کردید مطابقت ندارند. لطفاً دوباره امتحان کنید."</string>
+    <string name="badPin" msgid="8955102849303984935">"پین قدیمی که تایپ کردید نادرست است. دوباره امتحان کنید."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"پین‌هایی که تایپ کردید مطابقت ندارند. دوباره امتحان کنید."</string>
     <string name="invalidPin" msgid="5981171102258684792">"یک پین 4 تا 8 رقمی را تایپ کنید."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"غیر فعال کردن پین سیم کارت"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"فعال کردن پین سیم"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"لطفاً منتظر بمانید…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"پین سیم فعال شد"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"پین سیم غیر فعال شد"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"کد پینی که تایپ کردید نادرست است"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"پین سیم با موفقیت تغییر کرد"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"پین سیم فعال شد."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"پین سیم غیر فعال شد."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"پینی که تایپ کردید نادرست است."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"پین سیم با موفقیت تغییر کرد."</string>
     <string name="puk_requested" msgid="3898394204193202803">"رمز ورود نادرست است، سیم کارت قفل شد! PUK2 مورد نیاز است."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"پین 2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"پین 2 قدیمی"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"پین 2 جدید"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"تأیید پین 2 جدید"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"PUK2 که تایپ کردید نادرست است. لطفاً دوباره امتحان کنید."</string>
-    <string name="badPin2" msgid="515218795152422178">"پین 2 قدیمی که تایپ کردید نادرست است. لطفاً دوباره امتحان کنید."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"کدهای پین 2 که وارد کردید مطابقت ندارند. لطفاً دوباره امتحان کنید."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"PUK2 که تایپ کردید نادرست است. لطفاً دوباره امتحان کنید."</string>
+    <string name="badPin2" msgid="1041576234483629991">"پین 2 قدیمی که تایپ کردید نادرست است. لطفاً دوباره امتحان کنید."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"کدهای پین 2 که تایپ کردید با هم مطابقت ندارند. دوباره امتحان کنید."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"یک کد پین 2، 4 تا 8 رقمی تایپ کنید."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"یک PUK2 دارای 8 رقم را تایپ کنید."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"پین 2 با موفقیت تغییر یافت"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"پین 2 با موفقیت تغییر کرد."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"تایپ کد PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"رمز ورود نادرست است، لطفاً پین 2 را تغییر داده و دوباره امتحان کنید!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"رمز ورود نادرست است، سیم کارت قفل شد! PUK2 مورد نیاز است."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"گذرواژه نادرست است، لطفاً پین 2 را تغییر داده و دوباره امتحان کنید!"</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"گذرواژه نادرست است، سیم کارت قفل شد. PUK2 مورد نیاز است."</string>
     <string name="doneButton" msgid="2859593360997984240">"انجام شد"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"تماس کنفرانسی <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"برگشت به تماس"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"ادامه بدون سیم کارت"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"هیچ سیم کارتی یافت نشد. لطفاً یک سیم کارت در گوشی قرار دهید."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"رد کردن"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"بازگشایی قفل"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"تأیید اعتبار پین..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"شماره پست صوتی"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"شماره گیری"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"در حال امتحان مجدد"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"تماس کنفرانسی"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"تماس ورودی"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"انتظار تماس Cdma"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"تماس پایان یافت"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"در انتظار"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"قطع تماس"</string>
@@ -473,7 +394,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"تماس های بی پاسخ"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> تماس بی پاسخ"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"تماس بی پاسخ از <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"تماس فعلی (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"تماس جاری"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"در انتظار"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"تماس ورودی"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"پست صوتی جدید"</string>
@@ -482,13 +403,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"شماره پست صوتی ناشناس"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"بدون سرویس"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"شبکه انتخابی (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) قابل دسترس نیست"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"قطع تماس"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"پاسخ تماس"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"پیام"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"برای برقراری یک تماس، ابتدا حالت هواپیما را خاموش کنید."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"در شبکه ثبت نشده است."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"شبکه تلفن همراه موجود نیست."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"تماس ارسال نشد، هیچ شماره معتبری وارد نشده است."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"تماس ارسال نشد."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"شروع ترتیب MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"راه اندازی رشته کد ویژه"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"سرویس پشتیبانی نشده."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"تغییر وضعیت تماس ها امکان پذیر نیست."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"تفکیک تماس امکان پذیر نیست."</string>
@@ -500,18 +423,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"تماس اضطراری"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"در حال روشن کردن رادیو..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"خارج از منطقه سرویس، در حال امتحان مجدد..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"تماس ارسال نشد، <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> یک شماره اضطراری نیست!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"تماس ارسال نشد، لطفاً یک شماره اضطراری را شماره گیری کنید!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"تماس ارسال نشد. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> یک شماره اضطراری نیست!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"تماس ارسال نشد، لطفاً یک شماره اضطراری را شماره‌گیری کنید!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"استفاده از صفحه کلید برای شماره گیری"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"آهنگ لمس صفحه کلید"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"نگهداشت"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"بازگشت به تماس"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"پایان"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"دکمه های شماره گیری"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"پنهان کردن"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"بلندگو"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"بیصدا"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"بلوتوث"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"افزودن تماس"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"ادغام تماس ها"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"تعویض"</string>
@@ -530,36 +448,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"متن ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"آهنگ های DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"تون‌های DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"تنظیم طول آهنگ های DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"معمولی"</item>
     <item msgid="2883365539347850535">"طولانی"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"پیام شبکه"</string>
+    <string name="network_message" msgid="4483886461245213802">"پیام شبکه"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"فعال کردن گوشی خود"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"برای فعال کردن سرویس گوشی خود، باید یک تماس ویژه برقرار کنید. "\n\n"بعد از فشردن \"فعال سازی\"، به دستورالعمل های ارائه شده جهت فعال کردن گوشی، گوش کنید."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"\"فعال سازی\" را برای برقراری یک تماس ویژه که گوشی شما را در شبکه تلفن همراه شرکت مخابراتی فعال می کند، لمس کنید در این صورت می توانید تماس ها را برقرار کرده و به شبکه های داده ای تلفن همراه متصل شوید."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"از مرحله فعال سازی رد می شوید؟"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"در صورت رد شدن از مرحله فعال سازی، نمی توانید تماسی برقرار کنید یا به شبکه های داده ای تلفن همراه متصل شوید (با این وجود می توانید به شبکه های Wi-Fi متصل شوید). تا زمانی که گوشی خود را فعال نکنید، هر بار که تلفن را روشن می کنید از شما درخواست می شود آنرا فعال کنید."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"رد شدن"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"فعال کردن"</string>
     <string name="ota_activate" msgid="1368528132525626264">"فعال کردن"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"گوشی فعال است!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"تلفن فعال است."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"مشکل در فعال سازی"</string>
     <string name="ota_listen" msgid="162923839877584937">"دستورالعمل های گویا را دنبال کنید تا زمانی که بشنوید فعال سازی انجام شد."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"صفحه کلید"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"بلندگو"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"لطفاً هنگام برنامه ریزی گوشی خود، منتظر بمانید."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"برنامه ریزی ناموفق"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"هنگام برنامه‌ریزی تلفن خود، منتظر بمانید."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"برنامه‌ریزی ناموفق"</string>
     <string name="ota_successful" msgid="1880780692887077407">"گوشی شما در حال حاضر فعال است. راه اندازی سرویس ممکن است 15 دقیقه طول بکشد."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"تلفن شما فعال نشده است. "\n"بهتر است منطقه ای با پوشش بهتر (در نزدیکی پنجره، یا خارج از ساختمان) را پیدا کنید. "\n\n"دوباره امتحان کنید یا برای اطلاع از گزینه های بیشتر، با سرویس مشتری تماس بگیرید."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"تلفن شما فعال نشد. "\n"ممکن است لازم باشد منطقه‌ای با پوشش بهتر (در نزدیکی پنجره، یا خارج از ساختمان) پیدا کنید. "\n\n"دوباره امتحان کنید یا برای اطلاع از گزینه‌های بیشتر، با سرویس مشتری تماس بگیرید."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"خطاهای SPC بسیار زیاد"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"برگشت"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"دوباره امتحان کنید"</string>
     <string name="ota_next" msgid="3904945374358235910">"بعدی"</string>
-    <string name="ota_back" msgid="2190038043403850052">"برگشت"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"حالت پاسخ تماس اضطراری وارد شده"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"حال پاسخ تماس اضطراری"</string>
@@ -569,87 +482,69 @@
     <item quantity="other" msgid="3122217344579273583">"اتصال داده ای به مدت <xliff:g id="COUNT">%s</xliff:g> دقیقه موجود نیست"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"گوشی به مدت <xliff:g id="COUNT">%s</xliff:g> دقیقه در حالت پاسخ تماس اضطراری خواهد بود. هنگامی که در این حالت هستید از هیچ برنامه ای با استفاده از یک اتصال داده ای نمی توانید استفاده کنید. آیا می خواهید اکنون خارج شوید؟"</item>
-    <item quantity="other" msgid="3231879566243957821">"گوشی به مدت <xliff:g id="COUNT">%s</xliff:g> دقیقه در حالت پاسخ تماس اضطراری خواهد بود. هنگامی که در این حالت هستید از هیچ برنامه ای با استفاده از یک اتصال داده ای نمی توانید استفاده کنید. آیا می خواهید اکنون خارج شوید؟"</item>
+    <item quantity="one" msgid="8060210887681426682">"تلفن به مدت <xliff:g id="COUNT">%s</xliff:g> دقیقه در حالت پاسخ به تماس‌های اضطراری خواهد بود. در این حالت برنامه‌هایی که از اتصال داده استفاده می‌کنند قابل استفاده نیستند. آیا می‌خواهید اکنون خارج شوید؟"</item>
+    <item quantity="other" msgid="8617116564023933114">"تلفلن به مدت <xliff:g id="COUNT">%s</xliff:g> دقیقه در حالت پاسخ به تماس‌های اضطراری خواهد بود. در این حالت برنامه‌هایی که از اتصال داده استفاده می‌کنند قابل استفاده نیستند. آیا می‌خواهید اکنون خارج شوید؟"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"در حالت پاسخ تماس اضطراری، عملکرد انتخابی موجود نیست. تلفن به مدت <xliff:g id="COUNT">%s</xliff:g> دقیقه در این حالت خواهد بود. آیا می خواهید اکنون خارج شوید؟"</item>
-    <item quantity="other" msgid="3489076611710869904">"در حالت پاسخ تماس اضطراری، عملکرد انتخابی موجود نیست. تلفن به مدت <xliff:g id="COUNT">%s</xliff:g> دقیقه در این حالت خواهد بود. آیا می خواهید اکنون خارج شوید؟"</item>
+    <item quantity="one" msgid="2585506997024726599">"عملکرد انتخاب شده در حالت پاسخ به تماس اضطراری در دسترس نیست. تلفن مدت <xliff:g id="COUNT">%s</xliff:g> دقیقه در این حالت است. آیا می‌خواهید اکنون خارج شوید؟"</item>
+    <item quantity="other" msgid="6115622137771382224">"عمل انتخاب شده در حالت پاسخ به تماس اضطراری در دسترس نیست. تلفن مدت <xliff:g id="COUNT">%s</xliff:g> دقیقه در این حالت باقی می‌ماند. آیا می‌خواهید اکنون خارج شوید؟"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"در حین یک تماس اضطراری، عملکرد انتخابی موجود نیست"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"خروج از حالت پاسخ تماس اضطراری"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"در حین یک تماس اضطراری، عملکرد انتخابی در دسترس نیست."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"خروج از حالت پاسخ تماس اضطراری"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"بله"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"خیر"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"رد کردن"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"تنظیمات پست صوتی"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;تنظیم نشده&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"سرویس پست صوتی"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"تنظیمات برای <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"سرویس"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"تنظیم"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;تنظیم نشده&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"سایر تنظیمات تماس"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"شماره گیری"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"تماس از طریق ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"برای پاسخگویی به سمت راست بکشید"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"برای بی صدا کردن زنگ، به سمت چپ بکشید"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"برای عدم پذیرش به سمت چپ بکشید"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"برای پاسخگویی به سمت راست بکشید و"\n"تماس فعال را در انتظار نگه دارید"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"برای پاسخگویی به سمت راست بکشید و"\n"به تماس فعال پایان دهید"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"برای پاسخگویی به سمت راست بکشید و"\n"به تماس در حالت انتظار پایان دهید"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"پاسخ"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"عدم پذیرش"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"فراخوانی از طریق <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"عکس مخاطب"</string>
     <string name="goPrivate" msgid="865837794424530980">"برو به خصوصی"</string>
     <string name="selectContact" msgid="781975788478987237">"انتخاب حساب"</string>
     <string name="sip_settings" msgid="6699045718560859691">"تنظیمات تماس اینترنتی"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"حساب های تماس اینترنتی (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"حساب‌ها"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"مدیریت حسابهای تماس اینترنتی (SIP) و وضعیت آنها"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"دریافت تماس های ورودی"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"عمر باتری را کاهش می دهد"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"پیکربندی گزینه های تماس"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"استفاده از تماس اینترنتی"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"استفاده از تماس اینترنتی (فقط Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"برای همه تماس ها وقتی شبکه داده در دسترس است"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"فقط برای تماس های اینترنتی"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"برای هر تماس سؤال شود"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"برای همه تماس ها"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"ثبت خودکار"</string>
-    <string name="call_priority" msgid="8374917577270504387">"تماس خارجی از طریق SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"برقرار کردن تماس"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"استفاده از حساب تماس اینترنتی:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"همیشه برای برقراری تماس های اینترنتی استفاده شود"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"شما می توانید با انتخاب یک حساب دیگر در تنظیمات تماس اینترنتی، با استفاده از تنظیمات تماس حساب تماس اینترنتی را تغییر دهید تا هنگام برقراری تماس به طور پیش فرض استفاده شود"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"می‌توانید حساب تماس اینترنتی را که می‌خواهید به صورت پیش فرض استفاده کنید از تلفن &gt; تنظیمات &gt; تنظیمات تماس اینترنتی&gt; صفحه حساب‌ها، تغییر دهید."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"تماس با تلفن همراه"</string>
     <string name="internet_phone" msgid="1147922660195095810">"تماس اینترنتی"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"حساب تماس اینترنتی وجود ندارد"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"هیچ حساب تماس اینترنتی روی این تلفن وجود ندارد. اکنون یکی اضافه شود؟"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"بر روی این تلفن حساب‌های تماس اینترنتی وجود ندارد. آیا می‌خواهید یک مورد اضافه کنید؟"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"افزودن"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"افزودن حساب"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"حذف حساب"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"حسابهای SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"در حال ذخیره حساب..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"درحال حذف حساب..."</string>
+    <string name="saving_account" msgid="52903398217017954">"در حال ذخیره حساب..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"درحال حذف حساب..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"ذخیره"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"صرفنظر"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"بستن نمایه"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"تأیید"</string>
     <string name="close_profile" msgid="6886968271423155284">"بستن"</string>
-    <string name="primary_account" msgid="2229538308291934245">"اصلی"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"این حساب اصلی من باشد"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"برای تماس های خارج از محدوده استفاده شد"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"تنظیمات پیشرفته"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"حساب اصلی. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"درحال بررسی وضعیت..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"در حال ثبت..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"هنوز درحال تلاش..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"تماس دریافتی موجود نیست"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"ثبت حساب به دلیل عدم وجود اتصال اینترنتی متوقف شد"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"ثبت حساب به دلیل عدم وجود اتصال Wi-Fi متوقف شد"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"ثبت حساب ناموفق بود"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"دریافت تماس ها"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"در حال ثبت..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"هنوز درحال تلاش..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"تماس‌های دریافتی موجود نیست."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"ثبت حساب به دلیل عدم وجود اتصال اینترنتی متوقف شد."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"ثبت حساب به دلیل عدم وجود اتصال Wi-Fi متوقف شد."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"ثبت حساب ناموفق بود."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"در حال دریافت تماس‌ها."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"ثبت حساب ناموفق بود: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>)، بعداً امتحان می‌شود"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"ثبت حساب ناموفق بود: نام کاربری یا گذرواژه نادرست"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"ثبت حساب ناموفق بود: نام سرور را بررسی کنید"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"این حساب هم اکنون توسط <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> درحال استفاده است"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"ثبت حساب ناموفق بود: نام کاربری یا گذرواژه نادرست است."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"ثبت حساب ناموفق: نام سرور را بررسی کنید."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"این حساب اکنون توسط برنامه <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> درحال استفاده است."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"جزئیات حساب SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"جزئیات حساب SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"سرور"</string>
@@ -660,9 +555,6 @@
     <string name="port_title" msgid="5952939408078626657">"شماره درگاه"</string>
     <string name="transport_title" msgid="8253139511847746640">"نوع حمل و نقل"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"ارسال حفظ اتصال"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"ارسال پیامهای حفظ اتصال SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"ثبت خودکار"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"ثبت نمایه به طور خودکار"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"تنظیم به عنوان حساب اصلی"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"برای تماس های خارج از محدوده استفاده شد"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"تنظیمات اختیاری"</string>
@@ -673,12 +565,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;اختیاری&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ جهت نمایش همه لمس کنید"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ جهت پنهان کردن همه لمس کنید"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> لازم است، نباید خالی بماند"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"شماره درگاه باید بین 1000 و 65534 باشد"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ضروری است و نباید خالی بماند."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"شماره درگاه باید بین 1000 و 65534 باشد."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"اتصال اینترنتی وجود ندارد"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"اتصال Wi-Fi وجود ندارد"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"برای برقراری تماس اینترنتی، ابتدا اتصال اینترنت خود را بررسی کنید"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"برای تماس های اینترنتی شما باید به یک شبکه Wi-Fi وصل باشید (از تنظیمات شبکه بی سیم استفاده کنید)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"برای برقراری تماس اینترنتی، ابتدا اتصال اینترنت خود را بررسی کنید."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"برای تماس‌های اینترنتی باید به یک شبکه Wi-Fi وصل باشید (از تنظیمات بی‌سیم و شبکه استفاده کنید)."</string>
     <string name="no_voip" msgid="8901474054537199865">"تماس اینترنتی پشتیبانی نمی شود"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"خودکار"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"همیشه ارسال شود"</string>
@@ -687,7 +579,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"به زودی با شما تماس می گیرم."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"بعداً با شما تماس می گیرم."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"اکنون نمی توانم صحبت کنم. بعداً به من زنگ می زنید؟"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"پیام سفارشی..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"پیام سفارشی"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"پاسخ‌های سریع"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"ویرایش پاسخ‌های سریع"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +597,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"ستاره"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"صفر"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"پوند"</string>
-    <string name="description_search_button" msgid="239929880630534731">"جستجو"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"شماره گیری"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"Backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"تلفن آیفون‌دار فعال شد."</string>
@@ -715,9 +606,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"عدم پذیرش"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"لرزش"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"لرزش"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"زنگ"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"همیشه"</item>
     <item msgid="1595097872875714252">"فقط هنگام ساکت بودن"</item>
     <item msgid="1458182414036878616">"هرگز"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"آهنگ زنگ تلفن"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"ارتعاش هنگام زنگ زدن"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"صداهای پد لمسی شماره‌گیری"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"صدای زنگ"</string>
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 179691ff4..80128ad79 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Salainen numero"</string>
     <string name="payphone" msgid="1931775086311769314">"Puhelinautomaatti"</string>
     <string name="onHold" msgid="9035493194749959955">"Pidossa"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Nykyinen puhelu"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Linja varattu"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Verkko varattu"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Ei vastausta, aikakatkaistiin"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Palvelimeen ei saada yhteyttä"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numeroon ei saada yhteyttä"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Virheellinen käyttäjänimi tai salasana"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Puhelu verkon ulkopuolelta"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Puhelu verkon ulkopuolelta"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Palvelinvirhe. Yritä myöhemmin uudelleen."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Ei signaalia"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-raja ylitetty"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio pois käytöstä"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Ei SIM-korttia tai SIM-korttivirhe"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Ei SIM-korttia tai SIM-korttivirhe"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Katvealue"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Sallitut numerot rajoittavat soitettavia puheluita."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Et voi soittaa puheluita puheluiden eston ollessa käytössä."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Et voi soittaa puheluita puheluiden eston ollessa käytössä."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Käyttörajoitus rajoittaa kaikki puhelut"</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Käyttörajoitus rajoittaa hätäpuhelut."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Käyttörajoitus rajoittaa normaalit puhelut."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Puhelin lukittu seuraavaan käynnistykseen saakka."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Puhelu katkaistu."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Puhelu katkaistu."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: reorder-virhe."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: palveluasetus hylätty."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: retry order -virhe."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: ei käyttöoikeutta."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Ehkäisty."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Vain hätäpuhelut sallittu."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Virheellinen numero"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Virheellinen numero"</string>
     <string name="confCall" msgid="1904840547188336828">"Puhelinneuvottelu"</string>
     <string name="call_lost" msgid="317670617901479594">"Puhelu katkesi."</string>
-    <string name="retry" msgid="8462986804300767852">"Yritä uudelleen"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Puhelu katkesi"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-koodi aloitettu"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-koodi käytössä..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Langalliset kuulokkeet"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Lähetäänkö seuraavat äänet?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Lähetetään ääniä "\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Lähetetään ääniä"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Lähetä"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Kyllä"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Ei"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Korvaa jokerimerkki seuraavalla:"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Muuta jokerimerkiksi"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Puhelinvastaajan numero puuttuu"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"SIM-kortille ei ole tallennettu puhelinvastaajan numeroa."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Lisää numero"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Ladataan…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Poista SIM-kortin lukitus antamalla PIN-koodi."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM-kortin lukitus poistettu"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Uusi SIM-kortin PIN-koodi"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Vahvista antamalla uusi SIM-kortin PIN-koodi uudelleen"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Antamasi SIM-kortin PIN-koodit eivät täsmää. Yritä uudelleen."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Poista SIM-kortin lukitus antamalla PUK-koodi."</string>
-    <string name="badPuk" msgid="3213017898690275965">"Virheellinen PUK-koodi!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Jatka"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"SIM-korttisi esto on purettu. Puhelimen lukitusta poistetaan..."</string>
     <string name="label_ndp" msgid="780479633159517250">"SIM-verkko, PIN-koodin lukituksen poisto"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Poista lukitus"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Pyydetään verkon lukituksen poistoa..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Verkon lukituksen poistopyyntö epäonnistui."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Verkon lukituksen poisto onnistui."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI-koodi"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM-puheluasetukset"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA-puheluasetukset"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Tukiasemien nimet"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Vain CDMA -puhelujen lisäasetukset"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Verkkopalveluasetukset"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Soittajan tunnus"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Ladataan asetuksia..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Numeroa ei näytetä soitetuissa puheluissa"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Numero näytetään soitetuissa puheluissa"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Käytä numeroni näyttämistä soitettavissa puheluissa koskevia operaattorin oletusasetuksia"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Soita, kun numero on varattu:"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Siirretään puhelu numeroon <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Pois käytöstä"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Operaattorisi ei tue puhelujen siirtojen käytöstä poistamista puhelimesi ollessa varattu."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operaattorisi ei tue soitonsiirtojen poistamista käytöstä, kun puhelimesi on varattuna."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Siirrä puhelu, kun numero ei vastaa"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Soita, kun numero ei vastaa:"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Siirretään puhelu numeroon <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Pois käytöstä"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Operaattorisi ei tue puhelujen siirtojen käytöstä poistamista, kun puhelimesi ei vastaa."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operaattorisi ei tue soitonsiirtojen poistamista käytöstä, kun puhelimesi ei vastaa."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Siirrä puhelu, kun numeroon ei saada yhteyttä"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Soita, kun numeroon ei saada yhteyttä:"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Siirretään puhelu numeroon <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Pois käytöstä"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Operaattorisi ei tue puhelujen siirtojen käytöstä poistamista puhelimesi ollessa saavuttamattomissa."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Operaattorisi ei tue soitonsiirtojen poistamista käytöstä puhelimesi ollessa saavuttamattomissa."</string>
     <string name="updating_title" msgid="6146755386174019046">"Puheluasetukset"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Virhe puheluasetuksissa"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Luetaan asetuksia…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Palautetaan asetuksia…"</string>
     <string name="response_error" msgid="6674110501330139405">"Odottamaton vastaus verkosta."</string>
     <string name="exception_error" msgid="7027667130619518211">"Verkko- tai SIM-korttivirhe."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Vain toiminnot sallitut puhelut -numeroihin sallitaan"</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Käynnistä radio ennen näiden asetuksien tarkastelua."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Puhelimesi sovelluksen sallitut numerot -toiminto on käytössä. Osa puheluihin liittyvistä ominaisuuksista ei toimi."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Käynnistä radio ennen näiden asetuksien tarkastelua."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Ota käyttöön"</string>
     <string name="disable" msgid="7274240979164762320">"Poista käytöstä"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Piilota numero"</item>
     <item msgid="1108394741608734023">"Näytä numero"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Tallenna puhelinvastaajan numero"</string>
     <string name="vm_changed" msgid="380744030726254139">"Puhelinvastaajan numero muutettiin."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Puhelinvastaajan numeron vaihtaminen epäonnistui."\n"Ota yhteyttä operaattoriisi, jos ongelma ei ratkea."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Soitonsiirtonumeron vaihtaminen epäonnistui."\n"Ota yhteyttä operaattoriisi, jos ongelma ei ratkea."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Vastaajapalvelun numeron vaihtaminen epäonnistui."\n"Ota yhteyttä operaattoriin, jos ongelma jatkuu."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Soitonsiirtonumeron vaihtaminen epäonnistui."\n"Ota yhteyttä operaattoriin, jos ongelma jatkuu."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Nykyisten soitonsiirtonumeroasetuksien noutaminen ja tallentaminen epäonnistui."\n"Haluatko kuitenkin vaihtaa operaattoria?"</string>
     <string name="no_change" msgid="3186040086622435212">"Muutoksia ei tehty."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Valitse puhelinvastaajapalvelu"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Verkkohaku"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Virhe haettaessa verkkoja."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Rekisteröidään verkkoon <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"SIM-kortti ei anna muodostaa yhteyttä tähän verkkoon."</string>
-    <string name="connect_later" msgid="500090982903469816">"Verkkoon ei saada yhteyttä tällä hetkellä. Yritä myöhemmin uudelleen."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"SIM-kortti ei anna muodostaa yhteyttä tähän verkkoon."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Tähän verkkoon ei saa yhteyttä juuri nyt. Yritä myöhemmin uudelleen."</string>
     <string name="registration_done" msgid="495135664535876612">"Rekisteröity verkkoon."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Valitse verkko-operaattori"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Valitse verkko-operaattori"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Etsi kaikki käytettävissä olevat verkot"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Valitse automaattisesti"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Valitse ensisijainen verkko automaattisesti"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automaattinen rekisteröityminen..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Valitse automaattisesti"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Valitse ensisijainen verkko automaattisesti"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automaattinen rekisteröinti..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Verkkotila"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Vaihda verkon käyttötilaa"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Ensisijainen verkkotila"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Ensisijainen verkkotila: vain EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Ensisijainen verkkotila: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Vain EvDo"</item>
     <item msgid="454610224530856274">"CDMA ilman EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo automaattinen"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA automaattinen"</item>
+    <item msgid="648505122852496166">"Automaattinen CDMA/EvDo"</item>
+    <item msgid="7148247646407324800">"Automaattinen GSM/WCDMA"</item>
     <item msgid="5189164180446264504">"Vain WCDMA"</item>
     <item msgid="5714714953966979187">"Vain GSM"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA ensisijainen"</item>
+    <item msgid="8508331239546115206">"Ensisijaisesti GSM/WCDMA"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Tiedot käytössä"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Verkkoyhteys roaming-tilassa"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Yhdistä verkkoon roaming-tilassa"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Yhdistä verkkoon roaming-tilassa"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Menetit verkkoyhteyden, koska poistuit kotiverkkosi alueelta eikä roaming-tilaa ole otettu käyttöön."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Menetit verkkoyhteyden, koska poistuit kotiverkkosi alueelta eikä tiedonsiirron roaming-tila ole käytössä."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Sallitaanko verkkoyhteys roaming-tilassa? Roaming-maksut saattavat kasvaa suuriksi!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS-asetukset"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA-asetukset"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Tietojen käyttö"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Operaattorin tiedonsiirtokäytäntö"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Nykyisellä jaksolla käytetyt tiedot"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Tietojen käyttöjakso"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Tiedonsiirtonopeuskäytäntö"</string>
@@ -230,7 +206,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ kierrosta valmis"\n"Seuraava jakso alkaa <xliff:g id="USED_1">%2$d</xliff:g> päivän kuluttua (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Tiedonsiirtonopeus vähennetään nopeuteen <xliff:g id="USED">%1$d</xliff:g> kt/s, jos tiedonkäyttöraja ylitetään"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Lisätietoja operaattorisi mobiiliverkon tietojenkäyttökäytännöstä"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Cell Broadcast -tekstiviesti"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Cell Broadcast -tekstiviesti"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Cell Broadcast -tekstiviesti"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Cell Broadcast -tekstiviestit käytössä"</string>
@@ -271,15 +246,6 @@
     <item msgid="1858401628368130638">"korea"</item>
     <item msgid="1933212028684529632">"kiina"</item>
     <item msgid="1908428006803639064">"heprea"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Kielet"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Paikallissää"</string>
@@ -309,9 +275,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Avoimet työpaikat"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Avoimet työpaikat käytössä"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Avoimet työpaikat pois käytöstä"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Lääkäri, terveys ja sairaala"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Lääkäri, terveys ja sairaala käytössä"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Lääkäri, terveys ja sairaala pois käytöstä"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Lääkäri, terveys ja sairaala"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Lääkäri, terveys ja sairaala käytössä"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Lääkäri, terveys ja sairaala pois käytöstä"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Teknologiauutiset"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Teknologiauutiset käytössä"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Teknologiauutiset pois käytöstä"</string>
@@ -326,35 +292,17 @@
     <item msgid="8912042051809329533">"Vain WCDMA"</item>
     <item msgid="8776934131146642662">"Vain GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (ensisijainen: WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Käytä vain 2G-verkkoja"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Säästää akkua"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Valitse järjestelmä"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Vaihda CDMA-roaming-tila"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Vaihda CDMA-roaming-tila"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Valitse järjestelmä"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Vain kotipuhelin"</item>
     <item msgid="1205664026446156265">"Automaattinen"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA-roaming-tila"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Vaihda CDMA-roaming-tila"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA-roaming-tila"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Vain kotiverkot"</item>
-    <item msgid="8174642753290624634">"Yhteisverkot"</item>
-    <item msgid="2241951431403168661">"Kaikki verkot"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA-tilaus"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA-verkkoasetukset"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Ei vielä käytössä!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA-verkkoasetukset"</string>
@@ -363,21 +311,11 @@
     <item msgid="6143696847467859795">"Vain CDMA"</item>
     <item msgid="2683555124647197574">"Vain EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA-tilaus"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Vaihda RUIM/SIM- ja NV-tilojen välillä"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"tilaus"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivoi laite"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Määritä tiedonsiirtopalvelu"</string>
@@ -394,18 +332,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Hallinnoi sallittuja numeroita"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Vaihda PIN-koodi käyttääksesi sallittuja numeroita"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Hallinnoi puhelinnumeroluetteloa"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Voicen tietosuoja"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Voicen tietosuoja"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Ota parannettu tietosuojatila käyttöön"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY-tila"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Ota TTY-tila käyttöön"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY-tila"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Aseta TTY-tila"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Yritä uudelleen automaattisesti"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Ota automaattinen uudelleenyritys -tila käyttöön"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Automaattinen uudelleenyritys"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Ota Automaattinen uudelleenyritys -tila käyttöön"</string>
     <string name="menu_add" msgid="1882023737425114762">"Lisää yhteystieto"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Muokkaa yhteystietoa"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Poista yhteystieto"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Anna PIN2-koodi"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Anna PIN2-koodi"</string>
     <string name="name" msgid="7329028332786872378">"Nimi"</string>
     <string name="number" msgid="7905950798349903858">"Numero"</string>
     <string name="save" msgid="4094274636321939086">"Tallenna"</string>
@@ -418,56 +354,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Poista sallittu numero"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Poistetaan sallittua numeroa…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Sallittu numero poistettu."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Sallittuja numeroita ei päivitetty: antamasi PIN-koodi on virheellinen."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"Sallittua numeroa ei päivitetty: numero ei voi olla yli 20 numeroa pitkä."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Sallittuja numeroita ei päivitetty, koska annoit väärän PIN-koodin."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Sallittuja numeroita ei päivitetty, sillä numerossa voi olla enintään 20 merkkiä."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN-numeroa ei päivitetty. PIN2 on virheellinen tai puhelinnumero hylättiin."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Luetaan SIM-korttia…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM-kortilla ei ole yhteystietoja."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Valitse tuotavat yhteystiedot"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Poista lentokonetila käytöstä, jotta voit tuoda yhteystietoja SIM-kortilta."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Poista lentokonetila käytöstä, niin voit tuoda yhteystietoja SIM-kortilta."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Ota SIM-kortin PIN-koodi käyttöön / poista koodi käytöstä"</string>
     <string name="change_pin" msgid="9174186126330785343">"Vaihda SIM-kortin PIN-koodi"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM-kortin PIN-koodi:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Vanha PIN-koodi"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Uusi PIN-koodi"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Vahvista uusi PIN-koodi"</string>
-    <string name="badPin" msgid="4154316827946559447">"Antamasi vanha PIN-koodi on virheellinen. Yritä uudelleen."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Antamasi PIN-koodit eivät täsmää. Yritä uudelleen."</string>
+    <string name="badPin" msgid="8955102849303984935">"Annoit väärän vanhan PIN-koodin. Yritä uudelleen."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Antamasi PIN-koodit eivät täsmää. Yritä uudelleen."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Anna 4–8-numeroinen PIN-koodi."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Poista SIM-kortin PIN-koodi käytöstä"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Ota SIM-kortin PIN-koodi käyttöön"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Odota…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"SIM-kortin PIN-koodi käytössä"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM-kortin PIN-koodi pois käytöstä"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Antamasi PIN-koodi on virheellinen"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"SIM-kortin PIN-koodin vaihtaminen onnistui"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM-kortin PIN-koodi käytössä."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM-kortin PIN-koodi pois käytöstä."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Annoit väärän PIN-koodin."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"SIM-kortin PIN-koodin vaihtaminen onnistui."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Virheellinen salasana, SIM-kortti lukittu! Anna PUK2-koodi."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Vanha PIN2-koodi"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Uusi PIN2-koodi"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Vahvista uusi PIN2-koodi"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Antamasi PUK2-koodi on virheellinen. Yritä uudelleen."</string>
-    <string name="badPin2" msgid="515218795152422178">"Antamasi vanha PIN2-koodi on virheellinen. Yritä uudelleen."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Antamasi PIN2-koodit eivät täsmää. Yritä uudelleen."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Antamasi PUK2-koodi on virheellinen. Yritä uudelleen."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Antamasi vanha PIN2-koodi on virheellinen. Yritä uudelleen."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Antamasi PIN2-koodit eivät täsmää. Yritä uudelleen."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Anna 4–8-numeroinen PIN2-koodi."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Anna 8-numeroinen PUK2-koodi."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2-koodin vaihtaminen onnistui"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2-koodi vaihdettu."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Anna PUK2-koodi"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Virheellinen salasana, vaihda PIN2-koodi ja yritä uudelleen."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Virheellinen salasana, SIM-kortti lukittu! Anna PUK2-koodi."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Väärä salasana. Vaihda PIN2-koodi ja yritä uudelleen."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Virheellinen salasana, SIM-kortti lukittu. PUK2-koodi tarvitaan."</string>
     <string name="doneButton" msgid="2859593360997984240">"Valmis"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Puhelinneuvottelu <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Palaa puheluun"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Jatka ilman SIM-korttia"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Ei SIM-korttia. Aseta puhelimeen SIM-kortti."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Hylkää"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Poista lukitus"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Varmennetaan PIN-koodia…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Puhelinvastaajan numero"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Soitetaan"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Yritetään uudelleen"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Puhelinneuvottelu"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Uusi puhelu"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"CDMA-puhelu jonossa"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Puhelu loppui"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Pidossa"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Katkaistaan"</string>
@@ -477,7 +407,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Vastaamattomat puhelut"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> vastaamatonta puhelua"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Vastaamatta jäänyt puhelu numerosta <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Nykyinen puhelu (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Käynnissä oleva puhelu"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Pidossa"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Uusi puhelu"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Uusia viestejä vastaajassa"</string>
@@ -486,13 +416,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Puhelinvastaajan numero tuntematon"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Katvealueella"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Valittu verkko (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ei käytettävissä."</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Katkaise puhelu"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Soita takaisin"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Viesti"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Poista lentokonetila käytöstä ennen puhelun soittamista."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ei rekisteröity verkkoon."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobiiliverkko ei käytettävissä."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Puhelua ei soitettu, et antanut kelvollista numeroa."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Puhelua ei soitettu."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Aloitetaan MMI-koodisekvenssiä..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Aloitetaan ominaisuuden koodisekvenssiä..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Palvelua ei tueta."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Puhelujen vaihto epäonnistui."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Puhelun erottaminen epäonnistui."</string>
@@ -504,18 +436,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Hätäpuhelu"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Käynnistetään radiota…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Katvealueella, yritetään uudelleen..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Puhelua ei soitettu, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ei ole hätänumero!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Puhelua ei soitettu, valitse hätänumero!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Puhelua ei soitettu. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ei ole hätänumero!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Puhelua ei soitettu. Valitse hätänumero!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Valitse numero näppäimistöstä"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Kosketa ääninäppäimistöä"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Pitoon"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Poista pidosta"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Loppu"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Näppäimistö"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Piilota"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Kaiutin"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Äänetön"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Lisää puhelu"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Yhdistä puhelut"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Vaihda"</string>
@@ -534,36 +461,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI-teksti"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF-äänet"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF-äänet"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Aseta DTMF-äänien pituus"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normaali"</item>
     <item msgid="2883365539347850535">"Pitkä"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Verkkoviesti"</string>
+    <string name="network_message" msgid="4483886461245213802">"Verkkoviesti"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktivoi puhelin"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Sinun täytyy soittaa erityinen puhelu aktivoidaksesi puhelimesi palvelun. "\n\n"Paina Aktivoi ja aktivoi puhelimesi kuulemiesi ohjeiden avulla."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Voit aktivoida puhelimesi operaattorisi mobiiliverkossa soittaaksesi puheluita ja muodostaaksesi yhteyden mobiiliverkkoihin koskettamalla Aktivoi."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Ohitetaanko aktivointi?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Jos ohitat aktivoinnin, et voi soittaa puheluita etkä muodostaa verkkoyhteyttä (voit tosin muodostaa yhteyden wifi-verkkoihin). Sinua pyydetään aktivoimaan puhelimesi aina kun käynnistät sen siihen saakka, että aktivoit sen."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Ohita"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktivoi"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktivoi"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Puhelin aktivoitu!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Puhelin aktivoitu."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Aktivointiongelma"</string>
     <string name="ota_listen" msgid="162923839877584937">"Kuuntele ohjeita ja toimi niiden mukaan, kunnes aktivointi on valmis."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Näppäimistö"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Kaiutin"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Odota, puhelinta ohjelmoidaan."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Ohjelmointi epäonnistui"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Odota, että puhelinta ohjelmoidaan."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Ohjelmointi epäonnistui"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Puhelimesi on nyt aktivoitu. Palvelun käynnistyminen saattaa kestää korkeintaan 15 minuuttia."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Puhelimesi aktivoiminen epäonnistui."\n"Suosittelemme siirtymään alueelle, jolla signaali on vahvempi (ikkunan lähelle tai ulos)."\n\n"Yritä uudelleen tai soita asiakaspalveluun saadaksesi lisäohjeita."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Puhelimesi aktivoiminen epäonnistui."\n"Suosittelemme siirtymään alueelle, jolla signaali on vahvempi (ikkunan lähelle tai ulos)."\n\n"Yritä uudelleen tai pyydä lisäohjeita asiakaspalvelusta."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"EXCESS SPC -VIRHEET"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Takaisin"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Yritä uudelleen"</string>
     <string name="ota_next" msgid="3904945374358235910">"Seuraava"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Takaisin"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Käytössä hätäpuhelujen takaisinsoittotila"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Hätäpuhelujen takaisinsoittotila"</string>
@@ -573,87 +495,69 @@
     <item quantity="other" msgid="3122217344579273583">"Ei verkkoyhteyttä <xliff:g id="COUNT">%s</xliff:g> minuuttiin"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Puhelin on hätäpuhelujen takaisinsoittotilassa <xliff:g id="COUNT">%s</xliff:g> minuuttia. Puhelimen ollessa tässä tilassa mitään verkkoyhteyttä käyttäviä sovelluksia ei voi käyttää. Haluatko poistua heti?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Puhelin on hätäpuhelujen takaisinsoittotilassa <xliff:g id="COUNT">%s</xliff:g> minuuttia. Puhelimen ollessa tässä tilassa mitään verkkoyhteyttä käyttäviä sovelluksia ei voi käyttää. Haluatko poistua heti?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Puhelin on hätäpuhelujen takaisinsoittotilassa <xliff:g id="COUNT">%s</xliff:g> minuutin ajan. Tässä tilassa datayhteyttä hyödyntäviä sovelluksia ei voi käyttää. Haluatko lopettaa nyt?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Puhelin on hätäpuhelujen takaisinsoittotilassa <xliff:g id="COUNT">%s</xliff:g> minuutin ajan. Tässä tilassa datayhteyttä hyödyntäviä sovelluksia ei voi käyttää. Haluatko lopettaa nyt?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Valittu toiminto ei ole käytettävissä hätäpuhelujen takaisinsoittotilassa. Puhelin on tässä tilassa <xliff:g id="COUNT">%s</xliff:g> minuutin. Haluatko poistua heti?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Valittu toiminto ei ole käytettävissä hätäpuhelujen takaisinsoittotilassa. Puhelin on tässä tilassa <xliff:g id="COUNT">%s</xliff:g> minuuttia. Haluatko poistua heti?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Valittu toiminto ei ole käytettävissä hätäpuhelujen takaisinsoittotilassa. Puhelu pysyy tässä tilassa <xliff:g id="COUNT">%s</xliff:g> minuutin ajan. Haluatko poistua nyt?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Valittu toiminto ei ole käytettävissä hätäpuhelujen takaisinsoittotilassa. Puhelu pysyy tässä tilassa <xliff:g id="COUNT">%s</xliff:g> minuutin ajan. Haluatko poistua nyt?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Valittu toiminto ei ole käytettävissä soitettaessa hätäpuhelua"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Poistutaan hätäpuhelujen takaisinsoittotilasta"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Valittu toiminto ei ole käytettävissä hätäpuhelun aikana"</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Poistutaan hätäpuhelujen takaisinsoittotilasta"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Kyllä"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Ei"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Hylkää"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Puhelinvastaajan asetukset"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;ei asetettu&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Puhelinvastaajapalvelu"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>-asetukset"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Palveluntarjoaja"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Asetukset"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ei asetettu&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Muut puheluasetukset"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Soita"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Soitetaan palvelun ^1"\n<b>"kautta (numero ^2"</b>")"</string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Vastaa vetämällä oikealle"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Hiljennä soittoääni vetämällä vasemmalle"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Kiellä puhelu vetämällä vasemmalle"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Vastaa vetämällä oikealle ja"\n"aseta aktiivinen puhelu pitoon"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Vastaa vetämällä oikealle ja"\n"lopeta aktiivinen puhelu"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Vastaa vetämällä oikealle ja"\n"lopeta pidossa oleva puhelu"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Vastaa"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Hylkää"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Käytetään operaattoria <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"yhteyshenkilön valokuva"</string>
     <string name="goPrivate" msgid="865837794424530980">"muuta yksityiseksi"</string>
     <string name="selectContact" msgid="781975788478987237">"valitse yhteystieto"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Internetpuheluiden asetukset"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Internetpuhelutilit (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Tilit"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Hallinnoi internetpuheluiden (SIP) tilejä ja tilaa"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Vastaanota saapuvia puheluita"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Vähentää akun käyttöikää"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Määritä puheluasetukset"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Käytä internetpuheluita"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Käytä internetpuheluita (vain wifi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Kaikki puhelut, kun verkko on käytettävissä"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Vain internetpuhelut"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Kysy aina"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Kaikki puhelut"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Automaattinen rekisteröityminen"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Lähtevät puhelut SIP:n kautta"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Soita puhelu"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Käytä seuraavaa internetpuhelutiliä:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Käytä aina internetpuheluille"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Puheluasetuksien kautta voit vaihtaa internetpuhelutiliä, jota käytetään oletuksena soitettaessa puheluita, valitsemalla eri tilin internetpuheluasetuksien alta."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Voit muuttaa oletuksena käytettäviä internetpuheluasetuksia valitsemalla Puhelin &gt; Asetukset &gt; Internetpuheluasetukset &gt; Tilit."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Matkapuhelimen puhelu"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Internetpuhelu"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Ei internetpuhelutiliä"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Tällä puhelimella ei ole internetpuhelutilejä. Lisätäänkö tili?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Tällä puhelimella ei ole internetpuhelutilejä. Haluatko lisätä tilin nyt?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Lisää"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Lisää tili"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Poista tili"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP-tilit"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Tallennetaan tiliä..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Poistetaan tiliä..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Tallennetaan tiliä..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Poistetaan tiliä..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Tallenna"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Hylkää"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Sulje profiili"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Sulje"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Ensisijainen"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Aseta tämä ensisijaiseksi tilikseni"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Käytetään lähteviin puheluihin"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Lisäasetukset"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Ensisijainen tili. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Tarkistetaan tilaa..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Rekisteröidään..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Yritetään edelleen..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Ei puheluita"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Tilin rekisteröinti lopetettiin, koska internetyhteys ei ole käytössä"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Tilin rekisteröinti lopetettiin, koska wifi-yhteys ei ole käytössä"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Tilin rekisteröinti epäonnistui"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Puheluiden vastaanottaminen"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Rekisteröidään..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Yritetään edelleen..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Ei saapuvia puheluita"</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Tilin rekisteröinti lopetettiin, koska internetyhteyttä ei ole käytettävissä."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Tilin rekisteröinti lopetettiin, koska wifi-yhteyttä ei ole käytettävissä."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Tilin rekisteröinti epäonnistui."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Puheluiden vastaanottaminen."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Tilin rekisteröinti epäonnistui: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Yritetään myöhemmin uudelleen."</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Tilin rekisteröinti epäonnistui: virheellinen käyttäjänimi tai salasana"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Tilin rekisteröinti epäonnistui: tarkista palvelimen nimi"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Tämä on sovelluksen <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> käytössä oleva tili"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Tilin rekisteröinti epäonnistui: virheellinen käyttäjänimi tai salasana."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Tilin rekisteröinti epäonnistui: tarkista palvelimen nimi."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Tili on tällä hetkellä sovelluksen <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> käytössä."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIP-tilin tiedot"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP-tilin tiedot"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Palvelin"</string>
@@ -664,9 +568,6 @@
     <string name="port_title" msgid="5952939408078626657">"Porttinumero"</string>
     <string name="transport_title" msgid="8253139511847746640">"Kuljetustyyppi"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Lähetä tarkistusviesti"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Lähetä SIP-tarkistusviestejä"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Automaattinen rekisteröityminen"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Rekisteröi profiili automaattisesti"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Aseta ensisijaiseksi tiliksi"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Käytetään lähteviin puheluihin"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Valinnaiset asetukset"</string>
@@ -677,12 +578,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Valinnainen&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Näytä kaikki koskettamalla"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Piilota kaikki koskettamalla"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> vaaditaan, ei voi olla tyhjä"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Porttinumeron tulee olla välillä 1000–65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> on pakollinen, joten se ei voi olla tyhjä."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Porttinumeron tulee olla väliltä 1000–65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Ei internetyhteyttä"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Ei wifi-yhteyttä"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Tarkista internetyhteytesi ennen internetpuhelun soittamista"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Sinulla täytyy olla yhteys wifi-verkkoon soittaaksesi internetpuheluita (käytä Langaton verkko- ja verkkoasetuksia)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Tarkista internetyhteys ennen internetpuhelun soittamista."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Sinulla täytyy olla yhteys wifi-verkkoon soittaaksesi internetpuheluita (käytä Langaton verkko- ja verkkoasetuksia)"</string>
     <string name="no_voip" msgid="8901474054537199865">"Internetpuheluita ei tueta"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automaattinen"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Lähetä aina"</string>
@@ -691,7 +592,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Soitan sinulle heti takaisin."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Soitan sinulle myöhemmin."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"En voi puhua nyt. Soita myöhemmin?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Oma viesti..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Oma viesti"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Pikavastaukset"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Muokkaa pikavastausta"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -709,7 +610,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"tähti"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"nolla"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"punta"</string>
-    <string name="description_search_button" msgid="239929880630534731">"haku"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"soita"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"askelpalautin"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Kaiutin käytössä."</string>
@@ -719,9 +619,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Hylkää"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Värinä"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Värinä"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Soittoääni"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Aina"</item>
     <item msgid="1595097872875714252">"Vain äänettömässä tilassa"</item>
     <item msgid="1458182414036878616">"Ei koskaan"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Puhelimen soittoääni"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Värinä ja soittoääni"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Valintanäppäimien näppäinäänet"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Soittoääni"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 41d48cbb1..7b30feb8e 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Numéro privé"</string>
     <string name="payphone" msgid="1931775086311769314">"Cabine téléphonique"</string>
     <string name="onHold" msgid="9035493194749959955">"En attente"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Appel en cours"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Ligne occupée"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Réseau occupé"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Aucune réponse, délai expiré"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Serveur injoignable"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numéro injoignable"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nom d\'utilisateur ou mot de passe incorrect"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Appel hors réseau"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Appel effectué hors réseau"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Erreur serveur : réessayez plus tard."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Aucun signal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Limite ACM dépassée"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Signal radio désactivé"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Aucune carte SIM ou erreur de carte SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Aucune carte SIM ou erreur de carte SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Hors zone de couverture"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Les appels sortants sont restreints par la liste de numéros autorisés."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Vous ne pouvez pas passer d\'appels sortants tant que l\'interdiction d\'appel est activée."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Vous ne pouvez pas effectuer d\'appels sortants tant que l\'interdiction d\'appel est activée."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Tous les appels sont restreints par un contrôle d\'accès."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Les appels d\'urgence sont restreints par un contrôle d\'accès."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Les appels ordinaires sont restreints par un contrôle d\'accès."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA : téléphone déverrouillé jusqu\'au prochain redémarrage"</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA : appel abandonné"</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA : appel intercepté"</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA : retrier"</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA : rejet de l\'option de service"</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA : nouvelle tentative de tri"</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA : échec de l\'accès."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA : anticipé"</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Services d\'urgence uniquement"</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Numéro incorrect"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Numéro incorrect"</string>
     <string name="confCall" msgid="1904840547188336828">"Conférence tél."</string>
     <string name="call_lost" msgid="317670617901479594">"L\'appel a été perdu."</string>
-    <string name="retry" msgid="8462986804300767852">"Réessayer"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Appel manqué"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Le code IHM a été lancé."</string>
     <string name="ussdRunning" msgid="485588686340541690">"Exécution du code USSD..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Écouteurs filaires"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Envoyer les tonalités suivantes ?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Envoi des tonalités"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Envoi des tonalités"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Envoyer"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Oui"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Non"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Remplacer le caractère générique par"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Remplacer le caractère générique par"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Numéro de messagerie vocale manquant"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Aucun numéro de messagerie vocale n\'est enregistré sur la carte SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Ajouter un numéro"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Chargement..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Saisissez un code PIN pour déverrouiller la carte SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"Carte SIM déverrouillée"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Nouveau code PIN de la carte SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Saisissez une nouvelle fois le nouveau code PIN de la carte SIM pour le confirmer"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Les codes PIN de la carte SIM saisis ne correspondent pas. Veuillez réessayer."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Saisissez la clé PUK pour déverrouiller la carte SIM"</string>
-    <string name="badPuk" msgid="3213017898690275965">"La clé PUK est incorrecte !"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Continuer"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Votre carte SIM a été déverrouillée. Votre téléphone est en cours de déverrouillage..."</string>
     <string name="label_ndp" msgid="780479633159517250">"Code PIN de déblocage du réseau SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Déverrouiller"</string>
@@ -93,15 +72,13 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Demande de déblocage du réseau…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Échec de la demande de déblocage du réseau."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Le réseau a bien été débloqué."</string>
-    <string name="imei" msgid="8552502717594321281">"Code IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Paramètres d\'appel GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Paramètres d\'appel CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Noms des points d\'accès"</string>
     <string name="settings_label" msgid="3876743539816984008">"Paramètres du réseau"</string>
     <string name="voicemail" msgid="8693759337917898954">"Messagerie vocale"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"MV :"</string>
-    <string name="networks" msgid="8873030692174541976">"Opérateur de réseau"</string>
+    <string name="networks" msgid="8873030692174541976">"Opérateurs de réseau"</string>
     <string name="call_settings" msgid="6112441768261754562">"Paramètres d\'appel"</string>
     <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Autres paramètres"</string>
     <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Autres paramètres d\'appel \"GSM uniquement\""</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Autres paramètres d\'appel \"CDMA uniquement\""</string>
     <string name="labelNwService" msgid="4699970172021870983">"Paramètres du service réseau"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Numéro de l\'appelant"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Chargement des paramètres…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Numéro masqué pour les appels sortants"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Numéro affiché pour les appels sortants"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Utiliser les paramètres opérateur pour afficher mon numéro pour les appels sortants"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Numéro de renvoi lorsque la ligne est occupée"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Transfert vers <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Désactivé"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Votre opérateur ne prend pas en charge la désactivation du transfert d\'appel lorsque votre téléphone est occupé."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Votre opérateur ne permet pas la désactivation du transfert d\'appel lorsque votre téléphone est indisponible."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Transf. si sans réponse"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Numéro de renvoi lorsque vous ne répondez pas"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Transfert vers <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Désactivé"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Votre opérateur ne prend pas en charge la désactivation du transfert d\'appel lorsque votre téléphone ne répond pas."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Votre opérateur ne permet pas la désactivation du transfert d\'appel lorsque votre téléphone ne répond pas."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Transférer si injoignable"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Numéro de renvoi si injoignable"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Transfert vers <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Désactivé"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Votre opérateur ne prend pas en charge la désactivation du transfert d\'appel lorsque votre téléphone n\'est pas joignable."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Votre opérateur ne permet pas la désactivation du transfert d\'appel lorsque votre téléphone n\'est pas joignable."</string>
     <string name="updating_title" msgid="6146755386174019046">"Paramètres d\'appel"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Erreur des paramètres d\'appel"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Lecture des paramètres..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Rétablissement des paramètres…"</string>
     <string name="response_error" msgid="6674110501330139405">"Réponse inattendue du réseau"</string>
     <string name="exception_error" msgid="7027667130619518211">"Erreur de réseau ou de carte SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Opérations réservées aux numéros autorisés"</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Veuillez allumer le signal radio avant d\'afficher ces paramètres."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Les numéros autorisés sont activés dans l\'application de votre téléphone. Par conséquent, certaines fonctionnalités d\'appel ne fonctionnent pas."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Activez le signal radio avant d\'afficher ces paramètres."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Activer"</string>
     <string name="disable" msgid="7274240979164762320">"Désactiver"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Masquer le numéro"</item>
     <item msgid="1108394741608734023">"Afficher le numéro"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Enregistrer le numéro de messagerie vocale"</string>
     <string name="vm_changed" msgid="380744030726254139">"Le numéro de messagerie vocale a été modifié."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Échec de la modification du numéro de messagerie vocale."\n"Si le problème persiste, veuillez contacter votre opérateur."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Échec de la modification du numéro de transfert."\n"Si le problème persiste, veuillez contacter votre opérateur."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Impossible de modifier le numéro de la messagerie vocale."\n"Veuillez contacter votre opérateur si le problème persiste."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Impossible de modifier le numéro de transfert."\n"Veuillez contacter votre opérateur si le problème persiste."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Impossible de récupérer et d\'enregistrer les paramètres actuels du numéro de transfert."\n"Voulez-vous tout de même changer de fournisseur ?"</string>
     <string name="no_change" msgid="3186040086622435212">"Aucune modification n\'a été apportée."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Choisissez un service de messagerie vocale."</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Rechercher les réseaux"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Une erreur s\'est produite lors de la recherche de réseaux."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Enregistrement sur <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Votre carte SIM ne vous autorise pas à vous connecter à ce réseau."</string>
-    <string name="connect_later" msgid="500090982903469816">"Impossible de se connecter au réseau pour l\'instant. Veuillez réessayer ultérieurement."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Votre carte SIM ne permet pas de vous connecter à ce réseau."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Impossible de se connecter à ce réseau pour le moment. Veuillez réessayer ultérieurement."</string>
     <string name="registration_done" msgid="495135664535876612">"Enregistré sur le réseau."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Choisir un opérateur de réseau"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Sélectionner un opérateur réseau"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Chercher tous les réseaux disponibles"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Sélection automatique"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Sélectionner automatiquement"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Enregistrement automatique…"</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Sélectionner automatiquement"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Sélectionner automatiquement le réseau préféré"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Enregistrement automatique…"</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Mode réseau"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Changer le mode de fonctionnement du réseau"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Mode réseau préféré"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Mode réseau préféré : EvDo uniquement"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Mode réseau préféré : LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"EvDo uniquement"</item>
     <item msgid="454610224530856274">"CDMA sans EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA/EvDo automatique"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA automatique"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo automatique"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA automatique"</item>
     <item msgid="5189164180446264504">"WCDMA uniquement"</item>
     <item msgid="5714714953966979187">"GSM uniquement"</item>
-    <item msgid="4775796025725908913">"GSM/WCDMA préféré"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA préféré"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Données activées"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Itinérance des données"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Se connecter aux services de données lors de l\'itinérance"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Se connecter aux services de données lors de l\'itinérance"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Vous avez été déconnecté car vous avez quitté votre réseau alors que l\'itinérance des données était désactivée."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Vous avez été déconnecté, car vous avez quitté le réseau domestique et l\'itinérance des données est désactivée."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Autoriser l\'itinérance des données ? Des frais d\'itinérance importants peuvent s\'appliquer !"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Options GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Options CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Consommation des données"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Règles de l\'opérateur en matière de données"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Données utilisées sur la période en cours"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Période d\'utilisation des données"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Règles relatives au taux de transfert des données"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g> ٪ du cycle écoulé"\n"La prochaine période démarre dans <xliff:g id="USED_1">%2$d</xliff:g> jours (<xliff:g id="USED_2">%3$s</xliff:g>)."</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Taux de transfert des données réduit à <xliff:g id="USED">%1$d</xliff:g> Ko/s si le plafond d\'utilisation est dépassé"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Plus d\'informations sur les règles de votre opérateur mobile concernant l\'utilisation des données sur son réseau"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Diffusion cellulaire par SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Diffusion cellulaire par SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Cell Broadcast SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Option \"Diffusion cellulaire par SMS\" activée"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Coréen"</item>
     <item msgid="1933212028684529632">"Chinois"</item>
     <item msgid="1908428006803639064">"Hébreu"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Langues"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Météo locale"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Offres d\'emploi"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Option \"Offres d\'emploi\" activée"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Option \"Offres d\'emploi\" désactivée"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Médecine, services de santé et hôpitaux"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Option \"Médecine, services de santé et hôpitaux\" activée"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Médecine, services de santé et hôpitaux"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Médecine, services de santé et hôpitaux"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Option \"Médecine, services de santé et hôpitaux\" activée"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Option \"Médecine, services de santé et hôpitaux\" désactivée"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Technologies"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Option \"Nouvelles technologies\" activée"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Option \"Technologies\" désactivée"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"WCDMA uniquement"</item>
     <item msgid="8776934131146642662">"GSM uniquement"</item>
     <item msgid="4684679567848300935">"GSM/WCDMA (WCDMA préféré)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Réseau 2G seulement"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Économise la batterie"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Sélection système"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Modifier le mode d\'itinérance CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Modifier le mode d\'itinérance CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sélection système"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Réseaux domestiques uniquement"</item>
     <item msgid="1205664026446156265">"Automatique"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Mode d\'itinérance CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Modifier le mode d\'itinérance CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Mode d\'itinérance CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Réseaux domestiques uniquement"</item>
-    <item msgid="8174642753290624634">"Réseaux affiliés"</item>
-    <item msgid="2241951431403168661">"N\'importe quel réseau"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Abonnement CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Préférences réseau CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Pas encore implémenté"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Préférences réseau CDMA"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"CDMA uniquement"</item>
     <item msgid="2683555124647197574">"EvDo uniquement"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Abonnement CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Basculer entre les cartes RUIM/SIM et NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"abonnement"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activer le périphérique"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurer service données"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Gérer la liste de numéros autorisés"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Modifier le code PIN pour l\'accès aux numéros autorisés"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Gérer la liste des numéros de téléphone"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Confidentialité vocale"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Confidentialité voix"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Activer le mode de confidentialité amélioré"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Mode TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Activer le mode TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Mode TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Définir le mode TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Réessayer automatiquement"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Activer le mode Réessayer automatiquement"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Réessayer automatiquement"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Activer le mode Réessayer automatiquement"</string>
     <string name="menu_add" msgid="1882023737425114762">"Ajouter un contact"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Modifier le contact"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Supprimer le contact"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Saisir le code PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Saisir le code PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Nom"</string>
     <string name="number" msgid="7905950798349903858">"Numéro"</string>
     <string name="save" msgid="4094274636321939086">"Enregistrer"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Supprimer un numéro autorisé"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Suppression du numéro autorisé…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Numéro autorisé supprimé"</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Impossible de mettre à jour le numéro autorisé : le code PIN que vous avez saisi est incorrect."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"Impossible de mettre à jour le numéro autorisé : ce type de numéro ne peut pas comporter plus de 20 chiffres."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Le numéro autorisé n\'a pas été mis à jour, car vous avez saisi un code PIN incorrect."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Le numéro autorisé n\'a pas été mis à jour, car il ne doit pas comporter plus de 20 chiffres."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Le numéro autorisé n\'a pas été mis à jour. Soit le code PIN2 est incorrect, soit le numéro de téléphone a été rejeté."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lecture de la carte SIM…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Aucun contact n\'a été trouvé sur votre carte SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Sélection des contacts à importer"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Pour importer des contacts depuis la carte SIM, veuillez désactiver le mode Avion."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Pour importer des contacts depuis la carte SIM, désactivez tout d\'abord le mode Avion."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Activer/désactiver le code PIN de la carte SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Modifier le code PIN de la carte SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"Code PIN de la carte SIM :"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Ancien code PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Nouveau code PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Confirmer le nouveau code PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"L\'ancien code PIN saisi est incorrect. Veuillez réessayer."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Les codes PIN saisis ne correspondent pas. Veuillez réessayer."</string>
+    <string name="badPin" msgid="8955102849303984935">"L\'ancien code PIN saisi est incorrect. Veuillez réessayer."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Les codes PIN saisis ne correspondent pas. Veuillez réessayer."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Saisissez un code PIN comprenant 4 à 8 chiffres."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Désactiver le code PIN de la carte SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Activer le code PIN de la carte SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Merci de patienter..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"Le code PIN de la carte SIM est activé"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"Code PIN de la carte SIM désactivé"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Le code PIN saisi était incorrect."</string>
-    <string name="pin_changed" msgid="9000716792724195093">"Le code PIN de la carte SIM a bien été modifié."</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"Code PIN de la carte SIM activé."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"Code PIN de la carte SIM désactivé."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Le code PIN saisi est incorrect."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"Modification du code PIN de la carte SIM réussie."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Mot de passe incorrect. La carte SIM est verrouillée ! Clé PUK2 requise."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Ancien code PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nouveau code PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Confirmer le nouveau code PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Le code PIN2 saisi est incorrect. Veuillez réessayer."</string>
-    <string name="badPin2" msgid="515218795152422178">"L\'ancien code PIN2 saisi est incorrect. Veuillez réessayer."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Les codes PIN2 saisis ne correspondent pas. Merci de réessayer."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"La clé PUK2 saisie est incorrecte. Veuillez réessayer."</string>
+    <string name="badPin2" msgid="1041576234483629991">"L\'ancien code PIN2 saisi est incorrect. Veuillez réessayer."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Les codes PIN2 saisis ne correspondent pas. Veuillez réessayer."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Saisissez un code PIN2 comprenant 4 à 8 chiffres."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Saisissez une clé PUK2 à 8 chiffres."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"Le code PIN2 a été modifié."</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"Modification du code PIN2 réussie."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Saisissez la clé PUK2."</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Le mot de passe est incorrect. Veuillez modifier le code PIN2 et réessayez."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Mot de passe incorrect. La carte SIM est verrouillée ! Clé PUK2 requise."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Le mot de passe est incorrect. Veuillez modifier le code PIN2, puis réessayer."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Mot de passe incorrect. Carte SIM verrouillée. Clé PUK2 requise."</string>
     <string name="doneButton" msgid="2859593360997984240">"OK"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Conférence téléphonique à <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Retour à l\'appel"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Continuer sans carte SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Aucune carte SIM n\'a été trouvée. Insérez une carte SIM dans le téléphone."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Rejeter"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Déverrouiller"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Authentification du code PIN..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"N° messagerie vocale"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Appel en cours…"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Nouvelle tentative"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conférence téléphonique"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Appel entrant"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Appel CDMA en attente"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Fin de l\'appel"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"En attente"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Fin de l\'appel.."</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Appels manqués"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> appels manqués"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Appel manqué de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Appel en cours (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Appel en cours"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"En attente"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Appel entrant"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nouveau message vocal"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Numéro de messagerie vocale inconnu"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Aucun service"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Réseau sélectionné (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non disponible"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Raccrocher"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Rappeler"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Message"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Veuillez d\'abord désactiver le mode Avion, afin d\'effectuer un appel."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Non enregistré sur le réseau."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Réseau mobile non disponible"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"L\'appel n\'a pas été effectué. Le numéro composé n\'est pas valide."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"L\'appel n\'a pas été effectué."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Lancement de la séquence IHM..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Lancement de la séquence de codes de service"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Ce service n\'est pas pris en charge."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Impossible de changer d\'appel."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Impossible de dissocier l\'appel"</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Appel d\'urgence"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activation du signal radio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Hors zone de couverture. Nouvelle tentative..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"L\'appel n\'a pas été effectué. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> n\'est pas un numéro d\'urgence !"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"L\'appel n\'a pas été effectué. Veuillez composer un numéro d\'urgence !"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"L\'appel n\'a pas été effectué. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> n\'est pas un numéro d\'urgence !"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Appel non effectué. Veuillez composer un numéro d\'urgence !"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilisez le clavier pour composer un numéro."</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Touches sonores"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"En attente"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Reprendre"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Raccrocher"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Clavier"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Masquer"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Ht. parleur"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Silencieux"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Autre appel"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Fusionner les appels"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Permuter"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Texte ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Tonalités DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Tonalités DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Définir la durée des tonalités DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normales"</item>
     <item msgid="2883365539347850535">"Longues"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Message réseau"</string>
+    <string name="network_message" msgid="4483886461245213802">"Message réseau"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activer votre téléphone"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Vous devez passer un appel spécial pour activer le service de téléphonie. "\n\n"Après avoir appuyé sur \"Activer\", écoutez les instructions qui vous permettront d\'activer votre téléphone."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Touchez Activer pour passer un appel spécial qui activera votre téléphone sur le réseau mobile de votre opérateur. Vous pourrez ensuite téléphoner et vous connecter à des réseaux de données mobiles."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Ignorer l\'activation ?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Si vous poursuivez sans activer votre mobile, vous ne pourrez ni téléphoner, ni vous connecter à des réseaux de données mobiles. La connexion à un réseau Wi-Fi reste possible. Vous serez invité à effectuer l\'activation à chaque démarrage du téléphone."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Ignorer"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Activer"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Activer"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Votre téléphone est activé !"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Votre téléphone est activé"</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problème lors de l\'activation"</string>
     <string name="ota_listen" msgid="162923839877584937">"Suivez les instructions orales jusqu\'au bout de la procédure d\'activation."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Clavier"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Ht. parleur"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Veuillez patienter pendant la programmation de votre téléphone."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Échec de la programmation"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Veuillez patienter pendant la programmation de votre téléphone."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Échec de la programmation."</string>
     <string name="ota_successful" msgid="1880780692887077407">"Votre téléphone est désormais activé. Un délai de 15 minutes peut être nécessaire avant de démarrer le service."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Votre téléphone n\'a pas pu être activé. "\n"Vous devez peut-être vous déplacer vers une zone disposant d\'une meilleure couverture (près d\'une fenêtre ou à l\'extérieur). "\n\n"Réessayez ou appelez le service clientèle pour plus d\'options."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Votre téléphone n\'a pas pu être activé. "\n"Il est possible que vous deviez vous déplacer vers une zone disposant d\'une meilleure couverture (près d\'une fenêtre ou à l\'extérieur)."\n\n"Veuillez réessayer ou appeler le service client pour plus d\'options."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"NOMBRE EXCESSIF D\'ÉCHECS SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Retour"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Réessayer"</string>
     <string name="ota_next" msgid="3904945374358235910">"Suivant"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Précédent"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Mode de rappel d\'urgence activé"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Mode de rappel d\'urgence"</string>
@@ -569,87 +491,72 @@
     <item quantity="other" msgid="3122217344579273583">"Aucune connexion de données pendant <xliff:g id="COUNT">%s</xliff:g> minutes"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Le téléphone sera en mode de rappel d\'urgence pendant <xliff:g id="COUNT">%s</xliff:g> minute. Dans ce mode, aucune application utilisant une connexion de données ne peut être utilisée. Souhaitez-vous quitter ce mode maintenant ?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Le téléphone sera en mode de rappel d\'urgence pendant <xliff:g id="COUNT">%s</xliff:g> minutes. Dans ce mode, aucune application utilisant une connexion de données ne peut être utilisée. Souhaitez-vous quitter ce mode maintenant ?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Le mode de rappel d\'urgence sera actif sur le téléphone pendant <xliff:g id="COUNT">%s</xliff:g> minute. Tant que ce mode est actif, vous ne pouvez utiliser aucune des applications nécessitant une connexion Internet. Voulez-vous quitter maintenant ?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Le mode de rappel d\'urgence sera actif sur le téléphone pendant <xliff:g id="COUNT">%s</xliff:g> minutes. Tant que ce mode est actif, vous ne pouvez utiliser aucune des applications nécessitant une connexion Internet. Voulez-vous quitter maintenant ?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"L\'action sélectionnée n\'est pas disponible lorsque le téléphone est en mode de rappel d\'urgence. Ce mode restera activé pendant <xliff:g id="COUNT">%s</xliff:g> minute. Souhaitez-vous quitter dès maintenant ?"</item>
-    <item quantity="other" msgid="3489076611710869904">"L\'action sélectionnée n\'est pas disponible lorsque le téléphone est en mode de rappel d\'urgence. Ce mode restera activé pendant <xliff:g id="COUNT">%s</xliff:g> minutes. Souhaitez-vous quitter dès maintenant ?"</item>
+    <item quantity="one" msgid="2585506997024726599">"L\'action sélectionnée n\'est pas disponible en mode de rappel d\'urgence. Ce mode sera actif sur le téléphone pendant <xliff:g id="COUNT">%s</xliff:g> minute. Voulez-vous quitter maintenant ?"</item>
+    <item quantity="other" msgid="6115622137771382224">"L\'action sélectionnée n\'est pas disponible en mode de rappel d\'urgence. Ce mode sera actif sur le téléphone pendant <xliff:g id="COUNT">%s</xliff:g> minutes. Voulez-vous quitter maintenant ?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"L\'action sélectionnée n\'est pas disponible pendant un appel d\'urgence."</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Sortie du mode de rappel d\'urgence"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"L\'action sélectionnée n\'est pas disponible pendant un appel d\'urgence."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Sortie du mode de rappel d\'urgence…"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Oui"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Non"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Ignorer"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Messagerie vocale"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;non défini&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Service de messagerie"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Paramètres pour <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Service"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Configuration"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Non défini&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Autres paramètres d\'appel"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Composer"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Appel via ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Déplacer vers la droite pour répondre"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Déplacer vers la gauche pour passer en mode silencieux"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Déplacer vers la gauche pour refuser"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Déplacer vers la droite pour répondre et"\n"mettre l\'appel en cours en attente"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Déplacer vers la droite pour répondre et"\n"terminer l\'appel en cours"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Déplacer vers la droite pour répondre et"\n"terminer l\'appel en attente"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Répondre"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Refuser"</string>
+    <!-- Dialer UI Settings -->
+    <string name="dialer_ui_settings_title">Paramètres du clavier</string>
+    <string name="dialer_ui_settings_summary">Paramètres pour le clavier</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Appel via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"photo du contact"</string>
     <string name="goPrivate" msgid="865837794424530980">"mode privé"</string>
     <string name="selectContact" msgid="781975788478987237">"sélectionner un contact"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Paramètres d\'appel Internet"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Comptes d\'appels Internet (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Comptes"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Gestion des comptes d\'appels Internet (SIP) et de leur état"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Recevoir les appels"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Réduit la durée de vie de la batterie"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Configurer les options d\'appel"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Passer un appel Internet"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Appels Internet (Wi-Fi uniquement)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Pour tous les appels quand un réseau de données est disponible"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Seulement pour les appels Internet"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Demander à chaque fois"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Pour tous les appels"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Enregistrement automatique"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Appel sortant via SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Passer un appel"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Utiliser un compte de téléphonie par Internet :"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Utiliser systématiquement pour passer des appels Internet"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Servez-vous de l\'option Paramètres d\'appels pour changer le compte SIP (appels Internet) que vous utilisez par défaut lorsque vous émettez des appels. Pour ce faire, sélectionnez un autre compte sous Paramètres d\'appels Internet."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Vous pouvez changer le compte à utiliser par défaut pour les appels Internet depuis l\'écran Téléphone &gt; Paramètres &gt; Paramètres d\'appel Internet &gt; Comptes."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Appel de mobile"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Appel par Internet"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Aucun compte de téléphonie par Internet"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Il n\'existe pas de compte de téléphonie par Internet sur ce téléphone. En ajouter un maintenant ?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Aucun compte d\'appels Internet sur ce téléphone. Voulez-vous en ajouter un maintenant ?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Ajouter"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Ajouter un compte"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Supprimer le compte"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Comptes SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Enregistrement du compte..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Suppression du compte..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Enregistrement du compte…"</string>
+    <string name="removing_account" msgid="7183999896088628100">"Suppression du compte…"</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Enregistrer"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Supprimer"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Fermer le profil"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Fermer"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Principal"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Faire de ce compte le compte principal"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Utilisé pour les appels sortants"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Paramètres avancés"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Compte principal. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Vérification de l\'état..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Enregistrement..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Tentative en cours..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Réception d\'appels impossible"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"L\'enregistrement du compte a été interrompu, car il n\'y a pas de connexion Internet."</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"L\'enregistrement du compte a été interrompu car il n\'y a pas de connexion Wi-Fi."</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Échec de l\'enregistrement du compte."</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Réception d\'appels"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Enregistrement en cours…"</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Tentative en cours…"</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Réception d\'appels impossible."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"L\'enregistrement du compte a été interrompu, car il n\'y a pas de connexion Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"La procédure d\'enregistrement du compte a été interrompue, car il n\'existe aucune connexion Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Échec de l\'enregistrement du compte."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Réception d\'appels."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Échec de l\'enregistrement du compte : <xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>. Une nouvelle tentative sera effectuée ultérieurement."</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Échec de l\'enregistrement du compte : nom d\'utilisateur ou mot de passe incorrect."</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Échec de l\'enregistrement du compte : veuillez vérifier le nom du serveur."</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Ce compte est actuellement utilisé par l\'application <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Échec de l\'enregistrement du compte : nom d\'utilisateur ou mot de passe non valide."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Échec de l\'enregistrement du compte : veuillez vérifier le nom du serveur."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Ce compte est actuellement utilisé par l\'application <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Infos du compte SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Détails du compte SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Serveur"</string>
@@ -660,9 +567,6 @@
     <string name="port_title" msgid="5952939408078626657">"N° de port"</string>
     <string name="transport_title" msgid="8253139511847746640">"Type de transport"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Envoyer un keep-alive"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Envoyer des messages keep-alive SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Enregistrement automatique"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Enregistrer le profil automatiquement"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Définir comme compte principal"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Utilisé pour les appels sortants"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Paramètres facultatifs"</string>
@@ -673,12 +577,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Facultatif&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Appuyer ici pour tout afficher"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Appuyer ici pour tout masquer"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> doit obligatoirement être renseigné"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Le numéro de port doit être compris entre 1000 et 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Le champ <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> est obligatoire."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Le numéro de port doit être compris entre 1000 et 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Pas de connexion Internet"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Aucune connexion Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Pour passer un appel Internet, vérifiez tout d\'abord la connexion Internet."</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Les appels Internet exigent une connexion Wi-Fi (celle-ci peut être activée sous Paramètres &gt; Sans fil et réseaux)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Pour effectuer un appel Internet, vérifiez tout d\'abord la connexion Internet."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Les appels Internet nécessitent une connexion Wi-Fi pouvant être activée dans les paramètres \"Sans fil et réseaux\"."</string>
     <string name="no_voip" msgid="8901474054537199865">"Appels Internet non pris en charge"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automatique"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Toujours envoyer"</string>
@@ -687,7 +591,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Je te rappelle tout de suite."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Je t\'appellerai plus tard."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Peux pas parler. On se rappelle ?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Message personnalisé..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Message personnalisé"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Réponses rapides"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Modifier les réponses rapides"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +609,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"étoile"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"zéro"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"dièse"</string>
-    <string name="description_search_button" msgid="239929880630534731">"rechercher"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"composer"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"retour arrière"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Haut-parleur activé"</string>
@@ -715,9 +618,41 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Refuser"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibreur"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibreur"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Sonnerie"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Toujours"</item>
-    <item msgid="1595097872875714252">"En mode silencieux"</item>
+    <item msgid="1595097872875714252">"Uniquement en mode silencieux"</item>
     <item msgid="1458182414036878616">"Jamais"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Sonnerie du téléphone"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Mode Vibreur lorsque le téléphone sonne"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Numérotation sonore"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Sonnerie"</string>
+
+    <!-- Voice quality filter -->
+    <string name="voice_quality_preferences_title">Qualité d\'écoute</string>
+    <string name="voice_quality_summary">Utiliser un filtre audio pour améliorer la qualité d\'écoute</string>
+    <string name="voice_quality_entry_normal">Normal</string>
+    <string name="voice_quality_entry_clear">Claire</string>
+    <string name="voice_quality_entry_crisp">Nette</string>
+    <string name="voice_quality_entry_bright">Vive</string>
+
+    <string name="perm_change_mobile_network">Changer la technologie réseau (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Les applications possédant cette permission peuvent à chaque instant changer entre les technologies 2G et 3G. La 3G est plus rapide, consomme plus de batterie, et peut également vous coûter plus</string>
+    <!-- Noise suppression -->
+    <string name="noise_suppression_title">Suppression du bruit</string>
+    <string name="noise_suppression_summary">Activer la suppression du bruit ambiant pour les appels</string>
+    <!-- End Noise suppression -->
+    <string name="phone_number_label">Mon numéro de téléphone</string>
+    <string name="phone_number_summary">Définir le numéro de téléphone de cet appareil</string>
+    <string name="advanced_setting">Paramètres avancés</string>
+    <string name="keep_proximity_sensor_on">Gardez le capteur de proximité activé</string>
+    <string name="keep_proximity_sensor_on_sum">Ne pas désactiver le capteur de proximité au cours d\'un appel si des écouteurs sont connectés</string>
+    <string name="lockscreen_if_call_ends_with_screenoff">Verrouiller lorsque l\'appel se termine</string>
+    <string name="lockscreen_if_call_ends_with_screenoff_sum">Verrouiller automatiquement l\'écran en fin d\'appel lorsque l\'écran est éteint</string>
+    <string name="vibrate_outgoing">Vibrer sur réponse</string>
+    <string name="vibrate_45">Vibrer régulièrement</string>
+    <string name="vibrate_45_sum">Vibration à la 45ème seconde de chaque minute quand la communication est établie</string>
+    <string name="vibrate_hangup">Vibrer en fin d\'appel</string>
+    <string name="vibrate_call_waiting">Vibrer sur double appel</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f465e568c..6d052592b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"निजी नंबर"</string>
     <string name="payphone" msgid="1931775086311769314">"सशुल्क फ़ोन"</string>
     <string name="onHold" msgid="9035493194749959955">"होल्ड पर"</string>
-    <string name="ongoing" msgid="8300874342848721367">"वर्तमान कॉल"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"लाइन व्यस्त"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"नेटवर्क व्यस्त"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"कोई प्रतिसाद नहीं, समयबाह्य"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"सर्वर पहुंच योग्य नहीं है"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"नंबर पहुंच योग्य नहीं है"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"गलत उपयोगकर्ता नाम या पासवर्ड"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"नेटवर्क के बाहर से कॉल किया गया"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"नेटवर्क के बाहर से कॉल किया गया"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"सर्वर त्रुटि. बाद में पुन: प्रयास करें."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"कोई सिग्नल नहीं"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM सीमा पार हो गई"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"रेडियो बंद"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"सिम नहीं, या सिम त्रुटि"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"कोई सिम नहीं या सिम त्रुटि"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"सेवा क्षेत्र के बाहर"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"आउटगोइंग कॉल FDN द्वारा प्रतिबंधित हैं."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"जब बारिंग चालू हो, तो आप आउटगोइंग कॉल नहीं कर सकते."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"जब कॉल अवरोधन चालू हो, तो आप आउटगोइंग कॉल नहीं कर सकते."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"सभी कॉल पहुंच नियंत्रण द्वारा प्रतिबंधित हैं."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"आपातकालीन कॉल पहुंच नियंत्रण द्वारा प्रतिबंधित किए गए हैं."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"सामान्य कॉल पहुंच नियंत्रण द्वारा प्रतिबंधित हैं."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: बंद-शुरू करने तक फ़ोन लॉक किया गया."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: कॉल ड्रॉप हो गई."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: कॉल बीच में रोकी गई."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: पुनः क्रमित करना."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: सेवा विकल्प अस्वीकृत."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: पुनर्प्रयास क्रम."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: पहुंच विफल."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: पूर्वाधिकृत."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"केवल आपातकालीन कॉल संभव हैं."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"अमान्‍य नंबर"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"अमान्य नंबर"</string>
     <string name="confCall" msgid="1904840547188336828">"कॉन्फ़्रेंस कॉल"</string>
     <string name="call_lost" msgid="317670617901479594">"कॉल कट चुकी है."</string>
-    <string name="retry" msgid="8462986804300767852">"पुन: प्रयास करें"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"कॉल कट गई"</string>
     <string name="ok" msgid="3811371167865772377">"ठीक"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI कोड प्रारंभ किया गया"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD कोड चल रहा है…"</string>
@@ -69,32 +57,21 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"वायर वाला हेडसेट"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"निम्न टोन भेजें?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"प्रेषण टोन"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"भेजने वाली टोन"\n</string>
     <string name="send_button" msgid="4106860097497818751">"भेजें"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"हां"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"नहीं"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"वाइल्ड वर्ण को इससे प्रतिस्थापित करें"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"वाइल्ड वर्ण को इससे बदलें:"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"गुम ध्वनिमेल नंबर"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"सिम कार्ड पर कोई ध्वनिमेल नंबर संग्रहीत नहीं है."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"नंबर जोड़ें"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"लोड हो रहा है..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"सिम कार्ड अनलॉक करने के लिए पिन कोड टाइप करें."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"सिम अनलॉक की गई"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"नया सिम पिन कोड"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"पुष्टि करने के लिए नया सिम पिन कोड पुनः टाइप करें"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"आपके द्वारा टाइप किया गया सिम पिन मेल नहीं खाता है. कृपया पुनः प्रयास करें."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"सिम कार्ड अनलॉक करने के लिए PUK कोड टाइप करें"</string>
-    <string name="badPuk" msgid="3213017898690275965">"गलत PUK कोड!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"जारी रखें"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"आपका सिम कार्ड अनब्लॉक कर दिया गया है. आपका फ़ोन अनलॉक किया जा रहा है..."</string>
     <string name="label_ndp" msgid="780479633159517250">"सिम नेटवर्क अनलॉक पिन"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"अनब्लॉक करें"</string>
-    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"ख़ारिज करें"</string>
+    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"खारिज करें"</string>
     <string name="requesting_unlock" msgid="6412629401033249351">"नेटवर्क अनलॉक के लिए अनुरोध कर रहा है..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"नेटवर्क अनलॉक अनुरोध असफल."</string>
     <string name="unlock_success" msgid="6770085622238180152">"नेटवर्क अनलॉक सफल रहा."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM कॉल सेटिंग"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA कॉल सेटिंग"</string>
     <string name="apn_settings" msgid="9043423184895642077">"पहुंच बिंदु नाम"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"अतिरिक्त केवल CDMA कॉल सेटिंग"</string>
     <string name="labelNwService" msgid="4699970172021870983">"नेटवर्क सेवा सेटिंग"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"कॉलर आईडी"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"सेटिंग लोड हो रही हैं…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"आउटगोइंग कॉल में छुपे नंबर"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"आउटगोइंग कॉल में प्रदर्शित किया गया नंबर"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"आउटगोइंग कॉल में मेरा नंबर दिखाने के लिए डिफ़ॉल्ट ऑपरेटर सेटिंग का उपयोग करें"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"व्यस्त रहते समय नंबर"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g> को अग्रेषित कर रहा है"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"अक्षम की गई"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"आपका फ़ोन व्यस्त होने पर आपका वाहक कॉल अग्रेषण अक्षम करने का समर्थन नहीं करता."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"जब आपका फ़ोन व्यस्त हो, तो आपका ऑपरेटर कॉल अग्रेषण अक्षम करने का समर्थन नहीं करता."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"अनुत्तरित होने पर अग्रेषित करें"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"अनुत्तरित होने पर नंबर"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g> को अग्रेषित कर रहा है"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"अक्षम की गई"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"आपके फ़ोन के उत्तर न देने पर आपका वाहक कॉल अग्रेषण अक्षम करने का समर्थन नहीं करता."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"जब आपका फ़ोन उत्तर न दे, तो आपका ऑपरेटर कॉल अग्रेषण अक्षम करने का समर्थन नहीं करता."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"पहुंच योग्य न होने पर अग्रेषित करें"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"पहुंच योग्य न होने पर नंबर"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"<xliff:g id="PHONENUMBER">{0}</xliff:g> को अग्रेषित कर रहा है"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"अक्षम की गई"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"जब आपका फ़ोन पहुंच योग्य न हो, तो आपका वाहक कॉल-अग्रेषण अक्षम करने का समर्थन नहीं करता."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"जब आपका फ़ोन पहुंच योग्य न हो, तो आपका वाहक कॉल अग्रेषण अक्षम करने का समर्थन नहीं करता."</string>
     <string name="updating_title" msgid="6146755386174019046">"कॉल सेटिंग"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"कॉल सेटिंग त्रुटि"</string>
     <string name="reading_settings" msgid="1920291699287055284">"सेटिंग पढ़ रहा है..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"सेटिंग वापस ला रहा है..."</string>
     <string name="response_error" msgid="6674110501330139405">"नेटवर्क से अनपेक्षित प्रतिसाद."</string>
     <string name="exception_error" msgid="7027667130619518211">"नेटवर्क या सिम कार्ड त्रुटि."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"संचालन की अनुमति केवल फ़िक्स्ड डायलिंग नंबर पर ही है."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"कृपया इन सेटिंग को देखने के पहले रेडियो चालू करें."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"आपके फ़ोन एप्‍लिकेशन की फ़िक्‍स्‍ड डायलिंग नंबर सेटिंग चालू है. इसके परिणामस्‍वरूप, कॉल से संबंधित कुछ सुविधाएं कार्य नहीं कर रही हैं."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"इन सेटिंग को देखने के पहले रेडियो चालू करें."</string>
     <string name="close_dialog" msgid="2365884406356986917">"ठीक"</string>
     <string name="enable" msgid="1059008390636773574">"सक्षम करें"</string>
     <string name="disable" msgid="7274240979164762320">"अक्षम करें"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"नंबर छुपाएं"</item>
     <item msgid="1108394741608734023">"नंबर दिखाएं"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"ध्वनिमेल नंबर सहेजें"</string>
     <string name="vm_changed" msgid="380744030726254139">"ध्वनिमेल नंबर बदला गया."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"ध्वनिमेल नंबर परिवर्तन असफल."\n"यदि यह समस्या बनी रहती है, तो कृपया अपने वाहक से संपर्क करें."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"अग्रेषण नंबर परिवर्तन असफल."\n"यदि यह समस्या बनी रहती है, तो अपने वाहक से संपर्क करें."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"ध्वनिमेल नंबर बदला नहीं जा सका."\n"यदि यह समस्या बनी रहती है, तो अपने वाहक से संपर्क करें."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"अग्रेषण नंबर बदला नहीं जा सका."\n"यदि यह समस्या बनी रहती है, तो अपने वाहक से संपर्क करें."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"वर्तमान अग्रेषण संख्‍या सेटिंग पुनर्प्राप्त नही की जा सकी और सहेजी नहीं जा सकी."\n"किसी भी तरह नए प्रदाता पर स्विच करें?"</string>
     <string name="no_change" msgid="3186040086622435212">"कोई परिवर्तन नहीं किए गए."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"ध्वनिमेल सेवा चुनें"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"नेटवर्क खोजें"</string>
     <string name="network_query_error" msgid="6828516148953325006">"नेटवर्क खोज के दौरान त्रुटि."</string>
     <string name="register_on_network" msgid="9055203954040805084">"<xliff:g id="NETWORK">%s</xliff:g> पर पंजीकरण कर रहा है…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"आपका सिम कार्ड इस नेटवर्क पर कनेक्शन की अनुमति नहीं देता है."</string>
-    <string name="connect_later" msgid="500090982903469816">"इस समय इस नेटवर्क से कनेक्ट करने में असमर्थ. कृपया बाद में पुनः प्रयास करें."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"आपका सिम कार्ड इस नेटवर्क पर कनेक्शन की अनुमति नहीं देता है."</string>
+    <string name="connect_later" msgid="2308119155752343975">"अभी इस नेटवर्क से कनेक्ट नहीं कर सकते. बाद में पुन: प्रयास करें."</string>
     <string name="registration_done" msgid="495135664535876612">"नेटवर्क पर पंजीकृत."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"किसी नेटवर्क ऑपरेटर का चयन करें"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"कोई नेटवर्क ऑपरेटर चुनें"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"सभी उपलब्ध नेटवर्क खोजें"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"स्वचालित रूप से चयन करें"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"पसंदीदा नेटवर्क का स्वचालित रूप से चयन करें"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"स्वचालित पंजीकरण..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"स्वचालित रूप से चुनें"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"पसंदीदा नेटवर्क स्वचालित रूप से चुनें"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"स्वचालित पंजीकरण..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"नेटवर्क मोड"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"नेटवर्क संचालन मोड बदलें"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"पसंदीदा नेटवर्क मोड"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"पसंदीदा नेटवर्क मोड: केवल EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"पसंदीदा नेटवर्क मोड: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"केवल EvDo"</item>
     <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo स्वतः"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA स्वतः"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo स्वतः"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA स्वत:"</item>
     <item msgid="5189164180446264504">"केवल WCDMA"</item>
     <item msgid="5714714953966979187">"केवल GSM"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA पसंदीदा"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA पसंदीदा"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"डेटा सक्षम किया गया"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"डेटा रोमिंग"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"आपने डेटा कनेक्टिविटी खो दी है क्योंकि आपने डेटा रोमिंग बंद रखकर अपना होम नेटवर्क छोड़ दिया."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"आपकी डेटा कनेक्टिविटी खो गई है क्योंकि आप डेटा रोमिंग बंद करके अपने होम नेटवर्क से बाहर आ गए हैं."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"डेटा रोमिंग की अनुमति दें? आपको रोमिंग शुल्‍क लग सकते हैं!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS विकल्प"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA विकल्प"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"डेटा उपयोग"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"वाहक डेटा नीति"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"वर्तमान अवधि में उपयोग किया गया डेटा"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"डेटा उपयोग अवधि"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"डेटा दर नीति"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"चक्र का <xliff:g id="USED_0">%1$d</xliff:g>٪ बीत चुका है"\n"अगली अवधि <xliff:g id="USED_1">%2$d</xliff:g> दिन में आरंभ होगी (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"यदि डेटा उपयोग की सीमा पार होती है, तो डेटा दर <xliff:g id="USED">%1$d</xliff:g> Kb/s तक कम हो जाती है."</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"आपके वाहक की मोबाइल नेटवर्क डेटा उपयोग नीति के बारे में अधिक जानकारी"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"सेल प्रसारण SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"सेल प्रसारण SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"सेल प्रसारण SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"सेल प्रसारण SMS सक्षम किया गया"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"कोरियाई"</item>
     <item msgid="1933212028684529632">"चीनी"</item>
     <item msgid="1908428006803639064">"हिब्रू"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"भाषाएं"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"स्थानीय मौसम"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"रोज़गार के अवसर"</string>
     <string name="eo_enable" msgid="8623559062015685813">"रोज़गार के अवसर सक्षम किए गए"</string>
     <string name="eo_disable" msgid="3863812478090907609">"रोज़गार के अवसर अक्षम किए गए"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"चिकित्सा, स्वास्थ्य और अस्पताल"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"चिकित्सा, स्वास्थ्य और अस्पताल सक्षम किए गए"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"चिकित्सा, स्वास्थ्य और अस्पताल अक्षम किए गए"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"चिकित्सा, स्वास्थ्य और अस्पताल"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"चिकित्सा, स्वास्थ्य और अस्पताल सक्षम"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"चिकित्सा, स्वास्थ्य और अस्पताल अक्षम"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"तकनीकी समाचार"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"तकनीकी समाचार सक्षम किए गए"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"तकनीकी समाचार अक्षम किए गए"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"केवल WCDMA"</item>
     <item msgid="8776934131146642662">"केवल GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA पसंदीदा)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"केवल 2G नेटवर्क का उपयोग करें"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"बैटरी बचाता है"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"सिस्टम चयन"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"cdma रोमिंग मोड बदलें"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA रोमिंग मोड बदलें"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"सिस्टम चयन"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"केवल होम"</item>
     <item msgid="1205664026446156265">"स्वचालित"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA रोमिंग मोड"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"cdma रोमिंग मोड बदलें"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA रोमिंग मोड"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"केवल होम नेटवर्क"</item>
-    <item msgid="8174642753290624634">"संबद्ध नेटवर्क"</item>
-    <item msgid="2241951431403168661">"कोई भी नेटवर्क"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA सदस्यता"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA नेटवर्क प्राथमिकताएं"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"अभी तक लागू नहीं!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA नेटवर्क प्राथमिकताएं"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"केवल CDMA"</item>
     <item msgid="2683555124647197574">"केवल EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA ग्राहकी"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"RUIM/सिम और NV के बीच बदलें"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"ग्राहकी"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/सिम"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"उपकरण सक्रिय करें"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"डेटा सेवा सेट करें"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"फ़िक्स्ड डायलिंग नंबर प्रबंधित करें"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"FDN पहुंच के लिए पिन बदलें"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"फ़ोन नंबर सूची प्रबंधित करें"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"ध्वनि गोपनीयता"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"ध्वनि गोपनीयता"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"उन्नत गोपनीयता मोड सक्षम करें"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY मोड"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"TTY मोड सक्षम करें"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY मोड"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY मोड सेट करें"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"स्वतः पुनर्प्रयास"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"स्वतः पुन: प्रयास मोड सक्षम करें"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"स्वतः पुन: प्रयास"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"स्वतः पुन: प्रयास मोड सक्षम करें"</string>
     <string name="menu_add" msgid="1882023737425114762">"संपर्क जोड़ें"</string>
     <string name="menu_edit" msgid="7143003705504672374">"संपर्क संपादित करें"</string>
     <string name="menu_delete" msgid="3977150783449642851">"संपर्क हटाएं"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"पिन2 दर्ज करें"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"पिन2 लिखें"</string>
     <string name="name" msgid="7329028332786872378">"नाम"</string>
     <string name="number" msgid="7905950798349903858">"नंबर"</string>
     <string name="save" msgid="4094274636321939086">"सहेजें"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"फ़िक्स्ड डायलिंग नंबर हटाएं"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"फ़िक्स्ड डायलिंग नंबर हटा रहा है..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"फ़िक्स्ड डायलिंग नंबर हटाया गया."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN अपडेट नहीं किया गया: आपने गलत पिन दर्ज किया है."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN अपडेट नहीं किया गया: नंबर 20 अंकों से अधिक नहीं हो सकता."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN अपडेट नहीं किया गया था क्योंकि आपने गलत पिन लिखा है."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN अपडेट नहीं था क्योंकि नंबर में 20 से अधिक अंक नहीं हो सकते."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN अपडेट नहीं किया गया था. PIN2 गलत था, या फ़ोन नंबर अस्वीकृत था."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"सिम कार्ड से पढ़ रहा है…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"आपके सिम कार्ड पर कोई संपर्क नहीं है."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"आयात करने के लिए संपर्कों का चयन करें"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"सिम कार्ड से संपर्क आयात करने के लिए, कृपया हवाई जहाज़ मोड बंद करें."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"सिम कार्ड से संपर्क आयात करने के लिए, पहले हवाई जहाज़ मोड बंद करें."</string>
     <string name="enable_pin" msgid="5422767284133234860">"सिम पिन सक्षम/अक्षम करें"</string>
     <string name="change_pin" msgid="9174186126330785343">"सिम पिन बदलें"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"सिम पिन:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"पुराना पिन"</string>
     <string name="newPinLabel" msgid="207488227285336897">"नया पिन"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"नए पिन की पुष्टि करें"</string>
-    <string name="badPin" msgid="4154316827946559447">"आपके द्वारा टाइप किया गया पुराना पिन सही नहीं है. कृपया पुनः प्रयास करें."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"आपके द्वारा दर्ज किया गया पिन मेल नहीं खाता. कृपया पुनः प्रयास करें."</string>
+    <string name="badPin" msgid="8955102849303984935">"आपके द्वारा लिखा गया पुराना पिन सही नहीं है. पुनः प्रयास करें."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"आपके द्वारा लिखे गए पिन का मिलान नहीं होता. पुनः प्रयास करें."</string>
     <string name="invalidPin" msgid="5981171102258684792">"कोई ऐसा पिन लिखें, जिसमें 4 से 8 अंक हों."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"सिम पिन अक्षम करें"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"सिम पिन सक्षम करें"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"कृपया प्रतीक्षा करें..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"सिम पिन सक्षम किया गया"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"सिम पिन अक्षम किया गया"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"आपके द्वारा टाइप किया गया पिन गलत है"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"सिम पिन सफलतापूर्वक बदला गया"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"सिम पिन सक्षम"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"सिम पिन अक्षम"</string>
+    <string name="pin_failed" msgid="2298841192582192277">"आपके द्वारा लिखा गया पिन गलत था."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"सिम पिन सफलतापूर्वक बदला गया."</string>
     <string name="puk_requested" msgid="3898394204193202803">"पासवर्ड गलत, सिम लॉक की गई है! PUK2 का अनुरोध किया गया है."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"पिन2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"पुराना पिन2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"नया पिन2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"नए पिन2 की पुष्टि करें"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"आपके द्वारा टाइप किया गया PUK2 सही नहीं है. कृपया पुनः प्रयास करें."</string>
-    <string name="badPin2" msgid="515218795152422178">"आपके द्वारा टाइप किया गया पुराना पिन2 सही नहीं है. कृपया पुनः प्रयास करें."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"आपके द्वारा दर्ज पिन2 मेल नहीं खाती है. कृपया पुनः प्रयास करें."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"आपके द्वारा लिखा गया PUK2 सही नहीं है. पुनः प्रयास करें."</string>
+    <string name="badPin2" msgid="1041576234483629991">"आपके द्वारा लिखा गया पुराना पिन2 सही नहीं है. पुनः प्रयास करें."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"आपके द्वारा लिखे गए पिन2 का मिलान नहीं होता. पुनः प्रयास करें."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"पिन2 टाइप करें जो 4 से 8 नंबर की हो."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"वह PUK2 टाइप करें जिसमें 8 नंबर हों."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"पिन2 सफलतापूर्वक बदला गया"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"पिन2 सफलतापूर्वक बदला गया"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"PUK2 कोड टाइप करें"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"पासवर्ड गलत, कृपया पिन2 बदलें और पुनः प्रयास करें!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"पासवर्ड गलत, सिम लॉक की गई है! PUK2 का अनुरोध किया गया है."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"पासवर्ड गलत. पिन2 बदलें और पुनः प्रयास करें."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"पासवर्ड गलत है, सिम लॉक हो गया है. PUK2 का अनुरोध किया गया."</string>
     <string name="doneButton" msgid="2859593360997984240">"पूर्ण"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"कॉन्फ़्रेंस कॉल <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"कॉल पर वापस जाएं"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"सिम कार्ड के बिना जारी रखें"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"कोई सिम कार्ड नहीं मिला. कृपया फ़ोन में सिम कार्ड डालें."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"ख़ारिज करें"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"अनलॉक करें"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"पिन प्रमाणीकृत कर रहा है…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ध्‍वनिमेल नबंर"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"डायल कर रहा है"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"पुनः प्रयास कर रहा है"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"कॉन्फ़्रेंस कॉल"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"इनकमिंग कॉल"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Cdma कॉलप्रतीक्षा"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"कॉल समाप्त"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"होल्ड पर"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"बंद कर रहा है"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"छूटी कॉल"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> छूटी कॉल"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> की कॉल छूटी"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"वर्तमान कॉल (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"चल रही कॉल"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"होल्ड पर"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"इनकमिंग कॉल"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"नया ध्वनिमेल"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"ध्वनिमेल नंबर अज्ञात"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"कोई सेवा नहीं"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"चयनित नेटवर्क (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) अनुपलब्ध"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"समाप्त करें"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"वापस कॉल करें"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"संदेश"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"कॉल करने के लिए, पहले विमान मोड बंद करें."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"नेटवर्क पर पंजीकृत नहीं."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"मोबाइल नेटवर्क उपलब्ध नहीं."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"कॉल नहीं भेजी गई, कोई मान्य नंबर दर्ज नहीं किया गया."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"कॉल नहीं भेजी गई."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI अनुक्रम प्रारंभ हो रहा है…"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"सुविधा कोड अनुक्रम प्रारंभ कर रहा है..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"असमर्थित सेवा."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"कॉल स्विच करने में असमर्थ."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"कॉल पृथक करने में असमर्थ."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"आपातकालीन कॉल"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"रेडियो चालू कर रहा है..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"सेवा क्षेत्र के बाहर, पुनः प्रयास कर रहा है..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"कॉल नहीं भेजी गई, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> कोई आपातकालीन नंबर नहीं है!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"कॉल नहीं भेजी गई, कृपया कोई आपातकालीन नंबर डायल करें!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"कॉल नहीं भेजा गया, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> कोई आपातकालीन नंबर नहीं है!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"कॉल नहीं भेजा गया. कोई आपातकालीन नंबर डायल करें!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"डायल करने के लिए कीबोर्ड का उपयोग करें"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"टच टोन कीपैड"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"होल्ड करें"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"अनहोल्ड करें"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"समाप्त"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"डायलपैड"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"छुपाएं"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"स्‍पीकर"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"म्यूट करें"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"कॉल जोड़ें"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"कॉल मर्ज करें"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"स्वैप करें"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI पाठ"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF टोन"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF टोन"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"DTMF टोन की लंबाई सेट करें"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"सामान्य"</item>
     <item msgid="2883365539347850535">"लंबा"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"नेटवर्क संदेश"</string>
+    <string name="network_message" msgid="4483886461245213802">"नेटवर्क संदेश"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"अपना फ़ोन सक्रिय करें"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"आपकी फ़ोन सेवा को सक्रिय करने के लिए एक विशेष कॉल करने की आवश्यकता है. "\n\n"\"सक्रिय करें\" दबाने के बाद, अपने फ़ोन को सक्रिय करने के लिए दिए जाने वाले निर्देश सुनें."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"कोई विशेष कॉल करने के लिए \"सक्रिय करें\" स्पर्श करें, जो आपके फ़ोन को आपके वाहक के मोबाइल नेटवर्क पर सक्रिय कर देता है, ताकि आप कॉल कर सकें और मोबाइल डेटा नेटवर्क से कनेक्ट हो सकें."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"सक्रियण छोड़ें?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"यदि आप सक्रियण छोड़ देते हैं, तो आप कॉल नहीं कर सकते या मोबाइल डेटा नेटवर्क से कनेक्ट (हालांकि आप Wi-Fi नेटवर्क से कनेक्ट हो सकते हैं) नहीं हो सकते हैं. जब तक आप अपने फ़ोन को सक्रिय नहीं करते, आपको प्रत्येक बार उसे चालू करने पर उसे सक्रिय करने के लिए कहा जाएगा."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"छोड़ें"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"सक्रिय करें"</string>
     <string name="ota_activate" msgid="1368528132525626264">"सक्रिय करें"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"फ़ोन सक्रिय किया गया!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"फ़ोन सक्रिय हो गया."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"सक्रियण में समस्या"</string>
     <string name="ota_listen" msgid="162923839877584937">"जब तक आप यह न सुनें कि सक्रियण पूर्ण हो गया है, कहे गए निर्देशों का पालन करें."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"कीपैड"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"स्‍पीकर"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"कृपया आपके फ़ोन को प्रोग्राम किए जाते समय प्रतीक्षा करें."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"प्रोग्रामिंग असफल"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"जब तक आपका फ़ोन प्रोग्राम हो, प्रतीक्षा करें."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"प्रोग्रामिंग विफल"</string>
     <string name="ota_successful" msgid="1880780692887077407">"आपका फ़ोन अब सक्रिय कर दिया गया है. सेवा को आरंभ होने में 15 मिनट तक लग सकते हैं."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"आपका फ़ोन सक्रिय नहीं हुआ. "\n"आपको बेहतर कवरेज वाले किसी क्षेत्र (खिड़की के पास या बाहर) में जाने की जरूरत हो सकती है. "\n\n"पुनः प्रयास करें या अधिक विकल्पों के लिए ग्राहक सेवा को कॉल करें."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"आपका फ़ोन सक्रिय नहीं हुआ. "\n"आपको बेहतर कवरेज वाले किसी क्षेत्र (खिड़की के पास या बाहर) में जाने की आवश्यकता हो सकती है. "\n\n"पुनः प्रयास करें या अधिक विकल्पों के लिए ग्राहक सेवा को कॉल करें."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"अतिरिक्त SPC विफलताएं"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"वापस जाएं"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"पुन: प्रयास करें"</string>
     <string name="ota_next" msgid="3904945374358235910">"अगला"</string>
-    <string name="ota_back" msgid="2190038043403850052">"वापस जाएं"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"आपातकालीन कॉलबैक मोड में प्रविष्ट हुए"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"आपातकालीन कॉलबैक मोड"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"<xliff:g id="COUNT">%s</xliff:g> मिनट के लिए कोई डेटा कनेक्शन नहीं"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"फ़ोन <xliff:g id="COUNT">%s</xliff:g> मिनट के लिए आपातकालीन कॉलबैक मोड में रहेगा. इस मोड में होने पर डेटा कनेक्शन का उपयोग करने वाली किसी भी एप्लिकेशन का उपयोग नहीं किया जा सकता. क्या आप अभी बाहर निकलना चाहते हैं?"</item>
-    <item quantity="other" msgid="3231879566243957821">"फ़ोन <xliff:g id="COUNT">%s</xliff:g> मिनट के लिए आपातकालीन कॉलबैक मोड में रहेगा. इस मोड में रहते समय डेटा कनेक्शन का उपयोग करने वाली किसी भी एप्लिकेशन का उपयोग नहीं किया जा सकता. क्या आप अभी बाहर निकलना चाहते हैं?"</item>
+    <item quantity="one" msgid="8060210887681426682">"फ़ोन <xliff:g id="COUNT">%s</xliff:g> मिनट के लिए आपातकालीन कॉलबैक मोड में रहेगा. हालांकि, इस मोड में होने पर डेटा कनेक्शन का उपयोग करने वाले किसी एप्लिकेशन का उपयोग नहीं किया जा सकता. क्या आप अभी बाहर निकलना चाहते हैं?"</item>
+    <item quantity="other" msgid="8617116564023933114">"फ़ोन <xliff:g id="COUNT">%s</xliff:g> मिनट के लिए आपातकालीन कॉलबैक मोड में रहेगा. हालांकि, इस मोड में होने पर डेटा कनेक्शन का उपयोग करने वाले किसी एप्लिकेशन का उपयोग नहीं किया जा सकता. क्या आप अभी बाहर निकलना चाहते हैं?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"आपातकालीन कॉलबैक मोड में होने पर चयनित क्रिया उपलब्ध नहीं है. फ़ोन <xliff:g id="COUNT">%s</xliff:g> मिनट तक इस मोड में रहेगा. क्या अभी आप बाहर निकलना चाहते हैं?"</item>
-    <item quantity="other" msgid="3489076611710869904">"चयनित क्रिया आपातकालीन कॉलबैक मोड में रहते समय उपलब्ध नहीं है. फ़ोन इस मोड में <xliff:g id="COUNT">%s</xliff:g> मिनट तक रहेगा. क्या आप बाहर निकलना चाहते है?"</item>
+    <item quantity="one" msgid="2585506997024726599">"आपातकालीन कॉलबैक मोड के समय चयनित क्रिया उपलब्ध नहीं है. फ़ोन <xliff:g id="COUNT">%s</xliff:g> मिनट तक इस मोड में रहेगा. क्या आप अभी बाहर निकलना चाहते हैं?"</item>
+    <item quantity="other" msgid="6115622137771382224">"आपातकालीन कॉलबैक मोड के समय चयनित क्रिया उपलब्ध नहीं है. फ़ोन <xliff:g id="COUNT">%s</xliff:g> मिनट तक इस मोड में रहेगा. क्या आप अभी बाहर निकलना चाहते हैं?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"आपातकालीन कॉल में रहते समय चयनित क्रिया उपलब्ध नहीं है"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"आपातकालीन कॉलबैक मोड से बाहर निकल रहा है"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"आपातकालीन कॉल के समय चयनित क्रिया उपलब्ध नहीं होती है."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"आपातकालीन कॉलबैक मोड से बाहर निकल रहा है"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"हां"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"नहीं"</string>
-    <string name="alert_dialog_dismiss" msgid="2491494287075907171">"ख़ारिज करें"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"ध्वनिमेल सेटिंग"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;सेट नहीं है&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"ध्वनिमेल सेवा"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> के लिए सेटिंग"</string>
+    <string name="alert_dialog_dismiss" msgid="2491494287075907171">"खारिज करें"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"सेवा"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"सेटअप"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;सेट नहीं है&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"अन्य कॉल सेटिंग"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"डायल करें"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"^1"\n<b>"^2"</b>" द्वारा कॉल कर रहा है"</string>
-    <string name="slide_to_answer" msgid="255903188611244476">"उत्तर देने के लिए दाएं खींचें"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"रिंगर मौन करने के लिए बाएं खींचें"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"अस्वीकार करने के लिए बाएं खींचें"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"उत्तर देने के लिए दाएं खींचें और सक्रिय कॉल"\n"होल्ड करें"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"उत्तर देने के लिए दाएं खींचें और"\n"सक्रिय कॉल समाप्त करें"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"उत्तर देने के लिए दाएं खींचें और होल्ड पर रखी गई कॉल"\n"समाप्त करें"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"उत्तर दें"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"अस्वीकारें"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> के माध्यम से कॉल किया जा रहा है"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"संपर्क का फ़ोटो"</string>
     <string name="goPrivate" msgid="865837794424530980">"निजी हो जाएं"</string>
     <string name="selectContact" msgid="781975788478987237">"संपर्क का चयन करें"</string>
     <string name="sip_settings" msgid="6699045718560859691">"इंटरनेट कॉल सेटिंग"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"इंटरनेट कॉलिंग (SIP) खाते"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"खाते"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"इंटरनेट कॉलिंग (SIP) खाते और स्थिति प्रबंधित करें"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"इनकमिंग कॉल प्राप्त करें"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"बैटरी का जीवनकाल कम करता है"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"कॉल विकल्प कॉन्फ़िगर करें"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"इंटरनेट कॉलिंग का उपयोग करें"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"इंटरनेट कॉलिंग का उपयोग करें (केवल Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"सभी कॉल के लिए जब डेटा नेटवर्क उपलब्ध हो"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"केवल इंटरनेट कॉल के लिए"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"प्रत्येक कॉल के लिए पूछें"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"सभी कॉल के लिए"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"स्वतः पंजीकरण"</string>
-    <string name="call_priority" msgid="8374917577270504387">"SIP के द्वारा आउटगोइंग कॉल"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"कॉल करें"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"इंटरनेट कॉलिंग खाते का उपयोग करें:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"हमेशा इंटरनेट कॉल करने के लिए उपयोग करें"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"आप इंटरनेट कॉल सेटिंग के अंतर्गत किसी भिन्न खाते का चयन करके, कॉल सेटिंग का उपयोग यह बदलने के लिए कर सकते हैं कि डिफ़ॉल्ट रूप से किस इंटरनेट कॉलिंग खाते का उपयोग कॉल करते समय किया जाए."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"आप परिवर्तित कर सकते हैं कि फ़ोन &gt; सेटिंग &gt; इंटरनेट कॉल सेटिंग &gt; खाता स्क्रीन से डिफ़ॉल्ट रूप से किस इंटरनेट कॉलिंग खाते का उपयोग करना है."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"सेल फ़ोन कॉल"</string>
     <string name="internet_phone" msgid="1147922660195095810">"इंटरनेट कॉल"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"कोई इंटरनेट कॉलिंग खाता नहीं"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"इस फ़ोन पर कोई इंटरनेट कॉलिंग खाते नहीं हैं. खाता जोड़ें?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"इस फ़ोन पर कोई इंटरनेट कॉलिंग खाता नहीं है. क्या आप अभी एक जोड़ना चाहते हैं?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"जोड़ें"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"खाता जोड़ें"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"खाता निकालें"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP खाते"</string>
-    <string name="saving_account" msgid="7468818916695729968">"खाता सहेज रहा है..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"खाता निकाल रहा है..."</string>
+    <string name="saving_account" msgid="52903398217017954">"खाता सहेज रहा है..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"खाता निकाल रहा है..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"सहेजें"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"छोड़ें"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"प्रोफ़ाइल बंद करें"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"ठीक"</string>
     <string name="close_profile" msgid="6886968271423155284">"बंद करें"</string>
-    <string name="primary_account" msgid="2229538308291934245">"प्राथमिक"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"इसे मेरा प्राथमिक खाता बनाएं"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"जावक कॉल के लिए उपयोग किया जाता है"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"उन्नत सेटिंग"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"प्राथमिक खाता. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"स्थिति की जांच कर रहा है..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"पंजीकृत कर रहा है..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"अब भी प्रयास कर रहा है..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"कॉल प्राप्त नहीं कर रहा है"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"खाता पंजीकरण रुक गया क्योंकि कोई इंटरनेट कनेक्शन उपलब्ध नहीं है"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"कोई Wi-Fi कनेक्शन न होने के कारण खाता पंजीकरण रोका गया"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"खाता पंजीकरण विफल"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"कॉल प्राप्त करना"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"पंजीकरण जारी है..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"अब भी प्रयास कर रहा है..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"कॉल प्राप्त नहीं हो रहे."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"खाता पंजीकरण रुक गया क्योंकि कोई इंटरनेट कनेक्शन उपलब्ध नहीं है."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"कोई Wi-Fi कनेक्शन न होने के कारण खाता पंजीकरण रोका गया."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"खाता पंजीकरण विफल."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"कॉल प्राप्त हो रहे हैं"</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"खाता पंजीकरण विफल: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); बाद में पुन: प्रयास किया जाएगा"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"खाता पंजीकरण विफल: गलत उपयोगकर्ता नाम या पासवर्ड"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"खाता पंजीकरण विफल: सर्वर नाम जांचें"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"इस खाते को वर्तमान में <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> एप्लिकेशन द्वारा उपयोग किया जा रहा है"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"खाता पंजीकरण विफल: गलत उपयोगकर्ता नाम या पासवर्ड."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"खाता पंजीकरण विफल: सर्वर नाम जांचें."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"वर्तमान में इस खाते का उपयोग <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> एप्लिकेशन द्वारा किया जा रहा है."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIP खाता विवरण"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP खाता विवरण"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"सर्वर"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"पोर्ट नंबर"</string>
     <string name="transport_title" msgid="8253139511847746640">"परिवहन प्रकार"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"जीवित-रखें भेजें"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"SIP जीवित-रखें संदेश भेजें"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"स्वतः पंजीकरण"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"प्रोफ़ाइल स्वचालित रूप से पंजीकृत करें"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"प्राथमिक खाते के रूप में सेट करें"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"जावक कॉल के लिए उपयोग किया जाता है"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"वैकल्पिक सेटिंग"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;वैकल्पिक&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ सभी दिखाने के लिए स्पर्श करें"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ सभी छुपाने के लिए स्पर्श करें"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> आवश्यक है, रिक्त नहीं छोड़ा जा सकता."</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"पोर्ट नंबर 1000 और 65534 के बीच होना चाहिए"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> आवश्यक है और रिक्त नहीं छोड़ा जा सकता."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"पोर्ट नंबर 1000 और 65534 के बीच होना चाहिए."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"कोई इंटरनेट कनेक्शन नहीं है"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"कोई Wi-Fi कनेक्शन नहीं"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"इंटरनेट कॉल करने के लिए, पहले अपने इंटरनेट कनेक्शन की जांच करें"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"इंटरनेट कॉल के लिए आपको Wi-Fi नेटवर्क से कनेक्ट होना आवश्यक है (वायरलेस और नेटवर्क सेटिंग का उपयोग करें)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"इंटरनेट कॉल करने के लिए, पहले अपने इंटरनेट कनेक्शन की जांच करें."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"इंटरनेट कॉल के लिए आपको Wi-Fi नेटवर्क से कनेक्ट होना आवश्यक है (वायरलेस और नेटवर्क सेटिंग का उपयोग करें)."</string>
     <string name="no_voip" msgid="8901474054537199865">"इंटरनेट कॉलिंग समर्थित नहीं है"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"स्वचालित"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"हमेशा भेजें"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"मैं आपको वापस कॉल करूंगा/करूंगी."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"मैं आपको बाद में कॉल करूंगा/करूंगी."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"अभी बात नहीं हो सकती. बाद में कॉल करें?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"कस्टम संदेश..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"कस्टम संदेश..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"त्वरित प्रतिसाद"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"त्वरित प्रतिसाद संपादित करें"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"तारा"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"शून्‍य"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"पाउंड"</string>
-    <string name="description_search_button" msgid="239929880630534731">"खोजें"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"डायल करें"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"बैकस्पेस"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"स्‍पीकरफ़ोन सक्षम."</string>
@@ -713,11 +613,16 @@
     <string name="description_target_answer" msgid="7205604197797472471">"उत्तर"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"SMS भेजें"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"अस्वीकार करें"</string>
-    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"कंपन"</string>
-    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"कंपन"</string>
+    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"कंपन करें"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"कंपन करें"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"रिंगटोन"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"हमेशा"</item>
     <item msgid="1595097872875714252">"केवल मौन होने पर"</item>
     <item msgid="1458182414036878616">"कभी नहीं"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"फ़ोन रिंगटोन"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"रिंग आने पर कंपन करें"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"डायल पैड स्पर्श टोन"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"रिंगटोन"</string>
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 9f04a35f7..bd16ca9fd 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Privatni broj"</string>
     <string name="payphone" msgid="1931775086311769314">"Telefonska govornica"</string>
     <string name="onHold" msgid="9035493194749959955">"Na čekanju"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Trenutačni poziv"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Linija je zauzeta"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Mreža je zauzeta"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Nema odgovora, privremeno zaustavljeno"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Poslužitelj nedostupan"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Broj je nedostupan"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Netočno korisničko ime ili zaporka"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Poziv izvan mreže"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Poziv izvan mreže"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Pogreška poslužitelja. Pokušajte ponovno kasnije."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Nema signala"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Prekoračeno je ACM ograničenje"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio je isključen"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Nema SIM-a ili SIM ima pogrešku"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Nema SIM-a ili SIM ima pogrešku"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Izvan područja usluge"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Odlazne pozive ograničava FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Ne možete uspostavljati izlazne pozive ako je uključena zabrana poziva."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Ne možete uspostavljati odlazne pozive ako je uključena zabrana poziva."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Sve je pozive ograničila pristupna kontrola."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Hitne pozive ograničila je pristupna kontrola."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Uobičajene pozive ograničila je pristupna kontrola."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Telefon je zaključan sve do ponovnog punjenja."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Poziv je prekinut."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Poziv je presretnut."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: snimač."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Odbačena je opcija usluge."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: ponovi narudžbu."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: pristup nije uspio."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: unaprijed ispražnjeno."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Mogući su samo hitni pozivi."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Nevažeći broj"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Nevažeći broj"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferencijski poziv"</string>
     <string name="call_lost" msgid="317670617901479594">"Poziv je prekinut."</string>
-    <string name="retry" msgid="8462986804300767852">"Pokušaj ponovo"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Poziv je prekinut"</string>
     <string name="ok" msgid="3811371167865772377">"U redu"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Pokrenut je MMI kôd"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Pokrenut je USSD kôd…"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Žičane slušalice"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Poslati sljedeće tonove?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Slanje tonova"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Slanje tonova"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Pošalji"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Da"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Ne"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Zamijeni zamjenski znak s"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Zamijeni zamjenski znak s"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Nedostaje broj govorne pošte"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Na SIM kartici nije spremljen broj govorne pošte."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Dodaj broj"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Učitavanje…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Unesite PIN da biste otključali SIM karticu."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM je otključan"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Novi PIN za SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Za potvrdu ponovno unesite novi PIN za SIM"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"PIN-ovi za SIM koje ste unijeli međusobno se ne podudaraju. Pokušajte ponovno."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Unesite PUK da biste otključali SIM karticu"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Netočan PUK kôd!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Nastavi"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Vaša je SIM kartica odblokirana. Telefon se odblokira…"</string>
     <string name="label_ndp" msgid="780479633159517250">"Mrežni PIN za otključavanje SIM-a"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Otključaj"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Traženje mrežnog otključavanja..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Neuspješan zahtjev za otključavanje mreže."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Mrežno otključavanje bilo je uspješno."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Postavke GSM poziva"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Postavke CDMA poziva"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Nazivi pristupnih točaka"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Dodatne postavke samo za CDMA poziv"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Postavke mrežne usluge"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"ID pozivatelja"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Učitavanje postavki…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Broj je skriven u izlaznim pozivima"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Broj prikazan za izlazne pozive"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Koristiti zadane postavke operatera za prikaz mog broja kod odlaznih poziva"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Broj u slučaju zauzeća"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Preusmjeravanje na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Onemogućeno"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Vaš mobilni operater ne podržava onemogućavanje preusmjeravanja poziva ako je vaš telefon zauzet."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Vaš mobilni operater ne podržava onemogućavanje preusmjeravanja poziva ako je vaš telefon zauzet."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Preusmjeri u slučaju ako nema odgovora"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Broj ako nema odgovora"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Preusmjeravanje na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Onemogućeno"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Vaš mobilni operater ne podržava onemogućavanje preusmjeravanja poziva ako se na vaš telefon nitko ne javi."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Vaš mobilni operater ne podržava onemogućavanje preusmjeravanja poziva ako se na vaš telefon nitko ne javi."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Preusmjeri ako nije dostupno"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Broj u slučaju nedostupnosti"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Preusmjeravanje na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Onemogućeno"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Vaš mobilni operater ne podržava onemogućavanje preusmjeravanja poziva ako je vaš telefon nedostupan."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Vaš mobilni operater ne podržava onemogućavanje preusmjeravanja poziva ako je vaš telefon nedostupan."</string>
     <string name="updating_title" msgid="6146755386174019046">"Postavke poziva"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Pogreška postavki poziva"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Postavke čitanja..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Povrat postavki…"</string>
     <string name="response_error" msgid="6674110501330139405">"Neočekivan mrežni odgovor."</string>
     <string name="exception_error" msgid="7027667130619518211">"Pogreška mreže ili SIM kartice."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Operacije su omogućene samo za brojeve za fiksno biranje."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Uključite radio prije pregleda ovih postavki."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Uključena je postavka fiksnog biranja u aplikaciji telefona. Zbog toga ne rade neke značajke u vezi s pozivima."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Uključite radio prije pregleda ovih postavki."</string>
     <string name="close_dialog" msgid="2365884406356986917">"U redu"</string>
     <string name="enable" msgid="1059008390636773574">"Omogući"</string>
     <string name="disable" msgid="7274240979164762320">"Onemogući"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Sakrij broj"</item>
     <item msgid="1108394741608734023">"Prikaži broj"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Spremi broj govorne pošte"</string>
     <string name="vm_changed" msgid="380744030726254139">"Broj govorne pošte je promijenjen."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Promjena broja govorne pošte bila je neuspješna."\n"Kontaktirajte mobilnog operatera ako se taj problem ne riješi."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Preusmjeravanje broja govorne pošte bilo je neuspješno."\n"Kontaktirajte mobilnog operatera ako se taj problem ne riješi."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Nije bilo moguće promijeniti broj govorne pošte."\n"Obratite se mobilnom operateru ako problem potraje."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Nije bilo moguće promijeniti broj za preusmjeravanje."\n"Obratite se mobilnom operateru ako problem potraje."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Dohvaćanje i spremanje trenutačnih postavki broja za prosljeđivanje nije uspjelo."\n"Želite li se ipak prebaciti na novog davatelja usluge?"</string>
     <string name="no_change" msgid="3186040086622435212">"Nisu izvršene nikakve promjene."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Odaberite uslugu govorne pošte"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Pretraži mreže"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Pogreška tijekom pretraživanja mreža."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Prijava na <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Vaša SIM kartica ne dopušta povezivanje s ovom mrežom."</string>
-    <string name="connect_later" msgid="500090982903469816">"Trenutačno se nije moguće povezati na ovu mrežu. Pokušajte ponovo kasnije."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Vaša SIM kartica ne dopušta povezivanje s ovom mrežom."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Povezivanje s tom mrežom trenutačno nije moguće. Pokušajte kasnije."</string>
     <string name="registration_done" msgid="495135664535876612">"Registrirano na mreži."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Odaberite mrežnog operatera"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Odaberite mrežnog operatera"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Pretraži sve dostupne mreže"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Odaberi automatski"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Automatski odaberi željenu mrežu"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automatska prijava..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Odaberi automatski"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Automatski odabir željene mreže"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automatska prijava…"</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Način mreže"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Promijenite način rada mreže"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Način željene mreže"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Način željene mreže: Samo EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Način željene mreže: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Samo EvDo"</item>
     <item msgid="454610224530856274">"CDMA sa/bez EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo automatski"</item>
-    <item msgid="8595462903294812666">"Automatski GSM/WCDMA"</item>
+    <item msgid="648505122852496166">"Automatski CDMA/EvDo"</item>
+    <item msgid="7148247646407324800">"Automatski GSM/WCDMA"</item>
     <item msgid="5189164180446264504">"Samo WCDMA"</item>
     <item msgid="5714714953966979187">"Samo GSM"</item>
-    <item msgid="4775796025725908913">"Preporučeno GSM/WCDMA"</item>
+    <item msgid="8508331239546115206">"Preporučeno GSM/WCDMA"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Podaci su omogućeni"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Roaming podataka"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Poveži se s podatkovnim uslugama u roamingu"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Poveži se s podatkovnim uslugama u roamingu"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Izgubili ste podatkovnu vezu jer ste isključili mrežni roaming podataka."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Izgubili ste podatkovnu vezu jer ste izašli iz matične mreže s isključenim roamingom podataka."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Omogućiti roaming podataka? Može doći do znatno većih troškova za roaming!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Opcije za GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA opcije"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Korištenje podataka"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Pravila mobilnog operatera za podatke"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Podaci korišteni za trenutačno razdoblje"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Razdoblje korištenja podataka"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Pravilo za brzinu prijenosa podataka"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Proteklo je <xliff:g id="USED_0">%1$d</xliff:g>٪ ciklusa"\n"Sljedeće razdoblje počinje za ovoliko dana: <xliff:g id="USED_1">%2$d</xliff:g> (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Brzina prijenosa podatak smanjena je na <xliff:g id="USED">%1$d</xliff:g> Kb/s ako se prekorači ograničenje korištenja podataka"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Više informacija o pravilima korištenja mobilne podatkovne mreže vašeg davatelja mobilne usluge"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS iz mobilne mreže"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS iz mobilne mreže"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS iz mobilne mreže"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Omogućen je SMS iz mobilne mreže"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"korejski"</item>
     <item msgid="1933212028684529632">"kineski"</item>
     <item msgid="1908428006803639064">"hebrejski"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Jezici"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Lokalna vremenska prognoza"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Prilike za zapošljavanje"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Omogućene su Prilike za zapošljavanje"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Onemogućene su Prilike za zapošljavanje"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Zdravstvo, zdravlje i bolnice"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Omogućeno je zdravstvo, zdravlje i bolnice"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Onemogućeno je zdravstvo, zdravlje i bolnice"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Zdravstvo, zdravlje i bolnice"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Omogućeno je zdravstvo, zdravlje i bolnice"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Onemogućeno je zdravstvo, zdravlje i bolnice"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Vijesti iz tehnologije"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Omogućene su vijesti iz tehnologije"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Vijesti iz tehnologije su onemogućene"</string>
@@ -322,30 +288,17 @@
     <item msgid="8912042051809329533">"Samo WCDMA"</item>
     <item msgid="8776934131146642662">"Samo GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (preporučeno WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Koristi samo 2G mreže"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Štedi bateriju"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Odabir sustava"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Promijeni način rada CDMA roaminga"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Promijeni način rada CDMA roaminga"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Odabir sustava"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Samo matično"</item>
     <item msgid="1205664026446156265">"Automatski"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Način CDMA roaminga"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Promijeni način rada CDMA roaminga"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Način CDMA roaminga"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Samo kućne mreže"</item>
-    <item msgid="8174642753290624634">"Pridružene mreže"</item>
-    <item msgid="2241951431403168661">"Bilo koja mreža"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA pretplata"</string>
   <string-array name="cdma_roaming_mode_values">
     <item msgid="2549203161367380954">"0"</item>
     <item msgid="6007798728227141997">"1"</item>
@@ -359,21 +312,11 @@
     <item msgid="6143696847467859795">"Samo CDMA"</item>
     <item msgid="2683555124647197574">"Samo EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA pretplata"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Izmjenjivanje među RUIM/SIM i NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"pretplata"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivacija uređaja"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Postavljanje podatkovne usluge"</string>
@@ -390,18 +333,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Upravljanje brojeva za fiksno biranje"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Promijeni PIN za FDN pristup"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Upravljaj popisom telefonskih brojeva"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Privatnost za glasovnu uslugu"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Privatnost za glasovnu uslugu"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Omogući poboljšani način privatnosti"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Način TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Omogući TTY način"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Način TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Postavi način TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Automatski pokušaj ponovo"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Omogući automatski ponovni pokušaj"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Automatski ponovni pokušaj"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Omogući način automatskog ponovnog pokušaja"</string>
     <string name="menu_add" msgid="1882023737425114762">"Dodaj kontakt"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Uredi kontakt"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Izbriši kontakt"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Unesite PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Upišite PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Ime"</string>
     <string name="number" msgid="7905950798349903858">"Broj"</string>
     <string name="save" msgid="4094274636321939086">"Spremi"</string>
@@ -414,56 +355,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Izbriši broj za fiksno biranje"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Brisanje broja za fiksno biranje…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Izbrisan je broj za fiksno biranje."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN nije ažuriran: unijeli ste netočan PIN."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN nije ažuriran: broj ne može premašivati 20 znamenaka."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN nije ažuriran jer ste upisali pogrešan PIN."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN nije ažuriran jer broj ne može premašivati 20 znamenki."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN nije ažuriran. PIN2 nije točan ili je telefonski broj odbijen."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Čitanje sa SIM kartice…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Nema kontakata na vašoj SIM kartici."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Odaberite kontakte za uvoz"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Za uvoz kontakata sa SIM kartice isključite način rada u zrakoplovu."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Za uvoz kontakata sa SIM kartice prvo isključite način rada u zrakoplovu."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Omogući/onemogući PIN za SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Promijeni PIN za SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN za SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Stari PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Novi PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Potvrdi novi PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Stari PIN koji ste unijeli nije točan. Pokušajte ponovo."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"PIN-ovi koje ste unijeli međusobno se ne podudaraju. Pokušajte ponovno."</string>
+    <string name="badPin" msgid="8955102849303984935">"Stari PIN koji ste unijeli nije točan. Pokušajte ponovo."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"PIN-ovi koje ste unijeli međusobno se ne podudaraju. Pokušajte ponovo."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Unesite PIN koji ima od 4 do 8 brojeva."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Onemogući SIM PIN"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Omogući PIN za SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Pričekajte…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"Omogućen je PIN za SIM"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"Onemogućen je PIN za SIM"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"PIN koji ste unijeli nije točan"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"Uspješno je promijenjen PIN SIM-a"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"Omogućen je PIN za SIM."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"Onemogućen je PIN za SIM."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"PIN koji ste unijeli nije točan."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"Uspješno je promijenjen PIN SIM-a."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Zaporka nije točna, SIM je zaključan! PUK2 zatražen."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Stari PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Novi PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Potvrdi novi PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"PUK2 koji ste unijeli nije točan. Pokušajte ponovo."</string>
-    <string name="badPin2" msgid="515218795152422178">"Stari PIN2 koji ste unijeli nije točan. Pokušajte ponovo."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Unosi za PIN2 koje ste unijeli međusobno se ne podudaraju. Pokušajte ponovno."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"PUK2 koji ste unijeli nije točan. Pokušajte ponovo."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Stari PIN2 koji ste unijeli nije točan. Pokušajte ponovo."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Vaši unosi za PIN2 međusobno se ne podudaraju. Pokušajte ponovo."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Unesite PIN2 koji ima 4-8 brojeva."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Unesite PUK2 koji ima 8 brojeva."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"Uspješno je promijenjen PIN2"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 uspješno je promijenjen."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Unesite PUK2 kôd"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Zaporka nije točna, zamijenite PIN2 i pokušajte ponovo!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Zaporka nije točna, SIM je zaključan! PUK2 zatražen."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Zaporka nije točna. Promijenite PIN2 i pokušajte ponovo."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Zaporka nije točna, SIM je zaključan. Zatražen je PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Gotovo"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferencijski poziv <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Natrag na poziv"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Nastavi bez SIM kartice"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Nije pronađena SIM kartica. Umetnite SIM karticu u telefon."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Odbaci"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Otključaj"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Autentikacija PIN-a…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Broj govorne pošte"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Biranje broja"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Ponovni pokušaj"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferencijski poziv"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Dolazni poziv"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Čekanje na cdma poziv"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Poziv je završio"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Na čekanju"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Prekidanje veze"</string>
@@ -473,7 +408,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Propušteni pozivi"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Broj propuštenih poziva: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Propušten poziv kontakta <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Trenutačni poziv (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Poziv u tijeku"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Na čekanju"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Dolazni poziv"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nova govorna pošta"</string>
@@ -482,13 +417,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nepoznat je broj govorne pošte"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nema usluge"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Odabrana mreža (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) je onemogućena"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Prekini vezu"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Povratni poziv"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Poruka"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Da biste uspostavili poziv, prvo isključite način rada u zrakoplovu."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nije registrirano na mreži."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilna mreža nije dostupna."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Poziv nije uspostavljen, nije unijet valjani broj."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Poziv nije poslan."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Pokretanje MMI sekvence…"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Pokretanje sekvence značajke koda…"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nepodržana usluga."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Nije moguće prebaciti pozive."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Nije moguće odvojiti poziv."</string>
@@ -500,18 +437,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Hitan poziv"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Uključivanje radija…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Izvan područja usluge, ponovni pokušaj..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Poziv nije uspostavljen, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nije broj za hitne pozive!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Poziv nije poslan, birajte hitan poziv!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Poziv nije upućen. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nije broj za hitne pozive!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Poziv nije upućen. Birajte broj hitne službe!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Birajte pomoću tipkovnice"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Tipkovnica za dodirni zvuk"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Na čekanju"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Više nije na čekanju"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Kraj"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Površina za biranje brojeva"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Sakrij"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Zvučnik"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Isključi zvuk"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Dodaj poziv"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Spoji pozive"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Zamijeni"</string>
@@ -530,36 +462,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI tekst"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF tonovi"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF tonovi"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Postavite duljinu DTMF tonova"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normalni"</item>
     <item msgid="2883365539347850535">"Dugo"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Mrežna poruka"</string>
+    <string name="network_message" msgid="4483886461245213802">"Mrežna poruka"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktivirajte svoj telefon"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Poseban poziv upućen je za aktiviranje telefonske usluge. "\n\n"Nakon što pritisnete “Aktiviraj”, poslušajte upute za aktiviranje telefona."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Dodirnite “Aktiviraj” da biste uputili poseban poziv koji aktivira vaš telefon na mobilnoj mreži vašeg mobilnog operatera kako biste mogli pozivati i povezivati se s mrežama za podatkovne mreže."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Preskoči aktivaciju?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ako preskočite aktivaciju, ne možete pozivati niti se povezivati na mobilne podatkovne mreže (premda se možete prijaviti na Wi-Fi mreže).Sve dok ne aktivirate telefon prikazivat će se upit za aktiviranje kod svakog prijavljivanja."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Preskoči"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktiviraj"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktiviraj"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Telefon je aktiviran!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefon je aktiviran."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problem s aktivacijom"</string>
     <string name="ota_listen" msgid="162923839877584937">"Slijedite govorne upute sve dok ne čujete da je aktivacija dovršena."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Tipkovnica"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Zvučnik"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Pričekajte dok se ne završi programiranje vašeg telefona."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Neuspješno programiranje"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Pričekajte dok ne završi programiranje vašeg telefona."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Neuspješno programiranje"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Vaš telefon nije aktiviran. Pokretanje usluge može potrajati i do 15 minuta."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Vaš se telefon nije aktivirao. "\n"Možda biste trebali potražiti područje s boljom pokrivenošću (pored prozora ili vani). "\n\n"Pokušajte ponovo ili nazovite korisničku službu za više opcija."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Vaš se telefon nije aktivirao. "\n"Možda biste trebali potražiti područje s boljom pokrivenošću (pored prozora ili vani). "\n\n"Pokušajte ponovo ili nazovite korisničku službu za više opcija."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"KVAR PRETJERANOG SPC-a"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Natrag"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Pokušajte ponovo"</string>
     <string name="ota_next" msgid="3904945374358235910">"Dalje"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Natrag"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Unijet je način hitnog povratnog poziva"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Način hitnog povratnog poziva"</string>
@@ -569,87 +496,69 @@
     <item quantity="other" msgid="3122217344579273583">"Nema podatkovne veze <xliff:g id="COUNT">%s</xliff:g> min"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Telefon će biti u načinu hitnog poziva <xliff:g id="COUNT">%s</xliff:g> min. U tom načinu ne mogu se koristiti aplikacije koje koriste podatkovnu vezu. Želite li odmah izaći?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Telefon će biti u načinu hitnog poziva <xliff:g id="COUNT">%s</xliff:g> min. U tom načinu ne mogu se koristiti aplikacije koje koriste podatkovnu vezu. Želite li odmah izaći?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Telefon će biti u načinu rada hitnog povratnog poziva <xliff:g id="COUNT">%s</xliff:g> min. Za to se vrijeme ne može upotrebljavati nijedna aplikacija kojoj je potrebna podatkovna veza. Želite li izaći sada?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Telefon će biti u načinu rada hitnog povratnog poziva <xliff:g id="COUNT">%s</xliff:g> min. Za to se vrijeme ne može upotrebljavati nijedna aplikacija kojoj je potrebna podatkovna veza. Želite li izaći sada?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Odabrana radnja nije dostupna tijekom načina hitnog povratnog poziva. Telefon će u tom načinu biti <xliff:g id="COUNT">%s</xliff:g> min. Želite li izaći odmah?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Odabrana radnja nije dostupna tijekom načina hitnog povratnog poziva. Telefon će u tom načinu biti <xliff:g id="COUNT">%s</xliff:g> min. Želite li izaći odmah?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Odabrana radnja nije dostupna u načinu rada hitnog povratnog poziva. Telefon će biti u tom načinu rada <xliff:g id="COUNT">%s</xliff:g> min. Želite li izaći sada?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Odabrana radnja nije dostupna u načinu rada hitnog povratnog poziva. Telefon će biti u tom načinu rada <xliff:g id="COUNT">%s</xliff:g> min. Želite li izaći sada?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Odabrana radnja nije dostupna tijekom hitnog poziva"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Izlaz iz načina hitnog povratnog poziva"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Odabrana radnja nije dostupna tijekom hitnog poziva."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Izlaz iz načina hitnog povratnog poziva"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Da"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Ne"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Odbaci"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Postavke govorne pošte"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;nije postavljeno&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Usluga govorne pošte"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Postavke za <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Usluga"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Postavljanje"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nije postavljeno&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Ostale postavke poziva"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Biraj"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Pozivanje preko usluge ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Povucite udesno za odgovor"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Povucite ulijevo za utišavanje zvona"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Povucite ulijevo za odbijanje"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Povucite udesno za odgovor i"\n"zadržavanje aktivnog poziva"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Povucite udesno za odgovor i"\n"završavanje aktivnog poziva"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Povucite udesno za odgovor i"\n"završetak poziva na čekanju"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Odgovor"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Odbaci"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Pozivanje putem operatera <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"kontakt fotografija"</string>
     <string name="goPrivate" msgid="865837794424530980">"na privatno"</string>
     <string name="selectContact" msgid="781975788478987237">"odabir kontakta"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Postavke internetskih poziva"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Računi za internetske pozive (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Računi"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Upravljanje računima za internetske pozive (SIP) i statusom"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Primi dolazni poziv"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Skraćuje trajanje baterije"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Konfiguriraj opcije poziva"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Upotrijebi internetski poziv"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Upotrijebi internetski poziv (samo Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Za sve pozive kada je podatkovna mreža dostupna"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Samo za internetske pozive"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Upit za svaki poziv"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Za sve pozive"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Auto-registracija"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Odlazni poziv putem SIP-a"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Nazovi"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Upotrijebi račun za internetske pozive:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Uvijek upotrijebi za internetske pozive"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Postavke poziva možete upotrijebiti za promjenu računa kojeg ćete kao zadanog upotrebljavati za internetske pozive odabirom drugog računa u postavkama internetskih poziva"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Možete promijeniti koji ćete internetski račun za pozivanje upotrebljavati prema zadanim postavkama iz opcije Telefon &gt; Postavke &gt; Postavke internetskih poziva &gt; Zaslon računa."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Poziv mobitelom"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Internetski poziv"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Nema računa za internetske pozive"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Na ovom telefonu nema računa za internetske pozive. Želite li sada dodati jedan?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Na ovom telefonu nema računa za internetske pozive. Želite li sada dodati jedan?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Dodaj"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Dodavanje računa"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Brisanje računa"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP računi"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Spremanje računa..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Uklanjanje računa..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Spremanje računa…"</string>
+    <string name="removing_account" msgid="7183999896088628100">"Uklanjanje računa…"</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Spremi"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Odbaci"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Zatvori profil"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"U redu"</string>
     <string name="close_profile" msgid="6886968271423155284">"Zatvori"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Primarni"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Učini ovaj račun primarnim"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Upotrebljava se za odlazne pozive"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Napredne postavke"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Primarni račun. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Provjeravanje statusa..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Registriranje..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Još uvijek pokušava..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Ne prima pozive"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Registracija računa zaustavila se jer nema internetske veze"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Registracija računa zaustavila se jer nema Wi-Fi veze"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Registracija računa nije uspjela"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Primanje poziva"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Prijava…"</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Još pokušavam…"</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Ne prima pozive."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Prijava računa zaustavljena je jer nema internetske veze."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Prijava računa zaustavljena je jer nema WiFi veze."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Prijava računa nije uspjela."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Prima pozive."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Registracija računa nije uspjela: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); pokušat ćemo kasnije"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Registracija računa nije uspjela: netočno korisničko ime ili zaporka"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Registracija računa nije uspjela: provjerite naziv poslužitelja"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Ovaj račun trenutačno upotrebljava aplikacija <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Prijava računa nije uspjela: netočno korisničko ime ili zaporka."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Prijava računa nije uspjela: provjerite naziv poslužitelja."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Ovaj račun trenutačno upotrebljava aplikacija <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Detalji SIP računa"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Detalji SIP računa"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Poslužitelj"</string>
@@ -660,9 +569,6 @@
     <string name="port_title" msgid="5952939408078626657">"Broj porta"</string>
     <string name="transport_title" msgid="8253139511847746640">"Vrsta transporta"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Pošalji postavke keep-alive"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Pošalji SIP keep-alive poruke"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Auto-registracija"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Registriraj profil automatski"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Postavi kao primarni račun"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Upotrebljava se za odlazne pozive"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Izborne postavke"</string>
@@ -673,12 +579,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Izborno&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Dodirnite da biste prikazali sve"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Dodirnite kako bi sakrili sve"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"Polje <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> je obavezno, ne može ostati prazno"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Broj porta trebao bi biti između 1000 i 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Polje <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> obavezno je i ne može ostati prazno."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Broj priključka trebao bi biti između 1000 i 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Nema internetske veze"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Nema Wi-Fi veze"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Za obavljanje internetskog poziva prvo provjerite internetsku vezu"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Morate se povezati s Wi-Fi mrežom za internetske pozive (upotrijebite postavke Bežično povezivanje &amp; Mreža)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Za uspostavu internetskog poziva prvo provjerite internetsku vezu."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Morate se povezati s WiFi mrežom za internetske pozive (upotrijebite postavke Bežičnog povezivanja i mreža)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Internetski pozivi nisu podržani"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automatski"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Uvijek šalji"</string>
@@ -687,7 +593,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Nazvat ću vas odmah."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Zvat ću vas kasnije."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Sada ne mogu razgovarati. Nazovite me kasnije?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Prilagođena poruka..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Prilagođena poruka"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Brzi odgovori"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Uređivanje brzih odgovora"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +611,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"zvjezdica"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"nula"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"funta"</string>
-    <string name="description_search_button" msgid="239929880630534731">"pretraži"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"biraj"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Zvučnik je omogućen."</string>
@@ -715,9 +620,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Odbij"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibracija"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibracija"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Melodija zvona"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Uvijek"</item>
-    <item msgid="1595097872875714252">"Samo kada je bešumno"</item>
-    <item msgid="1458182414036878616">"Nikad"</item>
+    <item msgid="1595097872875714252">"Samo ako je bešumno"</item>
+    <item msgid="1458182414036878616">"Nikada"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Melodija zvona telefona"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrira dok zvoni"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tonovi biranja"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Melodija zvona"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4874a1a68..e077f97ce 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Magántelefonszám"</string>
     <string name="payphone" msgid="1931775086311769314">"Nyilvános telefon"</string>
     <string name="onHold" msgid="9035493194749959955">"Tartásban"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Jelenlegi hívás"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"A vonal foglalt"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"A hálózat túlterhelt"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Nincs válasz, időtúllépés történt"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"A szerver nem érhető el"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"A szám nem érhető el"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Helytelen felhasználónév vagy jelszó"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"A hívó hálózaton kívüli volt"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"A hívó hálózaton kívüli volt"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Szerverhiba. Kérjük, próbálkozzon újra."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Nincs vonal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Elérte az ACM-korlátot"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Rádió kikapcsolva"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Hiányzó vagy hibás SIM-kártya"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Hiányzó vagy hibás SIM kártya"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Szolgáltatási területen kívüli terület"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Az FDN korlátozza a kimenő hívásokat."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Nem kezdeményezhet hívásokat, amíg a hívásletiltás be van kapcsolva."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Nem kezdeményezhet hívásokat, amíg a hívásletiltás be van kapcsolva."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Minden hívást korlátoz a hozzáférésvezérlés."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"A segélyhívásokat korlátozza a hozzáférésvezérlés."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"A normál hívásokat korlátozza a hozzáférésvezérlés."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: a telefon zárolva van a következő ki-/bekapcsolásig."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: a hívás megszakadt."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: hívás elfogva."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: újrarendezés."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: szolgáltatás-beállítás elutasítása."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: ismétlési sorrend."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: hozzáférési hiba."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: megakadályozva."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Csak segélyhívás lehetséges."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Érvénytelen szám"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Érvénytelen szám"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferenciahívás"</string>
     <string name="call_lost" msgid="317670617901479594">"A hívás megszakadt."</string>
-    <string name="retry" msgid="8462986804300767852">"Újra"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"A hívás megszakadt"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-kód elindítva"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-kód futtatása..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Vezetékes fülhallgató"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Elküldi a következő hangjelzéseket?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Hangjelzések küldése"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Hangjelzések küldése"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Küldés"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Igen"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Nem"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Helyettesítő karakter lecserélése a következővel:"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Helyettesítő karakter lecserélése a következővel:"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Hiányzik a hangposta száma"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Nincs hangpostaszám a SIM-kártyán."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Szám hozzáadása"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Betöltés…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"A SIM-kártya feloldásához adja meg a PIN-kódot."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"A SIM-kártya feloldva"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Új PIN-kód a SIM-kártyához"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"A megerősítéshez adja meg újra a PIN-kódot"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"A SIM-kártya PIN-kódjai nem egyeznek. Kérjük, próbálja újra."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"A SIM-kártya feloldásához adja meg a PUK-kódot."</string>
-    <string name="badPuk" msgid="3213017898690275965">"Helytelen PUK-kód."</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Folytatás"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"SIM-kártyája letiltása megszűnt. Feloldás folyamatban..."</string>
     <string name="label_ndp" msgid="780479633159517250">"SIM hálózati függetlenítő PIN-kódja"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Feloldás"</string>
@@ -93,13 +72,13 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Függetlenítés kérése..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"A hálózatzárolás feloldására vonatkozó kérelem sikertelen volt."</string>
     <string name="unlock_success" msgid="6770085622238180152">"A függetlenítés sikerült."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM-hívásbeállítások"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA-hívásbeállítások"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Hozzáférési pontok nevei"</string>
     <string name="settings_label" msgid="3876743539816984008">"Hálózati beállítások"</string>
     <string name="voicemail" msgid="8693759337917898954">"Hangposta"</string>
+    <string name="mwi_notification_title">Várakozó üzenet</string>
+    <string name="mwi_notification_summary">Várakozó hangposta üzenet megjelenítése</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"HP:"</string>
     <string name="networks" msgid="8873030692174541976">"Mobilszolgáltatók"</string>
     <string name="call_settings" msgid="6112441768261754562">"Hívásbeállítások"</string>
@@ -109,6 +88,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"További csak CDMA-hívásbeállítások"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Hálózati szolgáltatás beállításai"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Hívóazonosító"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Beállítások betöltése..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"A kimenő hívások során elrejtett szám"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"A kimenő hívások során megjelenített szám"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Alapértelmezett szolgáltatói beállítások használata a számom megjelenítésére a kimenő hívások során"</string>
@@ -127,17 +107,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Átirányítási szám, ha foglalt"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Átirányítás ide: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Letiltva"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Szolgáltatója nem támogatja a hívásátirányítás letiltását a telefon foglaltsága esetén."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Szolgáltatója nem támogatja a hívásátirányítás letiltását, ha a  telefon foglalt."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Átirányítás, ha nem válaszol"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Átirányítási szám, ha nem válaszol"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Átirányítás ide: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Letiltva"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Szolgáltatója nem támogatja a hívásátirányítás letiltását, ha a telefon nem fogadja a hívást."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Szolgáltatója nem támogatja a hívásátirányítás letiltását, ha telefonja nem fogad hívásokat."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Átirányítás, ha nem érhető el"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Átirányítási szám, ha nem elérhető"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Átirányítás ide: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Kikapcsolva"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Szolgáltatója nem támogatja a hívásátirányítás letiltását, ha a telefon ki van kapcsolva."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Szolgáltatója nem támogatja a hívásátirányítás letiltását, ha a telefon nem érhető el."</string>
     <string name="updating_title" msgid="6146755386174019046">"Hívásbeállítások"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Hiba a hívásbeállításokban"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Beállítások olvasása..."</string>
@@ -145,8 +125,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Beállítások visszaállítása..."</string>
     <string name="response_error" msgid="6674110501330139405">"Nem várt válasz a hálózattól."</string>
     <string name="exception_error" msgid="7027667130619518211">"Hálózati vagy SIM-kártya hiba."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"A műveletek csak fix hívószámmal hajthatók végre."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Kapcsolja be a rádiót a beállítások megtekintése előtt."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Telefonja alkalmazásának Fix hívószámok beállítása be van kapcsolva. Ennek eredményeként bizonyos hívásfunkciók nem működnek."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Kapcsolja be a rádiót a beállítások megtekintése előtt."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Engedélyezés"</string>
     <string name="disable" msgid="7274240979164762320">"Letiltás"</string>
@@ -156,10 +136,9 @@
     <item msgid="7876195870037833661">"Szám elrejtése"</item>
     <item msgid="1108394741608734023">"Szám megjelenítése"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Hangposta számának mentése"</string>
     <string name="vm_changed" msgid="380744030726254139">"A postafiók száma módosítva."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Nem sikerült módosítani a postafiók számát."\n"Ha a probléma nem szűnik meg, lépjen kapcsolatba mobilszolgáltatójával."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Nem sikerült módosítani a hívásátirányítást."\n"Ha a probléma nem szűnik meg, lépjen kapcsolatba mobilszolgáltatójával."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Nem sikerült módosítani a hangposta számát."\n"Ha a probléma továbbra is fennáll, forduljon a szolgáltatóhoz."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Nem sikerült megváltoztatni a továbbítási számot."\n"Ha a probléma továbbra is fennáll, forduljon a szolgáltatójához."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Nem sikerült lekérni és elmenteni a jelenlegi hívásátirányítási beállításokat."\n"Mégis átvált az új szolgáltatóra?"</string>
     <string name="no_change" msgid="3186040086622435212">"Nem történt változtatás."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Válassza ki a hangposta-szolgáltatást"</string>
@@ -171,14 +150,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Hálózatkeresés"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Hiba történt a hálózatok keresése közben."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Regisztrálás a(z) <xliff:g id="NETWORK">%s</xliff:g> hálózaton..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"SIM-kártyája nem teszi lehetővé a kapcsolódást ehhez a hálózathoz."</string>
-    <string name="connect_later" msgid="500090982903469816">"Jelenleg nem lehet csatlakozni ehhez a hálózathoz. Kérjük, próbálja újra később."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"SIM kártyája nem teszi lehetővé a kapcsolódást ehhez a hálózathoz."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Most nem lehet csatlakozni a hálózathoz. Próbálja meg később."</string>
     <string name="registration_done" msgid="495135664535876612">"Regisztrálva a hálózaton."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Mobilszolgáltató választása"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Válassza ki a hálózat üzemeltetőjét"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Az összes elérhető hálózat megkeresése"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Automatikus kiválasztás"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Preferált hálózat automatikus kiválasztása"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automatikus regisztráció..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Automatikus választás"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Preferált hálózat automatikus kiválasztása"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automatikus regisztráció..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Hálózati mód"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"A hálózati üzemmód megváltoztatása"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Preferált hálózati mód"</string>
@@ -191,18 +170,25 @@
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Preferált hálózati mód: csak CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Preferált hálózati mód: csak EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Preferált hálózati mód: LTE/CDMA"</string>
+    <!-- Mobile network settings, summary for preferred network mode LTE / GSM[CHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_gsm_summary">"Preferált hálózati mód: LTE / WCDMA / GSM"</string>
+    <!-- Mobile network settings, summary for preferred network mode LTE / CDMA / EvDo[CHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_cdma_evdo_summary">"Preferált hálózati mód:  LTE / CDMA / EvDo"</string>
+    <!-- Mobile network settings, summary for preferred network mode LTE / CMDA / EvDo / GSM/WCDMACHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">"Preferált hálózati mód: LTE / CMDA / EvDo / GSM/WCDMA"</string>
+
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Csak EvDo"</item>
     <item msgid="454610224530856274">"CDMA EvDo nélkül"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo automatikus"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA automatikus"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo automatikus"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA automatikus"</item>
     <item msgid="5189164180446264504">"Csak WCDMA"</item>
     <item msgid="5714714953966979187">"Csak GSM"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA a preferált"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA a preferált"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Adatok engedélyezése"</string>
@@ -210,12 +196,17 @@
     <string name="roaming" msgid="8871412572928323707">"Adatbarangolás"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Csatlakozás adatszolgáltatásokhoz barangolás során"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Csatlakozás adatszolgáltatásokhoz barangolás során"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Megszakadt az adatkapcsolat, mert elhagyta az otthoni hálózatot, és az adatbarangolás nincs bekapcsolva."</string>
+    <!-- Mobile network settings screen, setting check box name -->
+    <string name="national_roaming">Nemzeti adatbarangolás</string>
+    <!-- Mobile network settings screen, setting summary text when check box is selected -->
+    <string name="national_roaming_enable">Csatlakozzon adatszolgáltatásokhoz nemzeti barangolás során</string>
+    <!-- Mobile network settings screen, setting summary text when check box is clear -->
+    <string name="national_roaming_disable">Ne csatlakozzon adatszolgáltatásokhoz nemzeti barangolássorán</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Megszakadt az adatkapcsolat, mert elhagyta az otthoni hálózatot, és az adatbarangolás nincs bekapcsolva."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Engedélyezi az adatbarangolást? Lehet, hogy jelentős összeget számítanak fel érte!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS beállítások"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA-beállítások"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Adathasználat"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Szolgáltató adatforgalmazási irányelvei"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Az aktuális időszakban felhasznált adatmennyiség"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Adathasználat időtartama"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Adatsebesség-irányelvek"</string>
@@ -226,7 +217,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"A ciklus <xliff:g id="USED_0">%1$d</xliff:g>٪ -a letelt"\n"A következő időszak <xliff:g id="USED_1">%2$d</xliff:g> nap múlva kezdődik (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Az adatátvitel sebessége <xliff:g id="USED">%1$d</xliff:g> kb/s-ra csökken, ha átlépi az adathasználati korlátot."</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"További információk mobilszolgáltatója hálózatának adatfelhasználási irányelveiről"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Cellán belüli üzenetszórás"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Cellán belüli üzenetszórás"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Cellán belüli üzenetszórás"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Cellán belüli üzenetszórás engedélyezve"</string>
@@ -267,15 +257,6 @@
     <item msgid="1858401628368130638">"koreai"</item>
     <item msgid="1933212028684529632">"kínai"</item>
     <item msgid="1908428006803639064">"Héber"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Nyelvek"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Helyi időjárás"</string>
@@ -305,9 +286,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Álláslehetőségek"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Álláslehetőségek engedélyezve"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Álláslehetőségek letiltva"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Orvosi, egészségügyi és kórházi"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Orvosi, egészségügyi és kórházi engedélyezve"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Orvosi, egészségügyi és kórházi letiltva"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Orvosi, egészségügyi és kórházi"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Orvosi, egészségügyi és kórházi engedélyezve"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Orvosi, egészségügyi és kórházi letiltva"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Műszaki hírek"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Műszaki hírek engedélyezve"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Műszaki hírek letiltva"</string>
@@ -323,34 +304,16 @@
     <item msgid="8776934131146642662">"Csak GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA a preferált)"</item>
   </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
-  </string-array>
-    <string name="prefer_2g" msgid="8442550937280449639">"Csak 2G hálózatok használata"</string>
-    <string name="prefer_2g_summary" msgid="1976491403210690759">"Spórol az energiával"</string>
+    <string name="prefer_2g" msgid="8442550937280449639">"Csak 2G hálózatok"</string>
+    <string name="prefer_2g_summary" msgid="1976491403210690759">"Csak 2G hálózatok használata (spórol az energiával)"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Rendszer kiválasztása"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"A cdma barangolási mód megváltoztatása"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"A CDMA-barangolási mód megváltoztatása"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Rendszer kiválasztása"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Csak otthoni"</item>
     <item msgid="1205664026446156265">"Automatikus"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA barangolási mód"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"A cdma barangolási mód megváltoztatása"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA barangolási mód"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Csak otthoni hálózatok"</item>
-    <item msgid="8174642753290624634">"Kapcsolódó hálózatok"</item>
-    <item msgid="2241951431403168661">"Bármilyen hálózat"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA-feliratkozás"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA hálózati preferencia"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Még nincs megvalósítva."</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA hálózati preferencia"</string>
@@ -359,21 +322,11 @@
     <item msgid="6143696847467859795">"Csak CDMA"</item>
     <item msgid="2683555124647197574">"Csak EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA-feliratkozás"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Váltás RUIM/SIM és NV között"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"feliratkozás"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Eszköz aktiválása"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Adatszolgáltatás beállítása"</string>
@@ -390,18 +343,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Fix hívószámok kezelése"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"PIN-kód módosítása az FDN eléréséhez"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Telefonszámok listájának kezelése"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Voice - adatvédelem"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Adatvédelem"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Fokozott adatvédelmi mód engedélyezése"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY-mód"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"TTY-mód bekapcsolása"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY-mód"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY-mód beállítása"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Automatikus újrapróbálkozás"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Automatikus újrapróbálkozás mód bekapcsolása"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Automatikus újrapróbálkozás"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Automatikus újrapróbálkozás-mód bekapcsolása"</string>
     <string name="menu_add" msgid="1882023737425114762">"Névjegy hozzáadása"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Névjegy szerkesztése"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Névjegy törlése"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Adja meg a PIN2-kódot"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Írja be a PIN2 kódot"</string>
     <string name="name" msgid="7329028332786872378">"Név"</string>
     <string name="number" msgid="7905950798349903858">"Szám"</string>
     <string name="save" msgid="4094274636321939086">"Mentés"</string>
@@ -414,56 +365,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Fix hívószám törlése"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Fix hívószám törlése..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"A fix hívószám törölve."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Az FDN nincs frissítve: helytelen PIN-kódot adott meg."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN nincs frissítve: a szám nem lehet 20 számjegynél hosszabb."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Az FDN nem volt frissítve, mert hibás PIN-kódot írt be."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Az FDN nem lett frissítve, mert a szám nem haladhatja meg a 20 számjegyet."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Az FDN nem lett frissítve. Hibás a PIN2 kód, vagy a telefonszámot elutasították."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Beolvasás a SIM-kártyáról..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Nincsenek névjegyek a SIM-kártyán."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Válassza ki az importálni kívánt névjegyeket"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Kérjük, kapcsolja ki a repülőgép üzemmódot telefonján, hogy SIM-kártyájáról névjegyeket importálhasson."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"A névjegyek SIM kártyáról való importálásához először kapcsolja ki a repülőgépes üzemmódot."</string>
     <string name="enable_pin" msgid="5422767284133234860">"SIM-kártya PIN-kódjának be-/kikapcsolása"</string>
     <string name="change_pin" msgid="9174186126330785343">"SIM-kártya PIN-kódjának módosítása"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM-kártya PIN-kódja:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Régi PIN-kód"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Új PIN-kód"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Erősítse meg az új PIN-kódot"</string>
-    <string name="badPin" msgid="4154316827946559447">"A megadott régi PIN-kód helytelen. Kérjük, próbálja újra."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"A megadott PIN-kódok nem egyeznek. Kérjük, próbálja újra."</string>
+    <string name="badPin" msgid="8955102849303984935">"A megadott régi PIN kód helytelen. Próbálja újra."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"A beírt PIN kódok nem egyeznek. Próbálja újra."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Írjon be egy 4-8 számjegyű PIN-kódot."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"SIM-kártya PIN-kódjának kikapcsolása"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"SIM-kártya PIN-kódjának bekapcsolása"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Kérjük, várjon..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"SIM-kártya PIN-kódja bekapcsolva"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM-kártya PIN-kódja kikapcsolva"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"A megadott PIN-kód érvénytelen."</string>
-    <string name="pin_changed" msgid="9000716792724195093">"A SIM-kártya PIN-kódja sikeresen módosítva"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM kártya PIN kódja bekapcsolva."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM kártya PIN kódja kikapcsolva."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"A megadott PIN kód hibás."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"A SIM kártya PIN kódja sikeresen módosítva."</string>
     <string name="puk_requested" msgid="3898394204193202803">"A jelszó helytelen, a SIM-kártya zárolásra került. Adja meg a PUK2-kódot."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Régi PIN2-kód"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Új PIN2-kód"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Erősítse meg az új PIN2-kódot"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"A megadott PUK2-kód helytelen. Kérjük, próbálja újra."</string>
-    <string name="badPin2" msgid="515218795152422178">"A megadott régi PIN2-kód helytelen. Kérjük, próbálja újra."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"A beírt PIN2-kódok nem egyeznek. Kérjük, próbálja újra."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"A megadott PUK2 kód helytelen. Kérjük, próbálja újra."</string>
+    <string name="badPin2" msgid="1041576234483629991">"A megadott régi PIN2 kód helytelen. Próbálja újra."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"A beírt PIN2 kódok nem egyeznek. Próbálja újra."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Írjon be egy 4-8 számjegyű PIN2-kódot."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Írja be a 8 jegyű PUK2-kódot."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"A PIN2-kód sikeresen módosításra került"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"A PIN2 kód sikeresen módosítva."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Írja be a PUK2-kódot"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"A jelszó helytelen; kérjük, módosítsa a PIN2-kódot és próbálja újra."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"A jelszó helytelen, a SIM-kártya zárolva lett. Adja meg a PUK2-kódot."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"A jelszó helytelen. Kérjük, módosítsa a PIN2 kódot és próbálja újra."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"A jelszó helytelen, a SIM kártya zárolásra került. Adja meg a PUK2 kódot."</string>
     <string name="doneButton" msgid="2859593360997984240">"Kész"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenciahívás: <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Vissza a híváshoz"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Folytatás SIM-kártya nélkül"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Nem található a SIM-kártya. Kérjük, helyezzen be egy SIM-kártyát a telefonba."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Elvetés"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Feloldás"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"PIN-kód azonosítása..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Hangposta száma"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Tárcsázás"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Újrapróbálkozás"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferenciahívás"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Bejövő hívás"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Cdma-hívásvárakoztatás"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"A hívás befejeződött"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Tartásban"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Megszakítás"</string>
@@ -473,7 +418,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Nem fogadott hívások"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> nem fogadott hívás"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Nem fogadott hívás: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Jelenlegi hívás (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Hívás folyamatban"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Tartásban"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Bejövő hívás"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Új hangposta"</string>
@@ -482,13 +427,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"A hangposta száma ismeretlen"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nincs szolgáltatás"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"A kiválasztott hálózat (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nem érhető el"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Hívás befejezése"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Visszahívás"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Üzenet"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Híváskezdeményezéshez kapcsolja ki a Repülőgép üzemmódot."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nincs regisztrálva a hálózaton."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"A mobilhálózat nem érhető el."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"A hívás indítása érvénytelen szám beírása miatt nem történt meg."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"A hívás nem indítható."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI-sorozat indítása..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Funkciókód-sorozat indítása..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nem támogatott szolgáltatás"</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Nem lehet váltani a hívások között."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Nem lehet elkülöníteni a hívást."</string>
@@ -500,18 +447,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Segélyhívás"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Rádió bekapcsolása..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Szolgáltatási területen kívüli terület, újrapróbálás..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"A hívás nem indítható; a(z) <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nem segélyhívó szám!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"A hívás nem indítható, kérjük, tárcsázzon egy segélyhívó számot!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"A hívás nem indítható. A(z) <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nem segélyhívó szám!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"A hívás nem indítható. Tárcsázzon egy segélyhívó számot!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"A tárcsázáshoz használja a billentyűzetet"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Telefonbillentyűzet"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Tartás"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Tartás feloldása"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Befejezés"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Tárcsázó"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Elrejtés"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Hangszóró"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Lezárás"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Hívás hozzáadása"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Hívások egyesítése"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Csere"</string>
@@ -530,36 +472,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI szöveg"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF hangjelzések"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF-hangjelzések"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"DTMF hangjelzések hosszának beállítása"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normál"</item>
     <item msgid="2883365539347850535">"Hosszú"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Hálózati üzenet"</string>
+    <string name="network_message" msgid="4483886461245213802">"Hálózati üzenet"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktiválja telefonját"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"A telefonszolgáltatás aktiválásához egy speciális hívást kell indítania. "\n\n"Az \"Aktiválás\" megnyomása után kövesse az utasításokat."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Érintse meg az \"Aktiválás\" lehetőséget egy olyan speciális hívás kezdeményezéséhez, amely aktiválja telefonját a szolgáltató hálózatán; ezután tud hívásokat indítani és mobil adathálózatokhoz kapcsolódni."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Kihagyja az aktiválást?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ha kihagyja az aktiválást, nem indíthat hívásokat és nem kapcsolódhat mobil adathálózatokhoz (de csatlakozhat Wi-Fi hálózatokhoz). Amíg nem aktiválja telefonját, az minden egyes bekapcsoláskor felkéri Önt erre."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Átugrás"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktiválás"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktiválás"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"A telefon aktiválva!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"A telefon aktiválva."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Gond volt az aktiválással"</string>
     <string name="ota_listen" msgid="162923839877584937">"Kövesse a hallott utasításokat, amíg azt nem hallja, hogy az aktiválás befejeződött."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Billentyűzet"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Hangszóró"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Kérjük, várjon a telefonja beprogramozásáig."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"A programozás sikertelen volt"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Kérjük, várjon a telefon beprogramozásáig."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"A programozás nem sikerült"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Telefonja most már aktiválva van. Akár 15 percet is igénybe vehet a szolgáltatás elindítása."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Nem aktiválta a telefont. "\n"Lehet, hogy keresnie kell egy jobb lefedettségű területet (egy ablak közelében vagy a szabadban). "\n\n"Próbálkozzon újra vagy hívja az ügyfélszolgálatot a további lehetőségekért."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Nem aktiválta a telefont. "\n"Lehet, hogy keresnie kell egy jobb lefedettségű területet (egy ablak közelében vagy a szabadban). "\n\n"Próbálkozzon újra vagy hívja az ügyfélszolgálatot a további lehetőségekért."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"TÚL SOK HELYESÍRÁSI HIBA"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Vissza"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Újrapróbálkozás"</string>
     <string name="ota_next" msgid="3904945374358235910">"Tovább"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Vissza"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Segélykérő visszahívása mód bekapcsolva"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Segélykérő visszahívása mód"</string>
@@ -569,87 +506,74 @@
     <item quantity="other" msgid="3122217344579273583">"<xliff:g id="COUNT">%s</xliff:g> perce nincs adatkapcsolat"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"A telefon a segélykérő visszahívása módban lesz még <xliff:g id="COUNT">%s</xliff:g> percig. Ebben a módban nem használhatók az adatkapcsolatot létesítő alkalmazások. Kilép most?"</item>
-    <item quantity="other" msgid="3231879566243957821">"A telefon a segélykérő visszahívása módban lesz még <xliff:g id="COUNT">%s</xliff:g> percig. Ebben a módban nem használhatók az adatkapcsolatot létesítő alkalmazások. Kilép most?"</item>
+    <item quantity="one" msgid="8060210887681426682">"A telefon <xliff:g id="COUNT">%s</xliff:g> percig Sürgősségi visszahívás módban lesz. Ebben az üzemmódban nem használhatók az adatkapcsolatot használó alkalmazások. Szeretne most kilépni?"</item>
+    <item quantity="other" msgid="8617116564023933114">"A telefon <xliff:g id="COUNT">%s</xliff:g> percig Sürgősségi visszahívás módban lesz. Ebben az üzemmódban nem használhatók az adatkapcsolatot használó alkalmazások. Szeretne most kilépni?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"A kiválasztott művelet nem érhető el a segélykérő visszahívása módban. A telefon <xliff:g id="COUNT">%s</xliff:g> percig lesz ebben a módban. Kilép most?"</item>
-    <item quantity="other" msgid="3489076611710869904">"A kiválasztott művelet nem érhető el a segélykérő visszahívása módban. A telefon <xliff:g id="COUNT">%s</xliff:g> percig lesz ebben a módban. Kilép most?"</item>
+    <item quantity="one" msgid="2585506997024726599">"A kiválasztott művelet nem áll rendelkezésre Sürgősségi visszahívás módban. A telefon <xliff:g id="COUNT">%s</xliff:g> percig lesz ebben a módban. Szeretne most kilépni?"</item>
+    <item quantity="other" msgid="6115622137771382224">"A kiválasztott művelet nem áll rendelkezésre Sürgősségi visszahívás módban. A telefon <xliff:g id="COUNT">%s</xliff:g> percig lesz ebben a módban. Szeretne most kilépni?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"A választott művelet nem érhető el segélyhívás során"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Segélykérő visszahívása mód kikapcsolása"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"A választott művelet nem érhető el segélyhívás során."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Kilépés a Sürgősségi visszahívás módból"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Igen"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Nem"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Elvetés"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Hangposta beállításai"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;nincs beállítva&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Hangposta-szolgáltatás"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> - Beállítások"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Szolgáltatás"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Beállítás"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nincs megadva&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Egyéb hívásbeállítások"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Tárcsázás"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Hívás a következőn keresztül: ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Húzza jobbra a hívás fogadásához"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Húzza balra a csörgés elnémításához"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Húzza balra a hívás elutasításához"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Húzza jobbra a hívás fogadásához és az"\n"aktív hívás tartásához"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Húzza jobbra a hívás fogadásához és az"\n"aktív hívás befejezéséhez"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Húzza jobbra a hívás fogadásához és"\n"a tartásban levő hívás befejezéséhez"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Fogadás"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Elutasítás"</string>
+
+    <!-- Dialer UI Settings -->
+    <string name="dialer_ui_settings_title">Tárcsázó beállítások</string>
+    <string name="dialer_ui_settings_summary">Tárcsázó beállításai</string>
+
+    <string name="calling_via_template" msgid="4839419581866928142">"Hívás a(z) <xliff:g id="PROVIDER_NAME">%s</xliff:g> szolgáltatón keresztül"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"ismerős fotója"</string>
     <string name="goPrivate" msgid="865837794424530980">"magánbeszélgetés"</string>
     <string name="selectContact" msgid="781975788478987237">"névjegy kijelölése"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Internetes hívás beállításai"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Internetes hívási (SIP) fiókok"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Fiókok"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Az internetes hívási (SIP) fiókok kezelése és állapota"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Beérkező hívások fogadása"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Csökkenti a használati időt"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Hívásbeállítások konfigurálása"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Internetes hívás használata"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Internetes hívás használata (csak Wi-Fi esetén)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Minden hívásnál, amikor nincs elérhető adathálózat"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Csak internetes hívásoknál"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Mindig rákérdez"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Minden hívásnál"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Automatikus regisztráció"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Kimenő hívás SIP-n keresztül"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Hívás indítása"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"A következő Internetes hívási fiók használata:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Mindig használja internetes hívás kezdeményezésekor"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"A Hívásbeállításokban módosíthatja, hogy melyik internetes hívási fiókot használja alapértelmezettként hívások kezdeményezésekor; ehhez válasszon ki egy másik fiókot az internetes hívások beállításaiban."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Megváltoztathatja, hogy melyik internetes telefonálási fiókot használja alapértelmezés szerint a Telefon &gt; Beállítások &gt; Internetes hívásbeállítások&gt; Fiókok képernyőn."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Mobiltelefonos hívás"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Internetes hívás"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Nincs internetes hívási fiók"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Nincsenek internetes hívási fiókok ezen a telefonon. Hozzáad egyet most?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Nincsenek internetes hívási fiókok ezen a telefonon. Szeretne most hozzáadni egyet?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Hozzáadás"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Fiók hozzáadása"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Fiók törlése"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP-fiókok"</string>
-    <string name="saving_account" msgid="7468818916695729968">"A fiók mentése..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"A fiók törlése..."</string>
+    <string name="saving_account" msgid="52903398217017954">"A fiók mentése..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"A fiók törlése..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Mentés"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Visszavonás"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"A profil bezárása"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Bezárás"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Elsődleges"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Legyen ez az elsődleges fiókom"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"A kimenő hívásokhoz használatos"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Speciális beállítások"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Elsődleges fiók: <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Állapot ellenőrzése..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Regisztrálás..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Még próbálkozik..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Nem fogad hívásokat"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"A fiók regisztrálása leállt, mert nincs internetkapcsolat"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"A fiók regisztrálása leállt, mert nincs Wi-Fi kapcsolat"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"A fiók regisztrálása sikertelen"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Hívások fogadása"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Regisztrálás..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Még próbálkozik..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Nem fogad hívásokat."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"A fiók regisztrálása leállt, mert nincs internetkapcsolat."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"A fiók regisztrálása leállt, mert nincs Wi-Fi kapcsolat."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"A fiók regisztrálása sikertelen."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Hívások fogadása."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"A fiók regisztrálása sikertelen: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); próbálja újra később"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"A fiók regisztrálása nem sikerült: a felhasználónév vagy a jelszó helytelen"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"A fiók regisztrálása nem sikerült: ellenőrizze a szerver nevét"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Ezt a fiókot jelenleg a(z) <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> alkalmazás használja."</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"A fiók regisztrálása nem sikerült: a felhasználónév vagy a jelszó helytelen."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"A fiók regisztrálása nem sikerült: ellenőrizze a szerver nevét."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Ezt a fiókot jelenleg a(z) <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> alkalmazás használja."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIP-fiók részletei"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP-fiók részletei"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Szerver"</string>
@@ -660,9 +584,6 @@
     <string name="port_title" msgid="5952939408078626657">"Port száma"</string>
     <string name="transport_title" msgid="8253139511847746640">"Átvitel típusa"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Kapcsolat megtartása"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"A kapcsolatot megtartó SIP-üzenetek küldése"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Automatikus regisztráció"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"A profil automatikus regisztrálása"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Beállítás elsődleges fiókként"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"A kimenő hívásokhoz használatos"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"További beállítások"</string>
@@ -673,12 +594,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Opcionális&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Érintse meg az összes megjelenítéséhez"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Érintse meg az összes elrejtéséhez"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> kötelező, nem maradhat üresen"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"A port számának 1000 és 65534 között kell lennie"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> megadása kötelező, nem maradhat üresen."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"A port számának 1000 és 65534 között kell lennie."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Nincs internetkapcsolat"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Nincs Wi-Fi kapcsolat"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Internetes hívás kezdeményezéséhez először ellenőrizze az internetkapcsolatot"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Internetes hívások kezdeményezéséhez Wi-Fi hálózathoz kell csatlakoznia (használja a Vezeték nélküli és hálózati beállításokat)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Internetes hívás kezdeményezéséhez először ellenőrizze az internetkapcsolatot."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Internetes hívásokhoz csatlakoznia kell egy Wi-Fi hálózathoz (használja a Vezeték nélküli és hálózati beállításokat)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Az internetes hívás nem támogatott"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automatikus"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Mindig küldjön"</string>
@@ -687,7 +608,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Hamarosan visszahívom."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Később visszahívom."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Most nem alkalmas. Hívna később?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Egyéni üzenet..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Egyéni üzenet"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Gyors válaszok"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Gyors válaszok szerkesztése"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +626,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"csillag"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"nulla"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"kettős kereszt"</string>
-    <string name="description_search_button" msgid="239929880630534731">"keresés"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"tárcsázás"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"Backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Kihangosítás engedélyezve."</string>
@@ -715,9 +635,30 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Elutasítás"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Rezgés"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Rezgés"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Csengőhang"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Mindig"</item>
     <item msgid="1595097872875714252">"Csak néma üzemmódban"</item>
     <item msgid="1458182414036878616">"Soha"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Telefon csengőhangja"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Csengetéskor rezegjen"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tárcsázó érintési hangjai"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Csengőhang"</string>
+    <string name="perm_change_mobile_network">Hálózat módosítása (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Az ilyen engedéllyel rendelkező alkalmazás, bármikor válthat 2G és 3G közt. A 3G gyorsabb, jobban meríti az akkumulátort, és több pénzbe is kerülhet a nagyobb adatforgalom miatt.</string>
+    <string name="noise_suppression_title">Zajcsökkentés</string>
+    <string name="noise_suppression_summary">Zajcsökkentés engedélyezése telefonhívások esetén</string>
+    <string name="phone_number_label">Saját telefonszám</string>
+    <string name="phone_number_summary">Készülékhez tartozó telefonszám beállítása</string>
+    <string name="advanced_setting">Speciális beállítások</string>
+    <string name="keep_proximity_sensor_on">Ébren tartás</string>
+    <string name="keep_proximity_sensor_on_sum">Hívás közben (ha van csatlakoztatva fejhallgató) nem kapcsol ki a képernyő</string>
+    <string name="lockscreen_if_call_ends_with_screenoff">Képernyő zárolása a hívás befejeztével</string>
+    <string name="lockscreen_if_call_ends_with_screenoff_sum">Képernyő automatikus lezárása a hívás befejeztével</string>
+    <string name="vibrate_outgoing">Rezgés válaszkor</string>
+    <string name="vibrate_45">45 mp-ként rezeg</string>
+    <string name="vibrate_45_sum">Minden 45. másodpercben rezeg a kimenő hívások során</string>
+    <string name="vibrate_hangup">Bontáskor rezeg</string>
+    <string name="vibrate_call_waiting">Hívásvárakoztatáskor rezeg</string>
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e9caaf936..bd79dfc7e 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -25,40 +25,28 @@
     <string name="private_num" msgid="6713286113000232309">"Nomor pribadi"</string>
     <string name="payphone" msgid="1931775086311769314">"Telepon umum"</string>
     <string name="onHold" msgid="9035493194749959955">"Ditangguhkan"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Panggilan saat ini"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Jalur sibuk"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Jaringan sibuk"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Tidak ada jawaban, waktu habis"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server tidak dapat dijangkau"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nomor tidak dapat dijangkau"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nama pengguna atau sandi salah"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"dipanggil dari luar jaringan"</string>
-    <string name="callFailed_server_error" msgid="5717915213586193217">"Galat Server: Coba lagi nanti."</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Dipanggil dari luar jaringan"</string>
+    <string name="callFailed_server_error" msgid="5717915213586193217">"Kesalahan Server: Coba lagi nanti."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Tidak ada sinyal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM melebihi batas"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio mati"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Tidak ada SIM, atau SIM salah"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Tidak ada SIM atau kesalahan SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Di luar area layanan"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Panggilan keluar dibatasi oleh FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Anda tidak dapat melakukan panggilan keluar sewaktu pemblokiran panggilan aktif."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Anda tidak dapat melakukan panggilan keluar sewaktu pemblokiran panggilan aktif."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Semua panggilan dibatasi oleh kontrol akses."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Panggilan darurat dibatasi oleh kontrol akses."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Panggilan normal dibatasi oleh kontrol akses."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Perangkat dikunci sampai siklus daya."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Panggilan terputus."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Panggilan terganggu."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: pengaturan urutan."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Penolakan Opsi Layanan."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: urutan coba kembali."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Akses gagal."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Dihalangi."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Hanya panggilan Darurat yang dapat dilakukan."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Nomor Tidak Valid"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Nomor tidak valid"</string>
     <string name="confCall" msgid="1904840547188336828">"Telewicara"</string>
     <string name="call_lost" msgid="317670617901479594">"Panggilan telah terputus."</string>
-    <string name="retry" msgid="8462986804300767852">"Coba Lagi"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Panggilan Terputus"</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
+    <string name="ok" msgid="3811371167865772377">"Oke"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Kode MMI dimulai"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Kode USSD sedang berjalan…"</string>
     <string name="mmiCancelled" msgid="2771923949751842276">"Kode MMI dibatalkan"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Headset berkabel"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Kirimkan nada berikut?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Mengirim Nada"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Mengirimkan nada"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Kirimkan"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Ya"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Tidak"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Ganti karakter acak dengan"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Ganti karakter acak dengan"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Nomor kotak pesan hilang"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Tidak ada nomor kotak pesan tersimpan pada kartu SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Tambahkan nomor"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Memuat…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Ketikkan kode PIN untuk membuka kartu SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM tidak terkunci"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Kode PIN SIM baru"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Ketikkan kode PIN SIM baru untuk mengonfirmasi"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"PIN SIM yang Anda ketikkan tidak sesuai. Harap coba lagi."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Ketikkan kode PIN untuk membuka kartu SIM"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Kode PUK salah!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Lanjutkan"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Kartu SIM Anda tidak lagi dicekal. Ponsel Anda sedang dibuka kuncinya..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN pembuka kunci jaringan SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Buka kunci"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Meminta membuka jaringan..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Permintaan buka kunci jaringan gagal."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Jaringan berhasil dibuka."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Setelan panggilan GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Setelan panggilan CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Access Point Names (Nama Titik Akses)"</string>
@@ -109,9 +86,10 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Setelan panggilan khusus CDMA tambahan"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Setelan layanan jaringan"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Nomor Penelepon"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Memuat setelan..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Nomor disembunyikan selama panggilan keluar"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Nomor ditampilkan selama panggilan keluar"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Gunakan setelan operator bawaan untuk menampilkan nomor saya pada panggilan keluar"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Gunakan setelan operator default untuk menampilkan nomor saya pada panggilan keluar"</string>
     <string name="labelCW" msgid="6120513814915920200">"Nada tunggu"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Selama panggilan, beritahukan panggilan masuk kepada saya"</string>
     <string name="sum_cw_disabled" msgid="3648693907300104575">"Selama panggilan, beritahukan panggilan masuk kepada saya"</string>
@@ -127,39 +105,38 @@
     <string name="messageCFB" msgid="3711089705936187129">"Nomor ketika sibuk"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Meneruskan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Dinonaktifkan"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Operator Anda tidak mendukung penonaktifan penerusan panggilan ketika ponsel Anda sibuk."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operator Anda tidak mendukung penonaktifan penerusan panggilan ketika ponsel sibuk."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Teruskan ketika tidak dijawab"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Nomor ketika tidak dapat dihubungi"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Meneruskan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Dinonaktifkan"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Operator Anda tidak mendukung penonaktifan penerusan panggilan ketika ponsel Anda tidak menerima panggilan."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operator Anda tidak mendukung penonaktifan penerusan panggilan ketika ponsel tidak menjawab panggilan."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Teruskan ketika tidak dapat dihubungi"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Nomor ketika tidak dapat dihubungi"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Meneruskan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Dinonaktifkan"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Operator Anda tidak mendukung penonaktifan penerusan panggilan ketika ponsel Anda tidak dapat dijangkau."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Operator Anda tidak mendukung penonaktifan penerusan panggilan ketika ponsel tidak dapat dijangkau."</string>
     <string name="updating_title" msgid="6146755386174019046">"Setelan panggilan"</string>
-    <string name="error_updating_title" msgid="7970259216988931777">"Galat setelan panggilan"</string>
+    <string name="error_updating_title" msgid="7970259216988931777">"Kesalahan setelan panggilan"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Membaca setelan…"</string>
     <string name="updating_settings" msgid="8171225533884883252">"Memperbarui setelan…"</string>
     <string name="reverting_settings" msgid="4752151682666912828">"Mengembalikan setelan..."</string>
     <string name="response_error" msgid="6674110501330139405">"Tanggapan tak terduga dari jaringan."</string>
     <string name="exception_error" msgid="7027667130619518211">"Kesalahan jaringan atau kartu SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Operasi hanya diizinkan pada nomor panggilan tetap."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Hidupkan radio sebelum melihat setelan ini."</string>
-    <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Setelan Nomor Panggilan Tetap aplikasi Ponsel Anda diaktifkan. Akibatnya, beberapa fitur yang terkait dengan panggilan tidak bekerja."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Keluar dari mode pesawat sebelum melihat setelan ini."</string>
+    <string name="close_dialog" msgid="2365884406356986917">"Oke"</string>
     <string name="enable" msgid="1059008390636773574">"Aktifkan"</string>
     <string name="disable" msgid="7274240979164762320">"Nonaktifkan"</string>
     <string name="change_num" msgid="239476305819844391">"Perbarui"</string>
   <string-array name="clir_display_values">
-    <item msgid="5560134294467334594">"Setelan bawaan jaringan"</item>
+    <item msgid="5560134294467334594">"Setelan default jaringan"</item>
     <item msgid="7876195870037833661">"Sembunyikan nomor"</item>
     <item msgid="1108394741608734023">"Tampilkan nomor"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Simpan nomor kotak pesan"</string>
     <string name="vm_changed" msgid="380744030726254139">"Nomor kotak pesan berubah."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Perubahan nomor kotak pesan tidak berhasil."\n"Harap hubungi operator jika masalah tetap ada."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Perubahan penerusan nomor gagal."\n"Harap hubungi operator Anda jika masalah tetap ada."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Tidak dapat mengubah nomor pesan suara."\n"Hubungi operator Anda jika masalah ini terus berlanjut."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Tidak dapat mengubah nomor penerusan."\n"Hubungi operator Anda jika masalah ini terus berlanjut."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Tidak dapat mengambil dan menyimpan setelan nomor telepon penerusan saat ini."\n"Tetap beralih ke operator baru?"</string>
     <string name="no_change" msgid="3186040086622435212">"Tidak ada perubahan yang dilakukan."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Pilih layanan kotak pesan"</string>
@@ -169,16 +146,16 @@
     <string name="load_networks_progress" msgid="5230707536168902952">"Menelusuri…"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Jaringan tidak ditemukan."</string>
     <string name="search_networks" msgid="1601136049300882441">"Telusuri jaringan"</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Galat ketika menelusuri jaringan."</string>
+    <string name="network_query_error" msgid="6828516148953325006">"Kesalahan ketika menelusuri jaringan."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Mendaftarkan pada <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Kartu SIM Anda tidak mengizinkan sambungan ke jaringan ini."</string>
-    <string name="connect_later" msgid="500090982903469816">"Saat ini tidak dapat menyambung ke jaringan. Coba lagi nanti."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Kartu SIM Anda tidak mengizinkan sambungan ke jaringan ini."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Tidak dapat terhubung ke jaringan ini sekarang. Coba lagi nanti."</string>
     <string name="registration_done" msgid="495135664535876612">"Terdaftar pada jaringan."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Pilih operator jaringan"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Pilih operator jaringan"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Telusuri semua jaringan yang tersedia"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Pilih secara otomatis"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Memilih jaringan yang disukai secara otomatis"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Pendaftaran otomatis..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Pilih otomatis"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Memilih jaringan yang disukai secara otomatis"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Pendaftaran otomatis..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Mode Jaringan"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Ubah mode pengoperasian jaringan"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Mode jaringan yang disukai"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Modus jaringan pilihan: EvDo saja"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modus jaringan pilihan: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"EvDo saja"</item>
     <item msgid="454610224530856274">"CDMA tanpa EvDo"</item>
-    <item msgid="8928247118825616081">"Otomatis CDMA / EvDo"</item>
-    <item msgid="8595462903294812666">"Otomatis GSM / WCDMA"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo otomatis"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA otomatis"</item>
     <item msgid="5189164180446264504">"WCDMA saja"</item>
     <item msgid="5714714953966979187">"GSM saja"</item>
-    <item msgid="4775796025725908913">"GSM /WCDMA yang disukai"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA lebih disukai"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data diaktifkan"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Roaming data"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Sambungkan ke layanan data ketika roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Sambungkan ke layanan data ketika roaming"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Anda telah kehilangan konektivitas data karena Anda meninggalkan jaringan asal dalam keadaan roaming data dimatikan."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Anda telah kehilangan konektivitas data karena meninggalkan jaringan asal dalam keadaan roaming data dimatikan."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Izinkan roaming data? Anda mungkin dikenai tarif jelajah yang tinggi!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Opsi GSM//UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Opsi CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Penggunaan data"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Kebijakan data operator"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Data yang digunakan dalam periode saat ini"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Periode penggunaan data"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Kebijakan kecepatan data"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ dari siklus yang berlalu"\n"Periode berikutnya dimulai dalam <xliff:g id="USED_1">%2$d</xliff:g> hari (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Kecepatan data dikurangi menjadi <xliff:g id="USED">%1$d</xliff:g> Kb/s jika penggunaan data melebihi batas"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Informasi selengkapnya tentang kebijakan penggunaan data jaringan seluler operator Anda"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS Siaran Sel"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS Siaran Sel"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS Siaran Sel"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Setelan SMS Siaran Sel diaktifkan"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Korea"</item>
     <item msgid="1933212028684529632">"Bahasa China"</item>
     <item msgid="1908428006803639064">"Ibrani"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Bahasa"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Cuaca Lokal"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Peluang Kerja"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Peluang Kerja diaktifkan"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Peluang Kerja dinonaktifkan"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Medis, Kesehatan, dan Rumah Sakit"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Medis, Kesehatan, dan Rumah Sakit diaktifkan"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Medis, Kesehatan, dan Rumah Sakit dinonaktifkan"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Medis, Kesehatan, dan Rumah Sakit"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Medis, Kesehatan, dan Rumah Sakit diaktifkan"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Medis, Kesehatan, dan Rumah Sakit dinonaktifkan"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Berita Teknologi"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Berita Teknologi diaktifkan"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Berita Teknologi dinonaktifkan"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"WCDMA saja"</item>
     <item msgid="8776934131146642662">"GSM saja"</item>
     <item msgid="4684679567848300935">"GSM/WCDMA (WCDMA yang disukai)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Jaringan 2G saja"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Menghemat baterai"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Pilih sistem"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Ubah mode roaming cdma"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Ubah mode roaming CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Pilih sistem"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Utama saja"</item>
     <item msgid="1205664026446156265">"Otomatis"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Mode Roaming CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Ubah mode roaming cdma"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Mode roaming CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Jaringan Utama Saja"</item>
-    <item msgid="8174642753290624634">"Jaringan Berafiliasi"</item>
-    <item msgid="2241951431403168661">"Jaringan Manapun"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Langganan CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Preferensi Jaringan CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Belum diimplementasikan!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Preferensi jaringan CDMA"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"CDMA saja"</item>
     <item msgid="2683555124647197574">"EvDo saja"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Langganan CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Ubah antara RUIM/SIM dan NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"langganan"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM//SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktifkan perangkat"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Siapkan layanan data"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Kelola Nomor Panggilan Tetap"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Ubah PIN untuk akses FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Kelola daftar nomor telepon"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Privasi Suara"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Privasi suara"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Aktifkan mode privasi yang ditingkatkan"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Mode TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Aktifkan mode TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Mode TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Setel Mode TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Coba Lagi Otomatis"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Aktifkan mode Coba Lagi Otomatis"</string>
-    <string name="menu_add" msgid="1882023737425114762">"Tambahkan kenalan"</string>
-    <string name="menu_edit" msgid="7143003705504672374">"Edit data kenalan"</string>
-    <string name="menu_delete" msgid="3977150783449642851">"Hapus kenalan"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Masukkan PIN2"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Coba lagi otomatis"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Aktifkan mode Coba lagi otomatis"</string>
+    <string name="menu_add" msgid="1882023737425114762">"Tambahkan kontak"</string>
+    <string name="menu_edit" msgid="7143003705504672374">"Edit kontak"</string>
+    <string name="menu_delete" msgid="3977150783449642851">"Hapus kontak"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Ketik PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Nama"</string>
     <string name="number" msgid="7905950798349903858">"Nomor"</string>
     <string name="save" msgid="4094274636321939086">"Simpan"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Hapus nomor panggilan tetap"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Menghapus nomor panggilan tetap..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Nomor panggilan tetap dihapus."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN tidak diperbarui: Anda memasukkan PIN yang salah."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN tidak diperbarui: angka tidak boleh lebih dari 20 digit."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN tidak diperbarui karena Anda memasukkan PIN yang salah."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN tidak diperbarui karena nomor tersebut tidak boleh melebihi 20 digit."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN tidak diperbarui. PIN2 salah, atau nomor telepon ditolak."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Membaca dari kartu SIM…"</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"Tidak ada data kenalan pada Kartu SIM."</string>
-    <string name="simContacts_title" msgid="1861472842524839921">"Pilih kenalan untuk diimpor"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Untuk mengimpor data kenalan dari kartu SIM, nonaktifkan mode Pesawat."</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"Tidak ada kontak pada Kartu SIM."</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"Pilih kontak untuk diimpor"</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Untuk mengimpor kontak dari kartu SIM, pertama-tama matikan mode Pesawat."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Aktifkan/nonaktifkan PIN SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Ubah PIN SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"PIN lama"</string>
     <string name="newPinLabel" msgid="207488227285336897">"PIN Baru"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Konfirmasi PIN baru"</string>
-    <string name="badPin" msgid="4154316827946559447">"PIN lama yang Anda masukkan salah. Harap coba lagi."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"PIN yang Anda masukkan tidak sesuai. Harap coba lagi."</string>
+    <string name="badPin" msgid="8955102849303984935">"PIN lama yang Anda masukkan salah. Coba lagi."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"PIN yang Anda masukkan tidak cocok. Coba lagi."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Ketikkan PIN berupa 4 sampai 8 angka."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Nonaktifkan PIN SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Aktifkan PIN SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Harap tunggu…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"PIN SIM diaktifkan"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN SIM dinonaktifkan"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"PIN yang Anda ketikkan salah"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"PIN SIM berhasil diubah"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN SIM diaktifkan."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN SIM dinonaktifkan."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"PIN yang Anda ketikkan salah."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"PIN SIM berhasil diubah."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Sandi salah, SIM terkunci! Masukkan PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 yang lama"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 Baru"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Konfirmasi PIN2 baru"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"PUK2 yang Anda ketikkan salah. Harap coba lagi."</string>
-    <string name="badPin2" msgid="515218795152422178">"PIN2 lama yang Anda masukkan salah. Harap coba lagi."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"PIN2 yang Anda masukkan tidak sesuai. Harap coba lagi."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"PUK2 yang Anda ketikkan salah. Coba lagi."</string>
+    <string name="badPin2" msgid="1041576234483629991">"PIN2 lama yang Anda masukkan salah. Coba lagi."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"PIN2 yang Anda masukkan tidak cocok. Coba lagi."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Ketikkan PIN2 berupa 4 sampai 8 angka."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Ketikkan PUK2 berupa 8 angka."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 berhasil diubah"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 berhasil diubah."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Ketikkan kode PUK2."</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Sandi salah, harap ubah PIN2 dan coba lagi!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Sandi salah, SIM terkunci! Masukkan PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Sandi salah. Ubah PIN2 dan coba lagi."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Sandi salah, SIM terkunci. Masukkan PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Selesai"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Telewicara <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Kembali ke panggilan"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Lanjutkan tanpa kartu SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Tidak ada kartu SIM. Harap masukkan kartu SIM ke dalam ponsel."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Tolak"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Buka kunci"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Mengautentikasi PIN…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nomor kotak pesan"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Memanggil"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Mencoba ulang"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Telewicara"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Panggilan masuk"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Nada tunggu cdma"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Panggilan diakhiri"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Ditangguhkan"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Menutup panggilan"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Panggilan tak terjawab"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> panggilan tak terjawab"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Panggilan tak terjawab dari <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Panggilan saat ini <xliff:g id="DURATION">%s</xliff:g>"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Panggilan yang berlangsung"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Ditangguhkan"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Panggilan masuk"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Kotak pesan baru"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nomor kotak pesan tidak dikenal"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Tidak ada layanan"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Jaringan yang dipilih (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) tidak tersedia"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Akhiri"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Hubungi kembali"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Pesan"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Untuk melakukan panggilan, pertama-tama matikan mode Pesawat."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Tidak terdaftar pada jaringan."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Jaringan seluler tidak tersedia."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Panggilan tidak terkirim, tidak ada nomor valid yang dimasukkan."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Panggilan tidak terkirim."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Memulai urutan MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Memulai urutan kode fitur..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Layanan tidak didukung."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Tidak dapat mengalihkan panggilan."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Tidak dapat memisahkan panggilan."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Panggilan darurat"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Menghidupkan radio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Di luar area layanan, mencoba sekali lagi..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Panggilan tidak terkirim, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bukan nomor darurat!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Panggilan tidak terkirim, harap panggil nomor darurat!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Panggilan tidak terkirim. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bukan nomor darurat!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Panggilan tidak terkirim. Panggil nomor darurat!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Gunakan keyboard untuk memanggil"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Keypad nada sentuh"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Tahan"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Aktifkan kembali"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Akhiri"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Dialpad"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Sembunyikan"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Pengeras suara"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Bungkam"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Tambahkan panggilan"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Gabungkan panggilan"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Tukar"</string>
@@ -520,8 +447,8 @@
     <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"Impor"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"Impor semua"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"Mengimpor kenalan dari SIM"</string>
-    <string name="importToFDNfromContacts" msgid="2130620207013368580">"Impor dari kenalan"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"Mengimpor kontak dari SIM"</string>
+    <string name="importToFDNfromContacts" msgid="2130620207013368580">"Impor dari kontak"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Alat bantu dengar"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Hidupkan kompatibilitas alat bantu dengar"</string>
   <string-array name="tty_mode_entries">
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Teks ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Nada DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Nada DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Setel panjang nada DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Jauh"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Pesan Jaringan"</string>
+    <string name="network_message" msgid="4483886461245213802">"Pesan jaringan"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktifkan ponsel Anda"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Perlu dilakukan panggilan khusus untuk mengaktifkan layanan ponsel Anda. "\n\n"Setelah menekan “Aktifkan”, dengarkan instruksi yang diberikan untuk mengaktifkan ponsel."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Sentuh “Aktifkan” untuk melakukan panggilan khusus yang mengaktifkan ponsel pada jaringan seluler operator, sehingga Anda dapat melakukan panggilan dan tersambung ke jaringan data seluler."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Lewati aktivasi?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Jika Anda mengabaikan aktivasi, Anda tidak dapat melakukan panggilan atau menyambung ke jaringan data seluler (walaupun dapat menyambung ke jaringan Wi-Fi). Sampai ponsel diaktifkan, Anda akan diminta mengaktifkannya setiap kali ponsel dihidupkan."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Lewati"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktifkan"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktifkan"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Ponsel telah aktif!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Ponsel telah aktif."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Masalah dengan aktivasi"</string>
     <string name="ota_listen" msgid="162923839877584937">"Ikuti instruksi lisan sampai Anda mendengar aktivasi telah selesai."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Keypad"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Pengeras Suara"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Harap tunggu sampai ponsel Anda selesai diprogram."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Pemrograman gagal"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Tunggu sampai ponsel selesai diprogram."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Pemrograman gagal"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Ponsel Anda sekarang diaktifkan. Mungkin dibutuhkan waktu hingga 15 menit sampai layanan dimulai."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Ponsel Anda tidak aktif. "\n"Anda mungkin perlu mencari area dengan cakupan yang lebih baik (di dekat jendela, atau di luar). "\n\n"Coba lagi atau hubungi layanan pelanggan untuk opsi selengkapnya."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Ponsel Anda tidak aktif. "\n"Anda mungkin perlu menemukan area dengan cakupan yang lebih baik (di dekat jendela atau di luar). "\n\n"Coba lagi atau hubungi layanan pelanggan untuk opsi lainnya."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"KEGAGALAN SPC BERLEBIH"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Kembali"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Coba lagi"</string>
     <string name="ota_next" msgid="3904945374358235910">"Berikutnya"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Kembali"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Masukkan Mode Panggilan Balik Darurat"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Mode Panggilan Balik Darurat"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"Tidak ada sambungan data selama <xliff:g id="COUNT">%s</xliff:g> menit"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Ponsel ini akan berada pada mode panggilan balik darurat selama <xliff:g id="COUNT">%s</xliff:g> menit. Selama dalam mode ini, aplikasi mana pun yang memanfaatkan sambungan data tidak dapat digunakan. Apakah Anda ingin keluar sekarang?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Ponsel ini akan berada pada mode panggilan balik darurat selama <xliff:g id="COUNT">%s</xliff:g> menit. Selama dalam mode ini, aplikasi mana pun yang memanfaatkan sambungan data tidak dapat digunakan. Apakah Anda ingin keluar sekarang?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Ponsel akan berada dalam mode Panggil Balik Darurat selama <xliff:g id="COUNT">%s</xliff:g> menit. Selama dalam mode ini, aplikasi yang menggunakan sambungan data tidak dapat dipakai. Apakah Anda ingin keluar sekarang?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Ponsel akan berada dalam mode Panggil Balik Darurat selama <xliff:g id="COUNT">%s</xliff:g> menit. Selama dalam mode ini, aplikasi yang menggunakan sambungan data tidak dapat dipakai. Apakah Anda ingin keluar sekarang?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Tindakan yang dipilih tidak tersedia selama mode panggilan balik darurat. Ponsel akan berada pada mode ini selama <xliff:g id="COUNT">%s</xliff:g> menit. Apakah Anda ingin keluar sekarang?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Tindakan yang dipilih tidak tersedia selama mode panggilan balik darurat. Ponsel akan berada pada mode ini selama <xliff:g id="COUNT">%s</xliff:g> menit. Apakah Anda ingin keluar sekarang?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Tindakan yang dipilih tidak tersedia saat berada dalam mode Panggil Balik Darurat. Ponsel akan berada dalam mode ini selama <xliff:g id="COUNT">%s</xliff:g> menit. Apakah Anda ingin keluar sekarang?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Tindakan yang dipilih tidak tersedia saat berada dalam mode Panggil Balik Darurat. Ponsel akan berada dalam mode ini untuk <xliff:g id="COUNT">%s</xliff:g> menit. Apakah Anda ingin keluar sekarang?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Tindakan yang dipilih tidak tersedia ketika dalam panggilan darurat"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Keluar dari Mode Panggilan Balik Darurat"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Tindakan yang dipilih tidak tersedia ketika dalam panggilan darurat."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Keluar dari mode Panggilan Balik Darurat"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Ya"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Tidak"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Tolak"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Setelan kotak pesan"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;tidak disetel&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Layanan kotak pesan"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Setelan untuk <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Layanan"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Penyiapan"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Tidak disetel&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Setelan panggilan lainnya"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Panggil"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Memanggil melalui ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Seret kanan untuk menjawab"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Seret kiri untuk mematikan pendering"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Seret kiri untuk menolak"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Seret kanan untuk menjawab dan"\n"menahan panggilan aktif"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Seret kanan untuk menjawab dan"\n" mengakhiri panggilan aktif"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Seret kanan untuk menjawab dan"\n"mengakhiri panggilan yang ditangguhkan"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Jawab"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Tolak"</string>
-    <string name="contactPhoto" msgid="4713193418046639466">"foto kenalan"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Memanggil via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="contactPhoto" msgid="4713193418046639466">"foto kontak"</string>
     <string name="goPrivate" msgid="865837794424530980">"aktifkan pribadi"</string>
-    <string name="selectContact" msgid="781975788478987237">"pilih kenalan"</string>
+    <string name="selectContact" msgid="781975788478987237">"pilih kontak"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Setelan panggilan internet"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Akun panggilan internet (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Akun"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Mengelola akun dan status panggilan internet (ISP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Terima panggilan masuk"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Mengurangi masa pakai baterai"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Konfigurasikan opsi panggilan"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Gunakan panggilan internet"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Gunakan panggilan internet (Wi-Fi saja)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Untuk semua panggilan ketika jaringan data tersedia"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Hanya untuk panggilan internet"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Tanyakan pada setiap panggilan"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Untuk semua panggilan"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Pendaftaran otomatis"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Panggilan keluar melalui SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Lakukan panggilan"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Gunakan akun panggilan internet"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Selalu gunakan untuk melakukan panggilan internet"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Anda dapat menggunakan Setelan Panggilan untuk mengubah akun panggilan internet mana yang digunakan secara bawaan ketika melakukan panggilan, dengan memilih akun yang berbeda pada bagian setelan panggilan internet"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Anda dapat mengubah akun pemanggil internet mana yang digunakan secara default dari layar Telepon &gt; Setelan &gt; Setelan panggilan internet &gt; Akun."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Paggilan ponsel"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Panggilan internet"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Tidak ada akun panggilan internet"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Tidak ada akun panggilan internet pada ponsel ini. Tambahkan yang baru sekarang?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Tidak ada akun panggilan internet di ponsel ini. Apakah Anda ingin menambahkan akun sekarang?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Tambahkan"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Tambahkan akun"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Hapus akun"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Akun SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Menyimpan akun..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Menghapus akun..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Menyimpan akun..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Menghapus akun..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Simpan"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Hapus"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Tutup profil"</string>
-    <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
+    <string name="alert_dialog_ok" msgid="3580379406983564080">"Oke"</string>
     <string name="close_profile" msgid="6886968271423155284">"Tutup"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Utama"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Jadikan ini akun utama saya"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Digunakan untuk panggilan keluar"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Setelan lanjutan"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Akun utama. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Memeriksa status..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Mendaftarkan..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Masih mencoba..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Tidak menerima panggilan"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Pendaftaran akun berhenti karena tidak ada sambungan internet"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Pendaftaran akun berhenti karena tidak ada sambungan Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Pendaftaran akun gagal"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Menerima panggilan"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Mendaftarkan..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Masih mencoba..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Tidak menerima panggilan."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Pendaftaran akun terhenti karena tidak ada sambungan internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Pendaftaran akun terhenti karena tidak ada sambungan Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Pendaftaran akun gagal."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Menerima panggilan."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Pendaftaran akun gagal: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); akan mencoba lagi nanti"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Pendaftaran akun gagal: nama pengguna atau sandi salah"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Pendaftaran akun gagal: periksa nama server"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Saat ini akun ini digunakan oleh aplikasi <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Pendaftaran akun gagal: Nama pengguna atau sandi salah."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Pendaftaran akun gagal: Periksa nama server."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Saat ini akun digunakan oleh aplikasi <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Detail akun SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Detail akun SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Server"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Nomor port"</string>
     <string name="transport_title" msgid="8253139511847746640">"Jenis transportasi"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Kirim keep-alive"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Kirim pesan SIP keep-alive"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Pendaftaran otomatis"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Daftar profil secara otomatis"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Setel sebagai akun utama"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Digunakan untuk panggilan keluar"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Setelan opsional"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Opsional&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Sentuh untuk menampilkan semua"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Sentuh untuk menyembunyikan semua"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> diperlukan, tidak boleh kosong"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Nomor harus dalam 1000 dan 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> diperlukan, tidak boleh kosong."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Nomor port harus dalam rentang 1000 dan 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Tidak ada sambungan internet"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Tidak ada sambungan Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Untuk melakukan panggilan internet, periksalah sambungan internet Anda terlebih dulu"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Anda harus terhubung ke jaringan Wi-Fi untuk panggilan internet (gunakan setelan Nirkabel &amp; Jaringan)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Untuk melakukan panggilan internet, periksalah sambungan internet Anda terlebih dulu."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Anda perlu tersambung ke jaringan Wi-Fi untuk panggilan internet (gunakan setelan Nirkabel &amp; Jaringan)"</string>
     <string name="no_voip" msgid="8901474054537199865">"Panggilan internet tidak didukung"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Otomatis"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Selalu kirim"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Saya segera telepon balik."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Nanti saya telepon balik."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Tak bisa bicara skrg. Tlp lg nanti?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Pesan ubahsuaian..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Pesan ubahsuaian"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Tanggapan cepat"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edit tanggapan cepat"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"bintang"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"nol"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"pound"</string>
-    <string name="description_search_button" msgid="239929880630534731">"telusuri"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"panggil"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Pengeras suara ponsel diaktifkan."</string>
@@ -715,9 +615,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Menolak"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Getar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Getar"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Nada Dering"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Selalu"</item>
     <item msgid="1595097872875714252">"Hanya saat senyap"</item>
-    <item msgid="1458182414036878616">"Tidak pernah"</item>
+    <item msgid="1458182414036878616">"Tidak Pernah"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Nada dering ponsel"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Bergetar saat berdering"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Nada sentuh dial pad"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Nada dering"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 3ffb0dc75..a73657e24 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Numero privato"</string>
     <string name="payphone" msgid="1931775086311769314">"Telefono a monete"</string>
     <string name="onHold" msgid="9035493194749959955">"In attesa"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Chiamata corrente"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Linea occupata"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Rete occupata"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Nessuna risposta, timeout"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server non raggiungibile"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numero non raggiungibile"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Password o nome utente errato"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Chiamata da fuori rete"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Chiamata da fuori rete"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Errore del server. Riprova più tardi."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Nessun segnale"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Limite ACM superato"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Segnale cellulare disattivato"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Nessuna SIM o errore della SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Nessuna SIM o errore della SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Area non coperta dal servizio"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Chiamate in uscita limitate da FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Impossibile effettuare chiamate in uscita con il blocco chiamate attivo."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Impossibile effettuare chiamate in uscita con il blocco chiamate attivo."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Tutte le chiamate sono limitate dal controllo di accesso."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Chiamate di emergenza limitate dal controllo di accesso."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Le normali chiamate sono limitate dal controllo di accesso."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: telefono bloccato fino a ciclo alimentazione."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: chiamata interrotta."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: chiamata intercettata."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: riordinamento."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: rifiuto opzione di servizio."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: riprova ordinamento."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: accesso non riuscito."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: annullato."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Sono possibili solo chiamate di emergenza."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Numero non valido"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Numero non valido"</string>
     <string name="confCall" msgid="1904840547188336828">"Audioconferenza"</string>
     <string name="call_lost" msgid="317670617901479594">"La chiamata è stata persa."</string>
-    <string name="retry" msgid="8462986804300767852">"Riprova"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Chiama Persa"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Codice MMI avviato"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Esecuzione codice USSD..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Auricolare con cavo"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Inviare i numeri successivi?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Invio toni"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Invio toni"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Invia"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Sì"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"No"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Sostituisci carattere jolly con"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Sostituisci carattere jolly con"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Numero segreteria mancante"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Nessun numero di segreteria presente nella SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Aggiungi numero"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Caricamento..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Digita il codice PIN per sbloccare la SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM sbloccata"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Nuovo PIN della SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Ridigita il nuovo PIN della SIM per confermare"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"I PIN della SIM inseriti non corrispondono. Riprova."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Digita il codice PUK per sbloccare la SIM"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Codice PUK errato."</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Continua"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"La SIM è stata sbloccata. Sblocco del telefono..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN sblocco rete SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Sblocca"</string>
@@ -93,13 +72,13 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Richiesta sblocco rete..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Richiesta di sblocco della rete respinta."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Sblocco della rete riuscito."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Imp. chiamate GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Impostazioni di chiamata CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Nomi punti di accesso"</string>
     <string name="settings_label" msgid="3876743539816984008">"Impostazioni di rete"</string>
     <string name="voicemail" msgid="8693759337917898954">"Segreteria"</string>
+    <string name="mwi_notification_title">Indicatore di messaggio in attesa</string>
+    <string name="mwi_notification_summary">Visualizza un indicatore di notifica per un messaggio vocale in attesa</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"ST:"</string>
     <string name="networks" msgid="8873030692174541976">"Operatori di rete"</string>
     <string name="call_settings" msgid="6112441768261754562">"Impostazioni chiamate"</string>
@@ -109,6 +88,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Altre impostazioni chiamata solo CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Impostazioni servizio di rete"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"ID chiamante"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Caricamento impostazioni…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Numero nascosto per chiamate in uscita"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Numero visualizzato in chiamate in uscita"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Usa impostazioni operatore per visualizzare il mio numero in chiamate in uscita"</string>
@@ -127,17 +107,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Numero se occupato"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Deviazione al numero <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Disattivato"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Il tuo gestore di telefonia mobile non supporta la disattivazione dell\'inoltro chiamate quando il telefono è occupato."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Il tuo operatore non supporta la disattivazione dell\'inoltro chiamate quando il telefono è occupato."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Devia se non si risponde"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Numero se non si risponde"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Deviazione al numero <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Disattivato"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Il tuo gestore di telefonia mobile non supporta la disattivazione dell\'inoltro chiamate quando il telefono non risponde."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Il tuo operatore non supporta la disattivazione dell\'inoltro chiamate quando il telefono non risponde."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Devia se non raggiungibile"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Numero se non raggiungibile"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Deviazione al numero <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Disattivato"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Il tuo gestore di telefonia mobile non supporta la disattivazione dell\'inoltro chiamate quando il telefono non è raggiungibile."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Il tuo operatore non supporta la disattivazione dell\'inoltro chiamate quando il telefono non è raggiungibile."</string>
     <string name="updating_title" msgid="6146755386174019046">"Impostazioni chiamate"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Errore durante aggiornam. impostaz. chiamate"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Lettura impostazioni..."</string>
@@ -145,8 +125,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Annullamento impostazioni..."</string>
     <string name="response_error" msgid="6674110501330139405">"Risposta imprevista dalla rete."</string>
     <string name="exception_error" msgid="7027667130619518211">"Errore di rete o della SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Operazioni consentite solo sui numeri di selezione fissa."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Attiva il segnale cellulare per visualizzare queste impostazioni."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"L\'impostazione relativa ai numeri di selezione fissa dell\'applicazione sul tuo telefono è attiva. Di conseguenza, alcune funzioni legate alle chiamate non funzionano."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Attiva il segnale cellulare per visualizzare queste impostazioni."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Attiva"</string>
     <string name="disable" msgid="7274240979164762320">"Disattiva"</string>
@@ -156,10 +136,9 @@
     <item msgid="7876195870037833661">"Nascondi numero"</item>
     <item msgid="1108394741608734023">"Mostra numero"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Salva numero segreteria"</string>
     <string name="vm_changed" msgid="380744030726254139">"Numero segreteria modificato."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Modifica del numero di segreteria non riuscita."\n"Se il problema persiste, contattare l\'operatore di telefonia."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Modifica del numero di inoltro non riuscita."\n"Se il problema persiste, contattare l\'operatore di telefonia."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Modifica del numero della segreteria non riuscita."\n"Contatta il tuo operatore se il problema persiste."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Modifica del numero di deviazione non riuscita."\n"Contatta il tuo operatore se il problema persiste."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Recupero e salvataggio delle impostazioni correnti dei numeri di deviazione non riusciti. "\n"Passare comunque al nuovo fornitore?"</string>
     <string name="no_change" msgid="3186040086622435212">"Nessuna modifica effettuata."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Scegli il servizio di segreteria"</string>
@@ -171,66 +150,73 @@
     <string name="search_networks" msgid="1601136049300882441">"Cerca reti"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Errore durante la ricerca di reti."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrazione su <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"La SIM non consente la connessione a questa rete."</string>
-    <string name="connect_later" msgid="500090982903469816">"Impossibile connettersi a questa rete adesso. Riprova più tardi."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"La scheda SIM non consente la connessione a questa rete."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Impossibile connettersi a questa rete in questo momento. Riprova più tardi."</string>
     <string name="registration_done" msgid="495135664535876612">"Registrato sulla rete."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Seleziona un operatore di rete"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Scegli un operatore di rete"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Cerca tutte le reti disponibili"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Seleziona automaticamente"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Seleziona automaticamente la rete preferita"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Registrazione automatica..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Scegli automaticamente"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Scegli automaticamente la rete preferita"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Registrazione automatica..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Modalità rete"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Cambia la modalità di funzionamento della rete"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Modalità di rete preferita"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"Modalità di rete preferita: WCDMA (preferita)"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"Modalità di rete preferita: solo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"Modalità di rete preferita: solo WCDMA"</string>
-    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"Modalità di rete preferita: GSM/WCDMA"</string>
+    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"Modalità di rete preferita: GSM / WCDMA"</string>
     <string name="preferred_network_mode_cdma_summary" msgid="3175690187294334241">"Modalità di rete preferita: CDMA"</string>
     <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"Modalità di rete preferita: CDMA/EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Modalità di rete preferita: solo CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Modalità di rete preferita: solo EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modalità di rete preferita: LTE/CDMA"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modalità di rete preferita: LTE / CDMA"</string>
+    <string name="preferred_network_mode_lte_gsm_summary">Modalità di rete preferita: LTE / GSM / WCDMA</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary">Modalità di rete preferita: LTE / CDMA / EvDo</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">Modalità di rete preferita: LTE / CMDA / EvDo / GSM / WCDMA</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item>Globale</item>
     <item msgid="3273348576277144124">"Solo EvDo"</item>
     <item msgid="454610224530856274">"CDMA senza EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo automatico"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA automatico"</item>
+    <item msgid="648505122852496166">"CDMA / EvDo automatico"</item>
+    <item msgid="7148247646407324800">"GSM / WCDMA automatico"</item>
     <item msgid="5189164180446264504">"Solo WCDMA"</item>
     <item msgid="5714714953966979187">"Solo GSM"</item>
-    <item msgid="4775796025725908913">"GSM/WCDMA preferito"</item>
+    <item msgid="8508331239546115206">"GSM / WCDMA preferito"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item>Solo LTE</item>
+    <item>LTE / CMDA / EvDo / GSM / WCDMA</item>
+    <item>LTE / CDMA / EvDo</item>
+    <item msgid="7002474529872452266">"LTE / CDMA"</item>
+    <item msgid="5541716989029928208">"CDMA / EvDo automatico"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_lte_gsm">
+    <item>LTE / GSM / WCDMA</item>
+    <item>GSM / WCDMA preferito</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Dati attivati"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Attiva l\'accesso ai dati sulla rete cellulare"</string>
     <string name="roaming" msgid="8871412572928323707">"Roaming dati"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"Connessione a servizi di dati in caso di roaming"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"Connessione a servizi di dati in roaming"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Connettività dati persa: hai lasciato la rete del tuo operatore con il roaming dati disattivato."</string>
+    <string name="roaming_enable" msgid="7331106985174381987">"Connetti a servizi di dati se in roaming"</string>
+    <string name="roaming_disable" msgid="1843417228755568110">"Non connettere a servizi di dati se in roaming"</string>
+    <string name="national_roaming">Roaming dati nazionale</string>
+    <string name="national_roaming_enable">Connetti a servizi di dati se in roaming nazionale</string>
+    <string name="national_roaming_disable">Non connettere a servizi di dati se in roaming nazionale</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Connettività dati persa: hai lasciato la rete del tuo operatore con il roaming dati disattivato."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Consentire il roaming dati? I costi potrebbero essere elevati."</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Opzioni GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Opzioni CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Utilizzo dati"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Norme dati gestore"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Dati utilizzati nel periodo corrente"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Periodo utilizzo dati"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Norme velocità dati"</string>
     <string name="throttle_help" msgid="243651091785169900">"Ulteriori informazioni"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for throttle_status_subtext (1657318943142085170) -->
-    <skip />
-    <!-- String.format failed for translation -->
-    <!-- no translation found for throttle_data_usage_subtext (6029276011123694701) -->
-    <skip />
+    <string name="throttle_status_subtext"><xliff:g id="used">%1$s</xliff:g> (<xliff:g id="used">%2$d</xliff:g>\u066A) di <xliff:g id="used">%3$s</xliff:g> massimo del periodo\nIl periodo successivo comincierà fra <xliff:g id="used">%4$d</xliff:g> giorni (<xliff:g id="used">%5$s</xliff:g>)</string>
+    <string name="throttle_data_usage_subtext"><xliff:g id="used">%1$s</xliff:g> (<xliff:g id="used">%2$d</xliff:g>\u066A) di <xliff:g id="used">%3$s</xliff:g> massimo dell\'intervallo</string>
     <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> max superato"\n"Velocità dati ridotta a <xliff:g id="USED_1">%2$d</xliff:g> Kb/s"</string>
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>% del ciclo trascorso"\n"Il periodo succ. inizia tra <xliff:g id="USED_1">%2$d</xliff:g> gg (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Velocità dati ridotta a <xliff:g id="USED">%1$d</xliff:g> Kb/s se limite utilizzo dati superato"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Informazioni sulla norme di utilizzo dati della rete cellulare del gestore"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS cell broadcast"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS cell broadcast"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS cell broadcast"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS cell broadcast attivato"</string>
@@ -271,15 +257,6 @@
     <item msgid="1858401628368130638">"Coreano"</item>
     <item msgid="1933212028684529632">"Cinese"</item>
     <item msgid="1908428006803639064">"Ebraico"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Lingue"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Meteo locale"</string>
@@ -309,9 +286,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Opportunità di impiego"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Opportunità di impiego attivate"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Opportunità di impiego disattivate"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Medicina, salute e ospedale"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Medicina, salute e ospedale attivate"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Medicina, salute e ospedale disattivate"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Medicina, salute e ospedale"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Medicina, salute e ospedale attivate"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Medicina, salute e ospedale disattivate"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"News di tecnologia"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"News di tecnologia attivate"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"News di tecnologia disattivate"</string>
@@ -326,35 +303,17 @@
     <item msgid="8912042051809329533">"Solo WCDMA"</item>
     <item msgid="8776934131146642662">"Solo GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA preferito)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Usa solo reti 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Risparmia batteria"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Selezione sistema"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Cambia la modalità roaming CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Cambia la modalità roaming CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selezione sistema"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Solo domestica"</item>
     <item msgid="1205664026446156265">"Automatiche"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Modalità roaming CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Cambia la modalità roaming CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Modalità roaming CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Solo reti domestiche"</item>
-    <item msgid="8174642753290624634">"Reti affiliate"</item>
-    <item msgid="2241951431403168661">"Qualsiasi rete"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Abbonamento CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Preferenze di rete CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Non ancora implementato."</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Preferenze di rete CDMA"</string>
@@ -363,21 +322,11 @@
     <item msgid="6143696847467859795">"Solo CDMA"</item>
     <item msgid="2683555124647197574">"Solo EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Abbonamento CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Cambia tra RUIM/SIM e NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"abbonamento"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Attiva dispositivo"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Imposta servizio dati"</string>
@@ -394,18 +343,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Gestisci numeri di selezione fissa"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Cambia PIN per accesso FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Gestisci elenco numeri"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Privacy pacchetti vocali"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Privacy pacchetti vocali"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Attiva modalità privacy ottimizzata"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Modalità TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Attiva modalità TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Modalità TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Imposta modalità TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Nuovo tentativo automatico"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Attiva la modalità Nuovo tentativo automatico"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Nuovo tentativo automatico"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Attiva la modalità Nuovo tentativo automatico"</string>
     <string name="menu_add" msgid="1882023737425114762">"Aggiungi contatto"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Modifica contatto"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Elimina contatto"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Inserisci PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Digita PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Nome"</string>
     <string name="number" msgid="7905950798349903858">"Numero"</string>
     <string name="save" msgid="4094274636321939086">"Salva"</string>
@@ -418,56 +365,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Elimina numero selezione fissa"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Eliminazione numero selezione fissa..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Numero di selezione fissa eliminato."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN non aggiornato: il PIN inserito non è corretto."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN non aggiornato: il numero non superare 20 cifre."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN non aggiornato perché il PIN inserito non è corretto."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN non è stato aggiornato perché il numero non può superare 20 cifre."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN non aggiornato. Il codice PIN2 non era corretto o il numero di telefono è stato rifiutato."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lettura da SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Nessun contatto presente nella SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Seleziona contatti da importare"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Per importare i contatti dalla carta SIM, disattiva la modalità aereo."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Per importare i contatti dalla scheda SIM, prima disattiva la modalità aereo."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Attiva/disattiva PIN di SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Cambia PIN SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN della SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"PIN attuale"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Nuovo PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Conferma nuovo PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Il PIN attuale digitato è errato. Riprova."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"I PIN inseriti non corrispondono. Riprova."</string>
+    <string name="badPin" msgid="8955102849303984935">"Il vecchio PIN digitato è errato. Riprova."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"I PIN digitati non corrispondono. Riprova."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Il PIN deve essere di 4-8 numeri."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Disattiva PIN SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Attiva PIN di SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Attendere..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"PIN della SIM attivato"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN della SIM disattivato"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Il PIN digitato è errato"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"PIN della SIM modificato"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN della SIM attivato."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN della SIM disattivato."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Il PIN digitato è errato."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"PIN della SIM modificato."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Password errata. La SIM è bloccata. Inserisci il codice PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 attuale"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nuovo PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Conferma nuovo PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Il PUK2 digitato è errato. Riprova."</string>
-    <string name="badPin2" msgid="515218795152422178">"Il vecchio PIN2 digitato è errato. Riprova."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"I PIN2 inseriti non corrispondono. Riprova."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Il PUK2 digitato è errato. Riprova."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Il vecchio PIN2 digitato è errato. Riprova."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"I PIN2 digitati non corrispondono. Riprova."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Il PIN2 deve essere di 4-8 numeri."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Il PUK2 deve essere di 8 numeri."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 modificato"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 modificato."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Digita il codice PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Password errata. Modifica il PIN2 e riprova."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Password errata. La SIM è bloccata. Inserire il codice PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Password errata. Modifica il PIN2 e riprova."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Password errata. La SIM è bloccata. Inserisci il codice PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Fine"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Audioconferenza <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Torna a chiamata"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Continua senza SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Nessuna SIM trovata. Inserisci una SIM nel telefono."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Chiudi"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Sblocca"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Autenticazione PIN..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numero segreteria"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Chiamata in corso"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Nuovo tentativo"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Audioconferenza"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Chiamata in arrivo"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Chiamata CDMA in attesa"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Chiamata terminata"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"In attesa"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"In fase di chiusura"</string>
@@ -477,7 +418,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chiamate senza risposta"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> chiamate senza risposta"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Chiamata senza risposta da <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Chiamata corrente (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Chiamata in corso"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"In attesa"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Chiamata ricevuta"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nuovo msg vocale"</string>
@@ -486,13 +427,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Numero segreteria sconosciuto"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nessun servizio"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Rete selezionata (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) non disponibile"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Riaggancia"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Richiama"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Messaggio"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Per fare una telefonata, disattiva la modalità aereo."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Non registrato sulla rete."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Rete cellulare non disponibile."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Chiamata non inviata. Nessun numero valido inserito."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Chiamata non inviata."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Inizio sequenza MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Inizio sequenza codice funzione..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Servizio non supportato."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Impossibile passare all\'altra chiamata."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Impossibile separare le chiamate."</string>
@@ -504,18 +447,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Chiamata di emergenza"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Attivazione segnale cellulare..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Area non coperta dal servizio. Nuovo tentativo..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Chiamata non inviata. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> non è un numero di emergenza."</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Chiamata non inviata. Componi un numero di emergenza."</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Chiamata non inviata. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> non è un numero di emergenza."</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Chiamata non inviata. Componi un numero di emergenza."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Usa tastiera"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Selezione a toni"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"In attesa"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Riprendi"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Chiudi"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Tastierino"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Nascondi"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Vivavoce"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"No audio"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Aggiungi"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Unisci"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Scambia"</string>
@@ -534,36 +472,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Testo ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Toni DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Toni DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Imposta la lunghezza dei toni DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normali"</item>
     <item msgid="2883365539347850535">"Lunghi"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Messaggio di rete"</string>
+    <string name="network_message" msgid="4483886461245213802">"Messaggio di rete"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Attiva il telefono"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"È necessario effettuare una chiamata speciale per attivare il servizio telefonico. "\n\n"Dopo avere premuto \"Attiva\", ascolta le istruzioni fornite per attivare il telefono."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Tocca \"Attiva\" per effettuare una chiamata speciale che attiva il telefono sulla rete cellulare del tuo gestore, in modo da poter effettuare chiamate e poterti connettere a reti di dati mobili."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Saltare l\'attivazione?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Se salti l\'attivazione, non potrai effettuare chiamate o connetterti a reti di dati mobili (ma potrai connetterti a reti Wi-Fi). Finché non attiverai il telefono, ti verrà chiesto di attivarlo ogni volta che lo accendi."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Salta"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Attiva"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Attiva"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Il telefono è attivo."</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Il telefono è attivo."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problema con l\'attivazione"</string>
     <string name="ota_listen" msgid="162923839877584937">"Segui le istruzioni vocali fino al segnale di attivazione completata."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Tastierino"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Vivavoce"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Attendi la programmazione del telefono."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programmazione non riuscita"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Attendi la programmazione del telefono."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programmazione non riuscita"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Il telefono è attivo. L\'avvio del servizio potrebbe richiedere fino a 15 minuti."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Il telefono non è stato attivato. "\n"Potrebbe essere necessario trovare una zona con copertura migliore (vicino a una finestra o all\'esterno). "\n\n"Riprova o contatta l\'assistenza tecnica per conoscere altre soluzioni."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Il telefono non è stato attivato. "\n"Potrebbe essere necessario trovare una zona con copertura migliore (vicino a una finestra o all\'esterno). "\n\n"Riprova o contatta l\'assistenza clienti per conoscere altre soluzioni."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"TROPPI ERRORI SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Indietro"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Riprova"</string>
     <string name="ota_next" msgid="3904945374358235910">"Avanti"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Indietro"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Modalità di richiamata di emergenza attivata"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Modalità di richiamata di emergenza"</string>
@@ -573,87 +506,71 @@
     <item quantity="other" msgid="3122217344579273583">"Nessuna connessione dati per <xliff:g id="COUNT">%s</xliff:g> minuti"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Il telefono sarà in modalità di richiamata di emergenza per <xliff:g id="COUNT">%s</xliff:g> minuto. In questa modalità non è possibile utilizzare alcuna applicazione che richiede una connessione dati. Uscire ora?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Il telefono sarà in modalità di richiamata di emergenza per <xliff:g id="COUNT">%s</xliff:g> minuti. In questa modalità non è possibile utilizzare alcuna applicazione che richiede una connessione dati. Uscire ora?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Il telefono sarà in modalità di richiamata di emergenza per <xliff:g id="COUNT">%s</xliff:g> minuto. In questa modalità non è possibile utilizzare alcuna applicazione che faccia uso di una connessione dati. Uscire adesso?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Il telefono sarà in modalità di richiamata di emergenza per <xliff:g id="COUNT">%s</xliff:g> minuti. In questa modalità non è possibile utilizzare alcuna applicazione che faccia uso di una connessione dati. Uscire adesso?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"L\'azione selezionata non è disponibile in modalità di richiamata di emergenza. Il telefono sarà in questa modalità per <xliff:g id="COUNT">%s</xliff:g> minuto. Uscire ora?"</item>
-    <item quantity="other" msgid="3489076611710869904">"L\'azione selezionata non è disponibile in modalità di richiamata di emergenza. Il telefono sarà in questa modalità per <xliff:g id="COUNT">%s</xliff:g> minuti. Uscire ora?"</item>
+    <item quantity="one" msgid="2585506997024726599">"L\'azione selezionata non è disponibile in modalità di richiamata di emergenza. Il telefono sarà in questa modalità per <xliff:g id="COUNT">%s</xliff:g> minuto. Uscire adesso?"</item>
+    <item quantity="other" msgid="6115622137771382224">"L\'azione selezionata non è disponibile in modalità di richiamata di emergenza. Il telefono sarà in questa modalità per <xliff:g id="COUNT">%s</xliff:g> minuti. Uscire adesso?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"L\'azione selezionata non è disponibile in modalità di chiamata di emergenza"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Uscita dalla modalità di richiamata di emergenza"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"L\'azione selezionata non è disponibile in modalità di chiamata di emergenza."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Uscita dalla modalità di richiamata di emergenza"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Sì"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"No"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Ignora"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Impostazioni segreteria"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;non impostato&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Servizio di segreteria"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Impostazioni per <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Servizio"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Configurazione"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Non impostato&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Altre impostazioni chiamate"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Componi"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Chiamata in corso tramite ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Trascina a destra per rispondere"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Trascina a sinistra per disattivare la suoneria"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Trascina a sinistra per rifiutare"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Trascina a destra per rispondere e"\n"mettere in attesa la chiamata attiva"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Trascina a destra per rispondere e"\n"terminare la chiamata attiva"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Trascina a destra per rispondere e"\n"terminare la chiamata in attesa"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Risposta"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Rifiuta"</string>
+    <string name="dialer_ui_settings_title">"Impostazioni tastierino"</string>
+    <string name="dialer_ui_settings_summary">"Impostazioni per il tastierino"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Chiamata tramite <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"foto contatto"</string>
     <string name="goPrivate" msgid="865837794424530980">"Privato"</string>
     <string name="selectContact" msgid="781975788478987237">"seleziona contatto"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Impostazioni chiamate Internet"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Account di chiamata Internet (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Account"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Gestisci gli account di chiamata Internet (SIP) e lo stato"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Ricevi chiamate in arrivo"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Riduce la durata della batteria"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Configura opzioni di chiamata"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Usa chiamata Internet"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Usa chiamata Internet (solo Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Per tutte le chiamate quando è disponibile la rete dati"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Solo per chiamate Internet"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Chiedi per ogni chiamata"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Per tutte le chiamate"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Registrazione automatica"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Chiamata in uscita tramite SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Effettua chiamata"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Usa account per chiamate Internet:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Utilizza sempre per effettuare chiamate Internet"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Puoi utilizzare le impostazioni di chiamata per cambiare l\'account per chiamate Internet da utilizzare per impostazione predefinita per effettuare chiamate, selezionando un altro account nelle impostazioni per le chiamate Internet."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Puoi cambiare l\'account di chiamata Internet da utilizzare per impostazione predefinita dallo schermo Telefono &gt; Impostazioni &gt; Impostazioni chiamate Internet &gt; Account."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Chiamata con telefono cellulare"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Chiamata Internet"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Nessun account per chiamate Internet"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Non esistono account di chiamata Internet su questo telefono. Aggiungerne uno adesso?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Non ci sono account di chiamata Internet su questo telefono. Aggiungerne uno adesso?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Aggiungi"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Aggiungi account"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Rimuovi account"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Account SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Salvataggio dell\'account..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Rimozione dell\'account..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Salvataggio dell\'account..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Rimozione dell\'account..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Salva"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Ignora"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Chiudi il profilo"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Chiudi"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Principale"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Rendi account principale"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Utilizzato per le chiamate in uscita"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Impostazioni avanzate"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Account principale. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Controllo stato..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Registrazione..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Tentativo ancora in corso..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Ricezione chiamate non attiva"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Registrazione account interrotta per mancanza di una connessione a Internet"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Registrazione account interrotta per mancanza di una connessione Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Registrazione account non riuscita"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Ricezione chiamate attiva"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registrazione..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Tentativo ancora in corso..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Ricezione chiamate non attiva."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Registrazione account interrotta per mancanza di una connessione a Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Registrazione account interrotta per mancanza di una connessione Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Registrazione account non riuscita."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Ricezione chiamate attiva."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Registrazione account non riuscita: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); più tardi verrà eseguito un nuovo tentativo"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Registrazione account non riuscita: password o nome utente errato"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Registrazione account non riuscita: verifica il nome del server"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Questo account è attualmente utilizzato dall\'applicazione <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Registrazione account non riuscita: password o nome utente errato."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Registrazione account non riuscita: verifica il nome del server."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Questo account è attualmente utilizzato dall\'applicazione <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Dettagli account SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Dettagli account SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Server"</string>
@@ -664,9 +581,6 @@
     <string name="port_title" msgid="5952939408078626657">"Numero porta"</string>
     <string name="transport_title" msgid="8253139511847746640">"Tipo trasporto"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Invia keep-alive"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Invia messaggi keep-alive SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Registrazione automatica"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Registra automaticamente il profilo"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Account principale"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Utilizzato per chiamate in uscita"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Impostazioni facoltative"</string>
@@ -677,12 +591,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Facoltativo&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Tocca per mostrare tutto"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Tocca per nascondere tutto"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> è obbligatorio e non può essere lasciato vuoto"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Il numero della porta deve essere compreso tra 1000 e 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> è obbligatorio e non può essere lasciato vuoto."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Il numero della porta deve essere compreso tra 1000 e 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Nessuna connessione Internet"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Nessuna connessione Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Prima di effettuare una chiamata via Internet controlla la tua connessione a Internet"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Devi essere collegato a una rete Wi-Fi per effettuare chiamate via Internet (utilizza le Impostazioni wireless e reti)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Prima di effettuare una chiamata via Internet, controlla la tua connessione a Internet."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Devi essere collegato a una rete Wi-Fi per effettuare chiamate via Internet (utilizza le impostazioni Wireless e reti)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Chiamate Internet non supportate"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automatico"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Invia sempre"</string>
@@ -691,7 +605,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Ti richiamo subito."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Ti chiamo dopo."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Non posso parlare ora. Mi chiami dopo?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Personalizza messaggio..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Messaggio personalizzato"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Risposte rapide"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Modifica risposte rapide"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -709,7 +623,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"asterisco"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"sterlina"</string>
-    <string name="description_search_button" msgid="239929880630534731">"cerca"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"componi"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Vivavoce attivo."</string>
@@ -719,9 +632,31 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Rifiuta"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrazione"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrazione"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Suoneria"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Sempre"</item>
-    <item msgid="1595097872875714252">"Solo in modalità silenziosa"</item>
+    <item msgid="1595097872875714252">"Solo in modalità Silenzioso"</item>
     <item msgid="1458182414036878616">"Mai"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Suoneria telefono"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrazione quando squilla"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Toni tastierino numerico"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Suoneria"</string>
+    <string name="perm_change_mobile_network">Cambia rete (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Un\'applicazione con questo permesso può passare da 2G a 3G e viceversa in qualsiasi momento. Il 3G è più veloce, consuma più batteria e può anche farti spendere di più.</string>
+    <string name="noise_suppression_title">Attenuazione rumore</string>
+    <string name="noise_suppression_summary">Riduce il rumore di sottofondo presente nelle chiamate</string>
+    <string name="phone_number_label">Il mio numero di telefono</string>
+    <string name="phone_number_summary">Imposta il numero di telefono per questo dispositivo</string>
+    <string name="advanced_setting">Impostazioni avanzate</string>
+    <string name="keep_proximity_sensor_on">Sensore di prossimità</string>
+    <string name="keep_proximity_sensor_on_sum">Non disattivare il sensore di prossimità durante una chiamata con le cuffie</string>
+    <string name="lockscreen_if_call_ends_with_screenoff">Blocca a fine chiamata</string>
+    <string name="lockscreen_if_call_ends_with_screenoff_sum">Blocca automaticamente il dispositivo quando una chiamata finisce</string>
+    <string name="vibrate_outgoing">Vibra alla risposta</string>
+    <string name="vibrate_call_waiting">Vibra quando in attesa</string>
+    <string name="vibrate_hangup">Vibra al termine</string>
+    <string name="vibrate_45">Vibra ogni 45 sec</string>
+    <string name="vibrate_45_sum">Vibra ogni 45 secondi durante le chiamate in uscita</string>
 </resources>
+
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 18538f771..eccab00d0 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"מספר פרטי"</string>
     <string name="payphone" msgid="1931775086311769314">"טלפון ציבורי"</string>
     <string name="onHold" msgid="9035493194749959955">"בהמתנה"</string>
-    <string name="ongoing" msgid="8300874342848721367">"שיחה נוכחית"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"הקו לא פנוי"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"רשת לא פנויה"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"אין תגובה, החיבור הסתיים"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"אין אפשרות להשיג את השרת"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"אין אפשרות להשיג את המספר"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"שם משתמש או סיסמה שגויים"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"שיחה מחוץ לרשת"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"שיחה מחוץ לרשת"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"שגיאת שרת. נסה שוב מאוחר יותר."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"אין אות"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"חריגה ממגבלת ACM"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"רדיו כבוי"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"אין SIM, או שגיאת SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"אין SIM או שגיאת SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"מחוץ לאזור שירות"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"שיחות יוצאות מוגבלות על ידי FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"אינך יכול לבצע שיחות יוצאות כאשר חסימת שיחות מופעלת."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"לא ניתן לבצע שיחות יוצאות כאשר חסימת שיחות מופעלת."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"כל השיחות מוגבלות על ידי בקרת גישה."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"שיחות חירום מוגבלות על ידי בקרת גישה."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"שיחות רגילות מוגבלות על ידי בקרת גישה."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: הטלפון נעול עד לכיבוי והפעלה מחדש."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: השיחה בוטלה."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: השיחה עוכבה."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: סידור מחדש."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: דחיית אפשרות שירות."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: ניסיון חוזר להזמנה."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: הגישה נכשלה."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: תפוס."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"ניתן לבצע רק שיחות חירום."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"מספר לא תקף"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"מספר לא חוקי"</string>
     <string name="confCall" msgid="1904840547188336828">"שיחת ועידה"</string>
     <string name="call_lost" msgid="317670617901479594">"השיחה אבדה."</string>
-    <string name="retry" msgid="8462986804300767852">"נסה שוב"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"שיחה אבדה"</string>
     <string name="ok" msgid="3811371167865772377">"אישור"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"קוד MMI הופעל"</string>
     <string name="ussdRunning" msgid="485588686340541690">"קוד USSD פועל…"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"אוזניות קוויות"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"לשלוח את הצלילים הבאים?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"שולח צלילים"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"שולח צלילים"\n</string>
     <string name="send_button" msgid="4106860097497818751">"שלח"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"כן"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"לא"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"החלף תו כללי ב:"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"החלף את התו הכללי ב"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"חסר מספר של דואר קולי"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"בכרטיס ה-SIM לא מאוחסן מספר של דואר קולי."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"הוסף מספר"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"טוען..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"הקלד קוד PIN כדי לבטל את נעילת כרטיס ה-SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"בוטלה נעילת SIM"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"קוד PIN חדש של SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"הקלד קוד PIN חדש של SIM שוב כדי לאשר"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"קודי ה-PIN של ה-SIM שהקלדת אינם תואמים. נסה שוב."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"הקלד קוד PUK כדי לבטל נעילה של כרטיס SIM."</string>
-    <string name="badPuk" msgid="3213017898690275965">"קוד PUK שגוי!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"המשך"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"בוטלה החסימה של כרטיס SIM. מבטל את חסימת הטלפון..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN לביטול נעילה של רשת SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"בטל נעילה"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"מבקש ביטול נעילת רשת..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"הבקשה לביטול נעילת הרשת נכשלה."</string>
     <string name="unlock_success" msgid="6770085622238180152">"ביטול נעילת הרשת התבצע בהצלחה."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"הגדרות שיחה של GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"הגדרות שיחה של CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"שמות של נקודות גישה"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"הגדרות שיחה נוספות של CDMA בלבד"</string>
     <string name="labelNwService" msgid="4699970172021870983">"הגדרות שירות רשת"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"זיהוי מתקשר"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"טוען הגדרות..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"המספר מוסתר בשיחות יוצאות"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"מספר המוצג בשיחות יוצאות"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"השתמש בהגדרות ברירת המחדל של המפעיל כדי להציג את המספר שלי בשיחות יוצאות"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"מספר כאשר לא פנוי"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"מעביר אל <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"מושבת"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"הספק שלך לא תומך בהשבתה של העברת שיחות כאשר הטלפון תפוס."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"הספק שלך אינו תומך בהשבתה של העברת שיחות כאשר הטלפון תפוס."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"העבר כשאין מענה"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"מספר לחיוג כשאין מענה"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"מעביר אל <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"מושבת"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"הספק שלך לא תומך בהשבתה של העברת שיחות כאשר אין מענה בטלפון."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"הספק אינו תומך בהשבתה של העברת שיחות כאשר אין מענה בטלפון."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"העבר כשלא ניתן להשיג"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"המספר לחיוג כשלא ניתן להשיג"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"מעביר אל <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"מושבת"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"הספק שלך לא תומך בהשבתה של העברת שיחות כאשר לא ניתן להשיג את הטלפון."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"הספק שלך לא תומך בהשבתה של העברת שיחות כאשר הטלפון כבוי."</string>
     <string name="updating_title" msgid="6146755386174019046">"הגדרות שיחה"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"שגיאה בהגדרות שיחה"</string>
     <string name="reading_settings" msgid="1920291699287055284">"קורא הגדרות…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"מאחזר הגדרות הקודמות…"</string>
     <string name="response_error" msgid="6674110501330139405">"תגובה לא צפויה מהרשת."</string>
     <string name="exception_error" msgid="7027667130619518211">"שגיאת רשת או שגיאה של כרטיס SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"הפעולות מותרות רק במספרי חיוג קבועים."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"הפעל את הרדיו לפני העיון בהגדרות אלה."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"הגדרת מספרי החיוג הקבועים של יישום הטלפון שלך מופעלת. כתוצאה מכך, חלק מהתכונות הקשורות לשיחות לא פועלות."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"הפעל את הרדיו לפני ההצגה של הגדרות אלה."</string>
     <string name="close_dialog" msgid="2365884406356986917">"אישור"</string>
     <string name="enable" msgid="1059008390636773574">"הפעל"</string>
     <string name="disable" msgid="7274240979164762320">"השבת"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"הסתר מספר"</item>
     <item msgid="1108394741608734023">"הצג מספר"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"שמור מספר דואר קולי"</string>
     <string name="vm_changed" msgid="380744030726254139">"המספר של הדואר הקולי השתנה."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"נכשל הניסיון לשנות את המספר של הדואר הקולי."\n"פנה אל הספק אם בעיה זו נמשכת."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"שינוי מספר העברה נכשל."\n"פנה אל הספק אם בעיה זו נמשכת."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"לא ניתן לשנות את מספר הגישה לדואר הקולי."\n"אם הבעיה נמשכת, פנה לספק."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"לא ניתן לשנות את מספר ההעברה."\n"אם הבעיה נמשכת, פנה לספק."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"לא ניתן לאחזר ולשמור את הגדרות מספר ההעברה הנוכחי."\n"לעבור בכל זאת לספק החדש?"</string>
     <string name="no_change" msgid="3186040086622435212">"לא בוצעו שינויים."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"בחר שירות של דואר קולי"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"חפש רשתות"</string>
     <string name="network_query_error" msgid="6828516148953325006">"שגיאה במהלך חיפוש רשתות."</string>
     <string name="register_on_network" msgid="9055203954040805084">"נרשם ב-<xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"כרטיס SIM לא מאפשר חיבור לרשת זו."</string>
-    <string name="connect_later" msgid="500090982903469816">"לא ניתן להתחבר לרשת זו כעת. נסה שוב מאוחר יותר."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"כרטיס ה-SIM לא מאפשר חיבור לרשת זו."</string>
+    <string name="connect_later" msgid="2308119155752343975">"לא ניתן להתחבר לרשת זו כעת. נסה שוב מאוחר יותר."</string>
     <string name="registration_done" msgid="495135664535876612">"רשום ברשת."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"בחר מפעיל רשת"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"בחר ספק רשת"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"חפש את כל הרשתות הזמינות"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"בחר באופן אוטומטי"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"בחר באופן אוטומטי רשת מועדפת"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"רישום אוטומטי..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"בחר אוטומטית"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"בחר רשת מועדפת באופן אוטומטי"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"רישום אוטומטי..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"מצב רשת"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"שנה את מצב ההפעלה של הרשת"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"מצב רשת מועדפת"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"מצב רשת מועדפת: EvDo בלבד"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"מצב רשת מועדפת: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"EvDo בלבד"</item>
     <item msgid="454610224530856274">"CDMA ללא EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo אוטומטי"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA אוטומטי"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo אוטומטי"</item>
+    <item msgid="7148247646407324800">"GSM/‏WCDMA אוטומטי"</item>
     <item msgid="5189164180446264504">"WCDMA בלבד"</item>
     <item msgid="5714714953966979187">"GSM בלבד"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA מועדף"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA מועדפת"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"נתונים מופעלים"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"נדידת נתונים"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"התחבר לשירותי נתונים בעת נדידה"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"התחבר לשירותי נתונים בעת נדידה"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"איבדת את קישוריות הנתונים כיוון שעזבת את הרשת הביתית בזמן שנדידת הנתונים היתה כבויה."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"איבדת את קישוריות הנתונים כיוון שעזבת את הרשת הביתית כשהנדידה כבויה."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"לאפשר נדידת נתונים? אתה עלול לצבור חיובי נדידה משמעותיים!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"אפשרויות GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"אפשרויות CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"שימוש בנתונים"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"מדיניות נתונים של ספק"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"נתונים שנעשה בהם שימוש בתקופה הנוכחית"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"תקופת השימוש בנתונים"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"מדיניות קצב נתונים"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>?? מהמחזור חלפו"\n"התקופה הבאה מתחילה בעוד <xliff:g id="USED_1">%2$d</xliff:g> ימים (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"קצב הנתונים יורד ל-‏‎<xliff:g id="USED">%1$d</xliff:g> Kb לשנייה במקרה של חריגה ממגבלת השימוש בנתונים"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"למידע נוסף על מדיניות השימוש בנתונים ברשת הסלולרית של הספק שלך"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS בשידור סלולרי"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS בשידור סלולרי"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS בשידור סלולרי"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS בשידור סלולרי מופעל"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"קוריאנית"</item>
     <item msgid="1933212028684529632">"סינית"</item>
     <item msgid="1908428006803639064">"עברית"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"שפות"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"מזג אוויר מקומי"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"מדור דרושים"</string>
     <string name="eo_enable" msgid="8623559062015685813">"מדור דרושים מופעל"</string>
     <string name="eo_disable" msgid="3863812478090907609">"מדור דרושים מושבת"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"רפואה, בריאות ובתי חולים"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"האפשרות \'רפואה, בריאות ובתי חולים\' מופעלת"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"האפשרות \'רפואה, בריאות ובתי חולים\' מושבתת"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"רפואה, בריאות ובתי חולים"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"האפשרות \'רפואה, בריאות ובתי חולים\' מופעלת"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"האפשרות \'רפואה, בריאות ובתי חולים\' מושבתת"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"חדשות הטכנולוגיה"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"קטגוריית חדשות טכנולוגיה מופעלת"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"חדשות טכנולוגיה מושבתות"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"WCDMA בלבד"</item>
     <item msgid="8776934131146642662">"GSM בלבד"</item>
     <item msgid="4684679567848300935">"GSM/WCDA ‏(WCDMA מועדף)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"השתמש רק ברשתות ‎2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"חוסך בצריכת הסוללה"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"בחירת מערכת"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"שנה את מצב הנדידה של CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"שנה את מצב נדידת CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"בחירת מערכת"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"בית בלבד"</item>
     <item msgid="1205664026446156265">"אוטומטי"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"מצב נדידה של CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"שנה את מצב הנדידה של CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"מצב נדידה של CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"רשתות ביתיות בלבד"</item>
-    <item msgid="8174642753290624634">"רשתות מסונפות"</item>
-    <item msgid="2241951431403168661">"רשת כלשהי"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"הרשמה ל-CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"העדפות רשת CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"לא מיושם עדיין!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"העדפות רשת CDMA"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"CDMA בלבד"</item>
     <item msgid="2683555124647197574">"EvDo בלבד"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"הרשמה ל-CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"החלף בין RUIM/SIM ל-NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"הרשמה"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"הפעל מכשיר"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"הגדר שירות נתונים"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"נהל מספרי חיוג קבועים"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"שנה את ה-PIN לקבלת גישת FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"נהל רשימת מספרי טלפון"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"פרטיות של Google Voice"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"פרטיות קול"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"הפוך מצב פרטיות משופרת לפעיל"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"מצב TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"הפוך מצב TTY לפעיל"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"מצב TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"הגדר מצב TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"ניסיון חוזר אוטומטי"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"הפעל מצב ניסיון חוזר אוטומטי"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"ניסיון חוזר אוטומטי"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"אפשר מצב \'ניסיון חוזר\'."</string>
     <string name="menu_add" msgid="1882023737425114762">"הוסף איש קשר"</string>
     <string name="menu_edit" msgid="7143003705504672374">"ערוך איש קשר"</string>
     <string name="menu_delete" msgid="3977150783449642851">"מחק איש קשר"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"הזן PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"הקלד PIN2"</string>
     <string name="name" msgid="7329028332786872378">"שם"</string>
     <string name="number" msgid="7905950798349903858">"מספר"</string>
     <string name="save" msgid="4094274636321939086">"שמור"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"מחק מספר חיוג קבוע"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"מוחק מספר חיוג קבוע..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"מספר חיוג קבוע נמחק."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN לא מעודכן: הזנת PIN שגוי."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN לא עודכן: המספר לא יכול להכיל מעל 20 ספרות."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"ה-FDN לא עודכן כיוון שהקלדת PIN שגוי."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"ה-FDN לא עודכן משום שהמספר חורג ממגבלת 20 הספרות."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN לא עודכן. קוד PIN2 היה שגוי או שמספר הטלפון נדחה."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"קורא מכרטיס SIM…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"אין אנשי קשר בכרטיס ה-SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"בחר אנשי קשר ליבוא"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"כדי לייבא אנשי קשר מכרטיס ה-SIM, כבה מצב טיסה."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"כדי לייבא אנשי קשר מכרטיס ה-SIM, כבה תחילה את מצב טיסה."</string>
     <string name="enable_pin" msgid="5422767284133234860">"הפוך לפעיל/השבת PIN של SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"שנה PIN של SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN של SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"PIN ישן"</string>
     <string name="newPinLabel" msgid="207488227285336897">"PIN חדש"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"אשר PIN חדש"</string>
-    <string name="badPin" msgid="4154316827946559447">"ה-PIN הישן שהקלדת שגוי. נסה שוב."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"קודי ה-PIN של ה-SIM שהזנת אינם תואמים. נסה שוב."</string>
+    <string name="badPin" msgid="8955102849303984935">"ה-PIN הישן שהקלדת שגוי. נסה שוב."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"קודי ה-PIN שהקלדת אינם תואמים. נסה שוב."</string>
     <string name="invalidPin" msgid="5981171102258684792">"הקלד PIN שאורכו 4 עד 8 ספרות."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"השבת PIN של SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"הפוך PIN של SIM לפעיל"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"נא המתן..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"PIN של SIM מופעל"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN של SIM מושבת"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"ה-PIN שהקלדת היה שגוי"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"ה-PIN של ה-SIM השתנה בהצלחה."</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"ה-PIN של ה-SIM מופעל."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"ה-PIN של ה-SIM הושבת."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"ה-PIN שהקלדת היה שגוי."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"ה-PIN של ה-SIM שונה בהצלחה."</string>
     <string name="puk_requested" msgid="3898394204193202803">"הסיסמה שגויה, ה-SIM נעול! דרוש PUK2‎."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 ישן"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 חדש"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"אשר PIN2 חדש"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"ה-PUK2 הישן שהקלדת שגוי. נסה שוב."</string>
-    <string name="badPin2" msgid="515218795152422178">"ה-PIN2 הישן שהקלדת שגוי. נסה שוב."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"קודי ה-PIN2 שהזנת אינם תואמים. נסה שוב."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"ה-PUK2 שהקלדת שגוי. נסה שוב."</string>
+    <string name="badPin2" msgid="1041576234483629991">"ה-PIN2 הישן שהקלדת שגוי. נסה שוב."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"קודי ה-PIN2 שהקלדת אינם תואמים. נסה שוב."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"הקלד PIN2 שאורכו 4 עד 8 ספרות."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"הקלד PUK2 שאורכו 8 ספרות."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"קוד PIN2 השתנה בהצלחה"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"ה-PIN2 שונה בהצלחה."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"הקלד קוד PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"הסיסמה שגויה, שנה PIN2 ונסה שוב!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"הסיסמה שגויה, ה-SIM נעול! דרוש PUK2‎."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"הסיסמה שגויה. שנה את ה-PIN2 ונסה שוב."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"הסיסמה שגויה, ה-SIM נעול. נדרש PUK2‎."</string>
     <string name="doneButton" msgid="2859593360997984240">"סיום"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"שיחת ועידה <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"חזרה לשיחה"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"המשך ללא כרטיס SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"לא נמצא כרטיס SIM. הכנס כרטיס SIM לטלפון."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"מחק"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"בטל נעילה"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"מאמת את ה-PIN…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"המספר של הדואר הקולי"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"מחייג"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"מנסה שוב"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"שיחת ועידה"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"שיחה נכנסת"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"שיחה ממתינה של CDMA"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"השיחה הסתיימה"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"בהמתנה"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"מנתק"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"שיחות שלא נענו"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> שיחות שלא נענו"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"שיחה שלא נענתה מאת <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"שיחה נוכחית (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"שיחה פעילה"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"בהמתנה"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"שיחה נכנסת"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"דואר קולי חדש"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"המספר של הדואר הקולי אינו ידוע"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"אין שירות"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"הרשת שנבחרה (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) לא זמינה"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"נתק"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"התקשר חזרה"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"שלח הודעה"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"כדי להתקשר, כבה תחילה את מצב טיסה."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"לא רשום ברשת."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"הרשת לנייד אינה זמינה."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"השיחה לא נשלחה, לא הוזן מספר חוקי."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"השיחה לא נשלחה."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"מתחיל רצף MMI…"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"מתחיל רצף של קוד תכונה..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"שירות לא נתמך."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"אין אפשרות להחליף שיחות."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"אין אפשרות להפריד את השיחה."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"שיחת חירום"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"מפעיל את הרדיו…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"מחוץ לאזור שירות, מנסה שוב..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"השיחה לא נשלחה, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> אינו מספר חירום!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"השיחה לא נשלחה, חייג מספר חירום!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"השיחה לא נשלחה. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> אינו מספר חירום!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"השיחה לא נשלחה. חייג מספר חירום!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"השתמש במקלדת כדי לחייג"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"מקלדת עם חיוג צלילים"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"השהה"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"בטל השהיה"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"סיום"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"לוח חיוג"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"הסתר"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"רמקול"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"השתק"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"הוסף שיחה"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"מזג שיחות"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"החלף"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"טקסט ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"צלילי DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"צלילי DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"הגדר את האורך של צלילי DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"רגיל"</item>
     <item msgid="2883365539347850535">"ארוך"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"הודעת רשת"</string>
+    <string name="network_message" msgid="4483886461245213802">"הודעת רשת"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"הפעל את הטלפון"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"יש לבצע שיחה מיוחדת כדי להפעיל את השירות לטלפון. "\n\n"לאחר הלחיצה על \'הפעל\', הקשב להוראות להפעלת הטלפון."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"גע ב\'הפעל\' כדי לבצע שיחה מיוחדת שמפעילה את הטלפון ברשת הסלולרית של הספק, כדי שתוכל להתקשר ולהתחבר לרשתות נתונים לנייד."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"לדלג על ההפעלה?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"אם תדלג על ההפעלה, לא תוכל להתקשר או להתחבר לרשתות נתונים לנייד (אך תוכל להתחבר לרשתות Wi-Fi). עד שתפעיל את הטלפון, תתבקש להפעיל אותו בכל פעם שתדליק אותו."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"דלג"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"הפעל"</string>
     <string name="ota_activate" msgid="1368528132525626264">"הפעל"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"הטלפון מופעל!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"הטלפון מופעל."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"בעיה בהפעלה"</string>
     <string name="ota_listen" msgid="162923839877584937">"בצע את ההוראות הנאמרות עד שתשמע שההפעלה הושלמה."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"מקלדת"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"רמקול"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"המתן בזמן תכנות הטלפון."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"התכנות נכשל"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"מתבצע תכנות של הטלפון. אנא המתן."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"התכנות נכשל"</string>
     <string name="ota_successful" msgid="1880780692887077407">"הטלפון שלך מופעל כעת. ייתכן שתמתין עד 15 דקות להפעלת השירות."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"הטלפון שלך לא הופעל."\n"ייתכן שעליך למצוא אזור עם קליטה טובה יותר (ליד חלון או בחוץ). "\n\n"נסה שוב או התקשר לשירות הלקוחות לקבלת אפשרויות נוספות."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"הטלפון שלך לא הופעל. "\n"ייתכן שעליך למצוא מקום שהקליטה בו טובה יותר (ליד חלון או בחוץ). "\n\n"נסה שוב או התקשר לשירות לקוחות לקבלת אפשרויות נוספות."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"כשלים מרובים של SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"הקודם"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"נסה שוב"</string>
     <string name="ota_next" msgid="3904945374358235910">"הבא"</string>
-    <string name="ota_back" msgid="2190038043403850052">"הקודם"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"נכנס למצב חירום של התקשרות חזרה"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"מצב חירום של התקשרות חזרה"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"אין חיבור נתונים במשך <xliff:g id="COUNT">%s</xliff:g> דקות"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"הטלפון יהיה במצב חירום של התקשרות חזרה במשך דקה <xliff:g id="COUNT">%s</xliff:g>. במצב זה לא ניתן להשתמש ביישומים המשתמשים בחיבור נתונים. האם ברצונך לצאת כעת?"</item>
-    <item quantity="other" msgid="3231879566243957821">"הטלפון יהיה במצב חירום של התקשרות חזרה במשך <xliff:g id="COUNT">%s</xliff:g> דקות. במצב זה לא ניתן להשתמש ביישומים המשתמשים בחיבור נתונים. האם ברצונך לצאת כעת?"</item>
+    <item quantity="one" msgid="8060210887681426682">"הטלפון יהיה במצב התקשרות חזרה בחירום למשך דקה <xliff:g id="COUNT">%s</xliff:g>. במצב זה לא ניתן להשתמש ביישומים המשתמשים בחיבור נתונים. האם אתה רוצה לצאת כעת?"</item>
+    <item quantity="other" msgid="8617116564023933114">"הטלפון יהיה במצב התקשרות חזרה בחירום למשך <xliff:g id="COUNT">%s</xliff:g> דקות. במצב זה לא ניתן להשתמש ביישומים המשתמשים בחיבור נתונים. האם אתה רוצה לצאת כעת?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"הפעולה שנבחרה אינה זמינה במצב חירום של התקשרות חזרה. הטלפון יהיה במצב זה במשך דקה <xliff:g id="COUNT">%s</xliff:g>. האם ברצונך לצאת כעת?"</item>
-    <item quantity="other" msgid="3489076611710869904">"הפעולה שנבחרה אינה זמינה במצב חירום של התקשרות חזרה. הטלפון יהיה במצב זה במשך <xliff:g id="COUNT">%s</xliff:g> דקות. האם ברצונך לצאת כעת?"</item>
+    <item quantity="one" msgid="2585506997024726599">"הפעולה שנבחרה אינה זמינה במצב התקשרות חזרה בחירום. הטלפון יהיה במצב זה במשך <xliff:g id="COUNT">%s</xliff:g> דקות. האם אתה רוצה לצאת כעת?"</item>
+    <item quantity="other" msgid="6115622137771382224">"הפעולה שנבחרה אינה זמינה במצב התקשרות חזרה בחירום. הטלפון יהיה במצב זה במשך <xliff:g id="COUNT">%s</xliff:g> דקות. אתה רוצה לצאת כעת?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"הפעולה שנבחרה אינה זמינה במהלך שיחת חירום"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"יוצא ממצב חירום של התקשרות חזרה"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"הפעולה שנבחרה אינה זמינה במהלך שיחת חירום."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"יציאה ממצב התקשרות חזרה בחירום"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"כן"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"לא"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"סגור"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"הגדרות דואר קולי"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;לא הוגדר&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"שירות דואר קולי"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"הגדרות עבור <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"שירות"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"הגדרות"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;לא הוגדר&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"הגדרות שיחה אחרות"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"חייג"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"מתקשר דרך ‎^1‏"\n<b>"‎^2‏"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"גרור ימינה כדי לענות"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"גרור שמאלה כדי להשתיק את הצלצול"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"גרור שמאלה כדי לדחות"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"גרור ימינה כדי לענות"\n"ולהשהות שיחה פעילה"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"גרור ימינה כדי לענות"\n"ולסיים שיחה פעילה"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"גרור ימינה כדי לענות"\n"ולסיים שיחה מושהית"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"מענה"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"דחה"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"שיחה באמצעות <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"תמונה של איש קשר"</string>
     <string name="goPrivate" msgid="865837794424530980">"עבור לשיחה פרטית"</string>
     <string name="selectContact" msgid="781975788478987237">"בחר איש קשר"</string>
     <string name="sip_settings" msgid="6699045718560859691">"הגדרות שיחת אינטרנט"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"חשבונות (SIP) להתקשרות באינטרנט"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"חשבונות"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"נהל חשבונות ומצב של התקשרות באינטרנט (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"קבל שיחות נכנסות"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"מקצר את חיי הסוללה"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"הגדר אפשרויות שיחה"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"השתמש בהתקשרות באינטרנט"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"השתמש בהתקשרות באינטרנט (Wi-Fi בלבד)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"לכל השיחות כאשר רשת הנתונים זמינה"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"לשיחות אינטרנט בלבד"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"שאל עבור כל שיחה"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"לכל השיחות"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"רישום אוטומטי"</string>
-    <string name="call_priority" msgid="8374917577270504387">"שיחה יוצאת באמצעות SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"בצע שיחה"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"השתמש בחשבון להתקשרות באינטרנט:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"השתמש תמיד כדי לבצע שיחות אינטרנט"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"תוכל להשתמש ב\'הגדרות שיחה\' כדי לשנות את חשבון השיחות באינטרנט לשימוש כברירת מחדל בעת ביצוע שיחות על ידי בחירת חשבון שונה בהגדרות של שיחות באינטרנט"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"ניתן לשנות את חשבון השיחות באינטרנט לשימוש כברירת מחדל דרך \'טלפון\' &gt; \'הגדרות\' &gt; \'הגדרות שיחת אינטרנט\' &gt; \'חשבונות\'."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"שיחה בטלפון סלולרי"</string>
     <string name="internet_phone" msgid="1147922660195095810">"שיחת אינטרנט"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"אין חשבון להתקשרות באינטרנט"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"אין חשבונות להתקשרות באינטרנט בטלפון זה. להוסיף חשבון כעת?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"אין חשבונות שיחת אינטרנט לטלפון זה. האם אתה רוצה להוסיף חשבון כעת?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"הוסף"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"הוסף חשבון"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"הסר חשבון"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"חשבונות SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"שומר את החשבון..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"מסיר את החשבון..."</string>
+    <string name="saving_account" msgid="52903398217017954">"שומר את החשבון..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"מסיר את החשבון..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"שמור"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"מחק"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"סגור את הפרופיל"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"אישור"</string>
     <string name="close_profile" msgid="6886968271423155284">"סגור"</string>
-    <string name="primary_account" msgid="2229538308291934245">"ראשי"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"הפוך חשבון זה לחשבון הראשי שלי"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"משמש לשיחות יוצאות"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"הגדרות מתקדמות"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"חשבון ראשי. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"בודק סטטוס..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"מבצע רישום..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"עדיין מנסה..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"לא מקבל שיחות"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"רישום החשבון הופסק כיוון שאין חיבור לאינטרנט"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"רישום החשבון הופסק כיוון שאין חיבור Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"הרשמת החשבון נכשלה"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"מקבל שיחות"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"מבצע רישום..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"עדיין מנסה..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"לא מקבל שיחות."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"רישום החשבון הופסק כיוון שאין חיבור לאינטרנט."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"רישום החשבון הופסק כיוון שאין חיבור Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"רישום החשבון נכשל."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"מקבל שיחות."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"הרשמת החשבון נכשלה: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); יתבצע ניסיון חוזר מאוחר יותר"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"הרשמת החשבון נכשלה: שם משתמש או סיסמה שגויים"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"הרשמת החשבון נכשלה: בדוק את שם השרת"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"חשבון זה נמצא כרגע בשימוש של היישום <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"רישום החשבון נכשל: שם המשתמש או הסיסמה שגויים."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"רישום החשבון נכשל: בדוק את שם השרת."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"היישום <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> משתמש כרגע בחשבון זה."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"פרטי חשבון SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"פרטי חשבון SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"שרת"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"מספר יציאה"</string>
     <string name="transport_title" msgid="8253139511847746640">"סוג העברה"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"שלח אות חיבור"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"שלח הודעות של אות חיבור מסוג SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"רישום אוטומטי"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"רשום את הפרופיל באופן אוטומטי"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"הגדר כחשבון ראשי"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"משמש לשיחות יוצאות"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"הגדרות אופציונליות"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;אופציונלי&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ גע כדי להציג את הכל"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ גע כדי להסתיר את הכל"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> הוא שדה חובה, אין אפשרות להשאיר אותו ריק"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"מספר היציאה צריך להיות בין 1000 ל-65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> הוא שדה חובה ולא ניתן להשאירו ריק."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"מספר היציאה צריך להיות בין 1000 ל-65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"אין חיבור לאינטרנט"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"אין חיבור Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"כדי לבצע שיחת אינטרנט, בדוק תחילה את החיבור לאינטרנט"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"עליך להיות מחובר לרשת Wi-Fi לצורך ביצוע שיחות באינטרנט (השתמש בהגדרות \'אלחוטי ורשת\')"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"כדי לבצע שיחת אינטרנט, בדוק תחילה את החיבור לאינטרנט."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"עליך להיות מחובר לרשת Wi-Fi כדי לבצע שיחות באינטרנט (השתמש בהגדרות \'אלחוטי ורשתות\')."</string>
     <string name="no_voip" msgid="8901474054537199865">"אין תמיכה בהתקשרות באינטרנט"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"אוטומטי"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"שלח תמיד"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"אני מיד חוזר אליך."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"אני אתקשר אליך יותר מאוחר."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"אני לא יכול לדבר עכשיו. תתקשר אלי מאוחר יותר?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"הודעה מותאמת אישית..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"הודעה מותאמת אישית"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"תגובות מהירות"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"ערוך תגובות מהירות"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"כוכבית"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"אפס"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"סולמית"</string>
-    <string name="description_search_button" msgid="239929880630534731">"חפש"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"חייג"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"Backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"רמקול מופעל."</string>
@@ -715,9 +615,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"דחה"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"רטט"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"רטט"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"צלצול"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"תמיד"</item>
     <item msgid="1595097872875714252">"במצב שקט בלבד"</item>
-    <item msgid="1458182414036878616">"אף פעם"</item>
+    <item msgid="1458182414036878616">"לעולם לא"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"רינגטון של טלפון"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"רטט בעת צלצול"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"צלילי מגע של לוח חיוג"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"צלצול"</string>
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index d308b82cc..5ff5ddf6d 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"非通知"</string>
     <string name="payphone" msgid="1931775086311769314">"公衆電話発信"</string>
     <string name="onHold" msgid="9035493194749959955">"保留中"</string>
-    <string name="ongoing" msgid="8300874342848721367">"通話中"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"話し中"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"ネットワークがビジーです"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"応答なし（タイムアウト）"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"サーバーに接続できません"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"番号に接続できません"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"ユーザー名またはパスワードが正しくありません"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"ネットワーク外からの着信です"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"ネットワーク外からの着信"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"サーバーエラー: しばらくしてからもう一度お試しください。"</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"圏外"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACMの制限を超えています"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"無線通信をOFF"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"エラーまたはSIMなし"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"SIMがない、またはSIMエラー"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"圏外"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"発信番号制限により発信が制限されています。"</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"発信できません。発信制限がかかっています。"</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"通話制限中は発信できません。"</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"発信制限が設定されています。"</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"緊急通報の発信制限が設定されています。"</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"緊急通報以外は発信制限が設定されています。"</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: 携帯端末は電源を入れ直すまでロックされています。"</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: 通話が遮断されました。"</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: 通話が傍受されました。"</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: 順序が変更されました。"</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: サービスオプションが拒否されました。"</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: 再試行の順序。"</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: アクセスできませんでした。"</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: 取得済みです。"</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"緊急通報のみ可能です。"</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"番号が無効です"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"無効な番号"</string>
     <string name="confCall" msgid="1904840547188336828">"グループ通話"</string>
     <string name="call_lost" msgid="317670617901479594">"通話が切れました。"</string>
-    <string name="retry" msgid="8462986804300767852">"再試行"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"通話が切れました"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMIコードの開始"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSDコードを実行中..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"有線ヘッドセット"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"次の番号を送信しますか？"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"番号を送信中"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"番号送信"\n</string>
     <string name="send_button" msgid="4106860097497818751">"送信"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"はい"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"いいえ"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"ワイルド文字と入れ替える文字"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"ワイルド文字を置換:"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"ボイスメール番号がありません"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"SIMカードにボイスメールの番号がありません。"</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"番号を追加"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"読み込み中..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"PINコードを入力してSIMカードのロックを解除します。"</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIMロックを解除しました"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"新しいSIM PINコード"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"確認のため新しいSIM PINコードを再入力"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"SIM PINと一致しません。入力し直してください。"</string>
-    <string name="enterPuk" msgid="6144749655582862324">"SIMカードのロック解除のためPUKコードを入力"</string>
-    <string name="badPuk" msgid="3213017898690275965">"PUKコードが正しくありません。"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"次へ"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"SIMカードロックを解除しました。端末のロックを解除しています..."</string>
     <string name="label_ndp" msgid="780479633159517250">"SIMネットワークのロック解除PIN"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"ロック解除"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"ネットワークのロック解除をリクエスト中..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"ネットワークロックを解除できませんでした。"</string>
     <string name="unlock_success" msgid="6770085622238180152">"ネットワークロックを解除しました。"</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI（端末識別番号）"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM通話設定"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA通話設定"</string>
     <string name="apn_settings" msgid="9043423184895642077">"アクセスポイント名"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"その他のCDMA専用通話設定"</string>
     <string name="labelNwService" msgid="4699970172021870983">"ネットワークサービス設定"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"発信者番号"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"設定の読み込み中…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"発信時に番号を通知しない"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"発信時に番号を通知する"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"発信者番号表示に通信事業者のデフォルト値を使用する"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"通話中着信の転送番号"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g>に転送する"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"無効"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"ご利用の携帯通信会社では通話中の着信時の転送を無効にすることができません。"</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"ご利用の携帯通信会社は通話中の転送の無効化をサポートしていません。"</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"不在着信時に転送"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"不在着信時の転送番号"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g>に転送する"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"無効"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"ご利用の携帯通信会社では不在着信時の転送を無効にすることができません。"</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"ご利用の携帯通信会社は不在着信時の転送の無効化をサポートしていません。"</string>
     <string name="labelCFNRc" msgid="47183615370850000">"着信不能時に転送"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"着信不能時の転送番号"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"<xliff:g id="PHONENUMBER">{0}</xliff:g>に転送する"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"無効"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"ご利用の携帯通信会社では着信不能時の転送を無効にすることができません。"</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"ご利用の携帯通信会社は着信不能時の転送の無効化をサポートしていません。"</string>
     <string name="updating_title" msgid="6146755386174019046">"通話設定"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"通話設定エラー"</string>
     <string name="reading_settings" msgid="1920291699287055284">"設定を読み取り中..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"設定を元に戻しています..."</string>
     <string name="response_error" msgid="6674110501330139405">"ネットワークから予期しない応答が返されました。"</string>
     <string name="exception_error" msgid="7027667130619518211">"ネットワークまたはSIMカードのエラーです。"</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"発信番号制限で指定された番号に対してのみ操作できます。"</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"無線通信をONにしてから設定を表示してください。"</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"電話アプリの発信番号制限設定がONになっているため、通話関連の機能の一部を使用できません。"</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"これらの設定を表示するには無線通信をONにしてください。"</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"有効にする"</string>
     <string name="disable" msgid="7274240979164762320">"無効にする"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"番号を非通知"</item>
     <item msgid="1108394741608734023">"番号を通知"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"ボイスメールの番号の保存"</string>
     <string name="vm_changed" msgid="380744030726254139">"ボイスメールの番号が変更されました。"</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"ボイスメールの番号を変更できませんでした。"\n"問題が解決しない場合は携帯通信会社に問い合わせてください。"</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"転送先番号を変更できませんでした。"\n"問題が解決しない場合は携帯通信会社に問い合わせてください。"</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"ボイスメール番号を変更できませんでした。"\n"この問題が続くようであれば携帯通信会社にお問い合わせください。"</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"転送番号を変更できませんでした。"\n"この問題が続くようであれば携帯通信会社にお問い合わせください。"</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"現在の転送先番号設定の取得と保存ができませんでした。"\n"別の携帯通信会社に切り替えますか？"</string>
     <string name="no_change" msgid="3186040086622435212">"変更されていません。"</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"ボイスメールサービスを選択"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"ネットワークを検索"</string>
     <string name="network_query_error" msgid="6828516148953325006">"ネットワークの検索中にエラーが発生しました。"</string>
     <string name="register_on_network" msgid="9055203954040805084">"<xliff:g id="NETWORK">%s</xliff:g>に登録中..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"このSIMカードではこのネットワークに接続できません。"</string>
-    <string name="connect_later" msgid="500090982903469816">"現在このネットワークに接続できません。後ほどもう一度お試しください。"</string>
+    <string name="not_allowed" msgid="5613353860205691579">"お使いのSIMカードではこのネットワークに接続できません。"</string>
+    <string name="connect_later" msgid="2308119155752343975">"現在このネットワークに接続できません。しばらくしてからもう一度お試しください。"</string>
     <string name="registration_done" msgid="495135664535876612">"ネットワークに登録されました。"</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"通信事業者を選択する"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"通信事業者を選択する"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"利用可能なすべてのネットワークを検索する"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"自動選択"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"最適なネットワークを自動的に選択する"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"自動登録..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"自動的に選択"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"最適なネットワークを自動的に選択する"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"自動登録..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"ネットワークモード"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"ネットワーク動作モードの変更"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"優先ネットワークモード"</string>
@@ -192,17 +169,21 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"優先ネットワークモード: EvDoのみ"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"優先ネットワークモード: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item>LTEのみ</item>
+    <item>LTE/CMDA/EvDo/GSM/WCDMA</item>
+    <item>LTE/WCDMA/GSM</item>
+    <item>LTE/CDMA/EvDo</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"EV-DOのみ"</item>
     <item msgid="454610224530856274">"CDMA（EV-DO非準拠）"</item>
-    <item msgid="8928247118825616081">"CDMA/EV-DO自動"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA自動"</item>
+    <item msgid="648505122852496166">"CDMA/EV-DO自動"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA自動"</item>
     <item msgid="5189164180446264504">"WCDMAのみ"</item>
     <item msgid="5714714953966979187">"GSMのみ"</item>
-    <item msgid="4775796025725908913">"GSM/WCDMAを優先"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMAを優先"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"データ通信を有効にする"</string>
@@ -210,12 +191,11 @@
     <string name="roaming" msgid="8871412572928323707">"データローミング"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"ローミング時にデータサービスに接続する"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"ローミング時にデータサービスに接続する"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"データローミングをOFFにしてホームネットワークを離れたため、データ接続が切断されました。"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"データローミングをOFFにしてホームネットワークを離れたため、データ接続が切断されました。"</string>
     <string name="roaming_warning" msgid="7820963598559553967">"データローミングを許可すると、ローミング料金が発生する場合があります。"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTSオプション"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMAオプション"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"データ使用"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"携帯通信会社のデータポリシー"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"現期間で使用したデータ"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"データ使用期間"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"転送速度ポリシー"</string>
@@ -226,7 +206,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"サイクルの٪<xliff:g id="USED_0">%1$d</xliff:g>を経過"\n"次の期間は<xliff:g id="USED_1">%2$d</xliff:g>日で始まります（<xliff:g id="USED_2">%3$s</xliff:g>）"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"データ利用制限を超えると、転送速度が<xliff:g id="USED">%1$d</xliff:g>Kb/秒まで低下します"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"携帯通信会社のモバイルネットワークデータ利用ポリシーの詳細"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"エリアメールSMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"エリアメールSMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"エリアメールSMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"エリアメールSMSは有効になっています"</string>
@@ -267,15 +246,6 @@
     <item msgid="1858401628368130638">"韓国語"</item>
     <item msgid="1933212028684529632">"中国語"</item>
     <item msgid="1908428006803639064">"ヘブライ語"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"言語"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"各地の天気"</string>
@@ -305,9 +275,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"求人情報"</string>
     <string name="eo_enable" msgid="8623559062015685813">"求人情報は有効になっています"</string>
     <string name="eo_disable" msgid="3863812478090907609">"求人情報は無効になっています"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"医療、健康、病院情報"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"医療、健康、病院情報は有効になっています"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"医療、健康、病院情報は無効になっています"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"医療、健康、病院情報"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"医療、健康、病院情報は有効です"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"医療、健康、病院情報は無効です"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"テクノロジーニュース"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"テクノロジーニュースは有効になっています"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"テクノロジーニュースは無効になっています"</string>
@@ -323,34 +293,17 @@
     <item msgid="8776934131146642662">"GSMのみ"</item>
     <item msgid="4684679567848300935">"GSM/WCDA（WCDMAを優先）"</item>
   </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
-  </string-array>
+
     <string name="prefer_2g" msgid="8442550937280449639">"2Gネットワークのみ使用"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"節電"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"システムの選択"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"CDMAローミングモードを変更する"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMAローミングモードを変更する"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"システムの選択"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"ホームのみ"</item>
     <item msgid="1205664026446156265">"自動"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMAローミングモード"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"CDMAローミングモードの変更"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMAローミングモード"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"ホームネットワークのみ"</item>
-    <item msgid="8174642753290624634">"提携ネットワーク"</item>
-    <item msgid="2241951431403168661">"すべてのネットワーク"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA登録"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMAネットワーク設定"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"まだ実装されていません。"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMAネットワーク設定"</string>
@@ -359,21 +312,11 @@
     <item msgid="6143696847467859795">"CDMAのみ"</item>
     <item msgid="2683555124647197574">"EV-DOのみ"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA登録"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"RUIM/SIMとNVを切り替える"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"登録方式"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"端末を有効にする"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"データサービスの設定"</string>
@@ -390,18 +333,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"電話番号の指定による発信制限"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"発信番号制限のPINを変更"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"電話番号リストを管理"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"音声のプライバシー"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"音声のプライバシー"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"拡張プライバシーモードを有効にする"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTYモード"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"TTYモードを有効にする"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTYモード"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTYモードの設定"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"自動再試行"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"自動再試行モードを有効にする"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"自動再試行"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"自動再試行モードを有効にする"</string>
     <string name="menu_add" msgid="1882023737425114762">"連絡先を追加"</string>
     <string name="menu_edit" msgid="7143003705504672374">"連絡先を編集"</string>
     <string name="menu_delete" msgid="3977150783449642851">"連絡先を削除"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"PIN2を入力"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"PIN2を入力"</string>
     <string name="name" msgid="7329028332786872378">"名前"</string>
     <string name="number" msgid="7905950798349903858">"電話番号"</string>
     <string name="save" msgid="4094274636321939086">"保存"</string>
@@ -414,56 +355,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"発信番号制限の削除"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"発信番号制限を削除しています..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"発信番号制限を削除しました。"</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"発信番号制限が更新されませんでした。PINが正しくありません。"</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"発信番号制限が更新されませんでした。番号は20桁以内にする必要があります。"</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"発信番号制限は更新されませんでした。入力したPINは正しくありません。"</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"発信番号制限は更新されませんでした。20桁を超える番号は指定できません。"</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"発信番号制限は更新されませんでした。PIN2が正しくないか、電話番号が拒否されました。"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIMカードから読み取り中..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIMカードに連絡先がありません。"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"インポートする連絡先の選択"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"連絡先をSIMカードからインポートするには、機内モードをオフにしてください。"</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"連絡先をSIMカードからインポートするには、まず機内モードをOFFにしてください。"</string>
     <string name="enable_pin" msgid="5422767284133234860">"SIM PINの有効/無効"</string>
     <string name="change_pin" msgid="9174186126330785343">"SIM PINの変更"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"古いPIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"新しいPIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"新しいPINを確認"</string>
-    <string name="badPin" msgid="4154316827946559447">"PINが正しくありません。入力し直してください。"</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"PINと一致しません。入力し直してください。"</string>
+    <string name="badPin" msgid="8955102849303984935">"入力した古いPINは正しくありません。入力し直してください。"</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"入力したPINは一致しません。入力し直してください。"</string>
     <string name="invalidPin" msgid="5981171102258684792">"4～8桁の数字のPINを入力してください。"</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"SIM PINを無効にする"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"SIM PINを有効にする"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"お待ちください..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"SIM PINは有効です"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM PINは無効です"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"入力したPINは正しくありません"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"SIM PINが変更されました"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM PINは有効です。"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM PINは無効です"</string>
+    <string name="pin_failed" msgid="2298841192582192277">"入力したPINは正しくありませんでした。"</string>
+    <string name="pin_changed" msgid="4365538014588501049">"SIM PINを変更しました。"</string>
     <string name="puk_requested" msgid="3898394204193202803">"パスワードが正しくありません。SIMがロックされています。PUK2を入力してください。"</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"古いPIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"新しいPIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"新しいPIN2の確認"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"PUK2が正しくありません。入力し直してください。"</string>
-    <string name="badPin2" msgid="515218795152422178">"PIN2が正しくありません。入力し直してください。"</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"PIN2と一致しません。入力し直してください。"</string>
+    <string name="badPuk2" msgid="4851734468010000418">"入力したPUK2は正しくありません。入力し直してください。"</string>
+    <string name="badPin2" msgid="1041576234483629991">"入力した古いPIN2は正しくありません。入力し直してください。"</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"入力したPIN2は一致しません。入力し直してください。"</string>
     <string name="invalidPin2" msgid="8237110107480395938">"PIN2を4～8桁の数字で入力してください。"</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"8桁の数字のPUK2を入力してください。"</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2が変更されました"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2を変更しました。"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"PUK2コードを入力"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"パスワードが正しくありません。PIN2を変更して再入力してください。"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"パスワードが正しくありません。SIMがロックされています。PUK2を入力してください。"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"パスワードが正しくありません。PIN2を変更してもう一度お試しください。"</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"パスワードが正しくありません。SIMはロックされています。PUK2を入力してください。"</string>
     <string name="doneButton" msgid="2859593360997984240">"完了"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"グループ通話 <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"通話に戻る"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"SIMカードなしで続ける"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"SIMカードが見つかりません。SIMカードを携帯電話に挿入してください。"</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"無効"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"ロック解除"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"PINを認証中..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ボイスメールの番号"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"発信中"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"再試行中"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"グループ通話"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"着信"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"CDMA通話中着信"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"通話終了"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"保留中"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"通話終了"</string>
@@ -473,7 +408,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"不在着信"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"不在着信<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>件"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>さんからの不在着信"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"通話中（<xliff:g id="DURATION">%s</xliff:g>）"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"通話中"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"保留中"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"通話着信"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"新しいボイスメール"</string>
@@ -482,13 +417,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"ボイスメールの番号が不明です"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"通信サービスなし"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"選択したネットワーク（<xliff:g id="OPERATOR_NAME">%s</xliff:g>）が利用できません"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"通話終了"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"コールバック"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"メッセージ"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"機内モードをOFFにしてから発信してください。"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ご加入の通信サービスがありません"</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"モバイルネットワークが利用できません。"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"発信できません。有効な番号が入力されていません。"</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"発信できません。"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMIシーケンスを開始中..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"一連の機能コードを開始中..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"対応していないサービスです。"</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"通話を切り替えられません。"</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"通話を分割できません。"</string>
@@ -500,18 +437,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"緊急通報"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"無線通信をONにしています..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"圏外 - 再試行中..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>は緊急通報番号ではないので発信できません。"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"発信できません。緊急通報番号におかけください。"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"発信できません。<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>は緊急通報番号ではありません。"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"発信できません。緊急通報番号におかけください。"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"キーボードで番号を入力してください"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"タッチトーンキー"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"保留"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"保留解除"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"終了"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"ダイヤルキー"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"非表示"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"スピーカー"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"ミュート"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"通話を追加"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"グループ通話"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"切り替え"</string>
@@ -530,36 +462,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERIテキスト"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMFトーン"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMFトーン"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"DTMFトーンの長さを設定します"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"標準"</item>
     <item msgid="2883365539347850535">"長め"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"ネットワークメッセージ"</string>
+    <string name="network_message" msgid="4483886461245213802">"ネットワークメッセージ"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"携帯電話を有効にする"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"通話サービスを有効にするには特別な通話が必要です。"\n\n"[有効にする]を押してから、流れてくる音声に従って電話を有効にしてください。"</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"特別な通話を行うには[有効にする]にタップします。これによりお使いの携帯が携帯通信会社のモバイルネットワークで有効になり、通話とモバイルデータネットワークへの接続が可能になります。"</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"スキップして有効にしない"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"スキップして有効にしない場合、通話やモバイルデータネットワークの接続ができません（Wi-Fiネットワークには接続できます）。携帯を有効にするまでは、電源を入れるたびに有効にするかどうかを尋ねるメッセージが表示されます。"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"スキップ"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"有効にする"</string>
     <string name="ota_activate" msgid="1368528132525626264">"有効にする"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"携帯が有効に設定されました。"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"携帯端末が有効になりました。"</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"有効にする際のエラー"</string>
     <string name="ota_listen" msgid="162923839877584937">"完了したというメッセージが流れるまで音声ガイダンスに従ってください。"</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"キーパッド"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"スピーカー"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"プログラムが設定されるまでお待ちください。"</string>
-    <string name="ota_failure" msgid="8600027551822478181">"プログラムの設定に失敗しました"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"携帯端末のプログラムを設定しています。お待ちください。"</string>
+    <string name="ota_failure" msgid="4311299546379674378">"プログラムの設定に失敗しました"</string>
     <string name="ota_successful" msgid="1880780692887077407">"携帯が有効に設定されました。サービスが開始されるまで最大で15分ほどかかることがあります。"</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"携帯を有効に設定できませんでした。"\n"通信状態の良い場所（窓のそばや戸外）に移動することをおすすめします。"\n\n"もう一度やり直すかカスタマーサービスに問い合わせてください。"</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"携帯端末を有効にできませんでした。"\n"電波状態が悪い可能性があります。"\n\n"電波の良い場所（窓のそばや屋外）に移動してもう一度お試しいただくか、カスタマーサービスに他の方法をお問い合わせください。"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"超過SPCによる失敗"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"戻る"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"再試行"</string>
     <string name="ota_next" msgid="3904945374358235910">"次へ"</string>
-    <string name="ota_back" msgid="2190038043403850052">"戻る"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"緊急通報待機モードになりました"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"緊急通報待機モード"</string>
@@ -569,87 +496,69 @@
     <item quantity="other" msgid="3122217344579273583">"<xliff:g id="COUNT">%s</xliff:g>分間データ接続できません"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"<xliff:g id="COUNT">%s</xliff:g>分間緊急通報待機モードになります。このモード中はデータ接続が必要なアプリケーションは利用できません。今すぐ終了しますか？"</item>
-    <item quantity="other" msgid="3231879566243957821">"<xliff:g id="COUNT">%s</xliff:g>分間緊急通報待機モードになります。このモード中はデータ接続が必要なアプリケーションは利用できません。今すぐ終了しますか？"</item>
+    <item quantity="one" msgid="8060210887681426682">"端末はあと<xliff:g id="COUNT">%s</xliff:g>分間、緊急通報待機モードです。このモードではデータ通信を行うアプリは使用できません。今すぐこのモードを終了しますか？"</item>
+    <item quantity="other" msgid="8617116564023933114">"端末はあと<xliff:g id="COUNT">%s</xliff:g>分間、緊急通報待機モードです。このモードではデータ通信を行うアプリケーションは使用できません。今すぐこのモードを終了しますか？"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"緊急通報待機モード中のため選択した操作は利用できません。このモードはあと<xliff:g id="COUNT">%s</xliff:g>分間続行します。今すぐ終了しますか？"</item>
-    <item quantity="other" msgid="3489076611710869904">"緊急通報待機中なので、選択した操作は利用できません。あと<xliff:g id="COUNT">%s</xliff:g>分間このモードです。今すぐ終了しますか？"</item>
+    <item quantity="one" msgid="2585506997024726599">"選択した操作は緊急通報待機モードでは実行できません。端末はあと<xliff:g id="COUNT">%s</xliff:g>分間このモードです。今すぐこのモードを終了しますか？"</item>
+    <item quantity="other" msgid="6115622137771382224">"選択した操作は緊急通報待機モードでは実行できません。端末はあと<xliff:g id="COUNT">%s</xliff:g>分間このモードです。今すぐこのモードを終了しますか？"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"選択した操作は緊急通報待機時には実行できません"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"緊急通報待機モードを終了中"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"選択した操作は緊急通報時には実行できません。"</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"緊急通報待機モードを終了しています"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"はい"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"いいえ"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"解除"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"ボイスメールの設定"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;未設定&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"ボイスメールサービス"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>の設定"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"サービス"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"セットアップ"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;未設定&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"その他の通話設定"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"発信"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"^1で発信中:"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"右にドラッグして応答"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"左にドラッグして着信音を消音"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"左にドラッグして応答を拒否"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"右にドラッグして応答し"\n"現在の通話を保留"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"右にドラッグして応答し"\n"現在の通話を終了"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"右にドラッグして応答し"\n"保留中の通話を終了"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"電話に出る"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"拒否"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>で発信中"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"連絡先の写真"</string>
     <string name="goPrivate" msgid="865837794424530980">"個別通話に切り替え"</string>
     <string name="selectContact" msgid="781975788478987237">"連絡先を選択"</string>
     <string name="sip_settings" msgid="6699045718560859691">"インターネット通話の設定"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"インターネット通話（SIP）アカウント"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"アカウント"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"インターネット通話（SIP）のアカウントと状態を管理"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"着信を許可"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"電池使用量が増えます"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"通話オプションの設定"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"インターネット通話を使用"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"インターネット通話を使用（Wi-Fiのみ）"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"データネットワーク接続時はすべての通話"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"インターネット通話のみ"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"通話のたびに確認"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"すべての通話"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"自動登録"</string>
-    <string name="call_priority" msgid="8374917577270504387">"SIPで発信"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"発信"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"インターネット通話アカウントを使用:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"インターネット通話発信時に常に使用する"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"[通話設定]の[インターネット通話の設定]で別のアカウントを選択すると、発信時に使用するデフォルトのインターネット通話アカウントを変更できます。"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"[携帯端末]&gt;[設定]&gt;[インターネット通話の設定]&gt;[アカウント]画面で、デフォルトで使用するインターネット通話アカウントを変更できます。"</string>
     <string name="pstn_phone" msgid="8782554491484326429">"携帯通信網での通話"</string>
     <string name="internet_phone" msgid="1147922660195095810">"インターネット通話"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"インターネット通話アカウントなし"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"この端末にはインターネット通話アカウントが設定されていません。今すぐ追加しますか？"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"この携帯端末にはインターネット通話アカウントがありません。今すぐ追加しますか？"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"追加"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"アカウントを追加"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"アカウントを削除"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIPアカウント"</string>
-    <string name="saving_account" msgid="7468818916695729968">"アカウントを保存中..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"アカウント削除中..."</string>
+    <string name="saving_account" msgid="52903398217017954">"アカウントを保存しています..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"アカウントを削除しています..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"保存"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"破棄"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"プロフィールを閉じる"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"閉じる"</string>
-    <string name="primary_account" msgid="2229538308291934245">"メイン"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"これをメインのアカウントにする"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"発信に使用する"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"詳細設定"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"メインアカウント（<xliff:g id="REGISTRATION_STATUS">%s</xliff:g>）"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"ステータスを確認中..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"登録中..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"試行中です..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"通話着信OFF"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"インターネットに接続されていないため、アカウント登録処理が中断されました"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Wi-Fi接続されていないため登録処理を中断しました。"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"アカウントを登録できませんでした"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"通話着信ON"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"登録しています..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"試行しています..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"通話着信OFF"</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"インターネットに接続されていないため、アカウント登録処理が中断されました。"</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Wi-Fi接続されていないため、アカウントの登録を中断しました。"</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"アカウントを登録できませんでした。"</string>
+    <string name="registration_status_done" msgid="884630717456439280">"通話着信ON"</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"アカウントを登録できませんでした（<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>）。後ほど再試行します。"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"アカウントを登録できませんでした: ユーザー名かパスワードが正しくありません"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"アカウントを登録できませんでした: サーバー名を確認してください"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"このアカウントは現在<xliff:g id="ACCOUNT_OWNER">%s</xliff:g>アプリで使用されています"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"アカウントを登録できませんでした: ユーザー名かパスワードが正しくありません。"</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"アカウントを登録できませんでした: サーバー名を確認してください。"</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"このアカウントは現在「<xliff:g id="ACCOUNT_OWNER">%s</xliff:g>」アプリで使用されています。"</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIPアカウントの詳細"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIPアカウントの詳細"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"サーバー"</string>
@@ -660,9 +569,6 @@
     <string name="port_title" msgid="5952939408078626657">"ポート番号"</string>
     <string name="transport_title" msgid="8253139511847746640">"伝送方式"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"キープアライブを送信する"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"SIPキープアライブメッセージを送信します"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"自動登録"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"プロフィールを自動的に登録します"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"メインアカウントに設定"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"発信に使用する"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"オプション設定"</string>
@@ -673,12 +579,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;オプション&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ すべて表示"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ すべて非表示"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>は必須フィールドです。空欄にしないでください"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"ポート番号は1000～65534で指定してください"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"「<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>」は必須です。空欄にはできません。"</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"ポート番号は1000～65534で指定してください。"</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"インターネット接続なし"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Wi-Fi接続なし"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"インターネット通話を行うにはインターネットへの接続を確認してください。"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"インターネット通話を行うにはWi-Fiネットワークへの接続が必要です（[ワイヤレスとネットワークの設定]を使用）。"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"インターネット通話を行うにはまずインターネットへの接続を確認してください。"</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"インターネット通話にはWi-Fiネットワークへの接続が必要です（[ワイヤレスとネットワークの設定]を使用）。"</string>
     <string name="no_voip" msgid="8901474054537199865">"インターネット通話には対応していません"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"自動"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"常に送信"</string>
@@ -687,7 +593,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"すぐにかけ直します。"</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"後でかけ直します。"</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"今話せません。かけ直してください。"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"カスタムメッセージ..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"カスタムメッセージ"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"クイック返信"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"クイック返信の編集"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +611,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"アスタリスク"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"0"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"ポンド"</string>
-    <string name="description_search_button" msgid="239929880630534731">"検索"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"発信"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"バックスペース"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"スピーカーが有効です。"</string>
@@ -715,9 +620,47 @@
     <string name="description_target_decline" msgid="4789834364389731957">"着信拒否"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"バイブレーション"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"バイブレーション"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"着信音"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
-    <item msgid="468237575962916558">"常に使用"</item>
-    <item msgid="1595097872875714252">"マナーモード時のみ"</item>
+    <item msgid="468237575962916558">"常時"</item>
+    <item msgid="1595097872875714252">"マナーモード設定時のみ"</item>
     <item msgid="1458182414036878616">"使用しない"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"着信音"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"着信時のバイブレーション"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"ダイヤルパッドのタッチ操作音"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"着信音"</string>
+    <string name="perm_change_mobile_network">ネットワークを変更(2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">この権限を許可されたアプリケーションは、いつでも2G/3Gデータの切り替えが可能です。3Gは高速ですが、バッテリ消費が増加します。また、キャリアの課金も増加することがあります。</string>
+
+    <!-- CM Extra entries -->
+    <!-- Mobile network settings, summary for preferred network mode LTE / GSM[CHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_gsm_summary">優先ネットワーク: LTE / WCDMA / GSM</string>
+    <!-- Mobile network settings, summary for preferred network mode LTE / CDMA / EvDo[CHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_cdma_evdo_summary">優先ネットワーク: LTE / CDMA / EvDo</string>
+    <!-- Mobile network settings, summary for preferred network mode LTE / CMDA / EvDo / GSM/WCDMACHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">優先ネットワーク: LTE / CMDA / EvDo / GSM/WCDMA</string>
+
+    <!-- Call settings screen, message wait indicator name -->
+    <string name="mwi_notification_title">メッセージ待機中表示</string>
+    <!-- Call settings screen, message wait indicator summary -->
+    <string name="mwi_notification_summary">ボイスメールの通知にメッセージ待機中のインジケータを表示する</string>
+
+    <!-- Dialer UI Settings -->
+    <string name="dialer_ui_settings_title">ダイヤルパッドの設定</string>
+    <string name="dialer_ui_settings_summary">ダイヤルパッドの設定</string>
+
+
+    <!-- Noise suppression -->
+    <string name="noise_suppression_title">ノイズ抑制</string>
+    <string name="noise_suppression_summary">通話中のノイズを抑制する</string>
+    <!-- End Noise suppression -->
+
+    <!-- Advanced Phone Settings -->
+    <string name="advanced_setting">追加設定</string>
+    <string name="vibrate_outgoing">応答時に振動</string>
+    <string name="vibrate_45">45秒間隔で振動</string>
+    <string name="vibrate_45_sum">こちらから発信した通話では45秒間隔でバイブレーションする</string>
+    <string name="vibrate_hangup">切断時に振動</string>
+    <string name="vibrate_call_waiting">呼出中に振動</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index dc8afde9b..7d2da50c1 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"비공개 번호"</string>
     <string name="payphone" msgid="1931775086311769314">"공중전화"</string>
     <string name="onHold" msgid="9035493194749959955">"대기 중"</string>
-    <string name="ongoing" msgid="8300874342848721367">"현재 통화"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"통화 중입니다."</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"네트워크 사용량이 많습니다."</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"응답 없음, 시간 초과"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"서버에 연결할 수 없음"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"연결할 수 없는 전화 번호"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"사용자 이름 또는 비밀번호가 잘못되었습니다"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"네트워크 외부에서 온 전화입니다."</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"네트워크 외부에서 온 전화입니다."</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"서버 오류입니다. 잠시 후에 다시 시도해 보세요."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"신호 없음"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM 제한 초과"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"무선 연결 끊김"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"SIM이 없거나 SIM에 오류가 있습니다."</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"SIM이 없거나 SIM에 오류가 있습니다."</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"서비스 지역을 벗어났습니다."</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"발신전화가 FDN으로 제한됩니다."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"착발신 제한이 설정되어 있는 동안에는 전화를 걸 수 없습니다."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"착발신 제한이 설정되어 있는 동안에는 전화를 걸 수 없습니다."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"모든 전화가 액세스 제어에 의해 제한되어 있습니다."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"긴급 전화가 액세스 제어에 의해 제한되어 있습니다."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"일반 전화가 액세스 제어에 의해 제한되어 있습니다."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: 전원을 껐다 켤 때까지 휴대전화가 잠깁니다."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: 전화가 끊겼습니다."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: 통화를 가로채기 당했습니다."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: 순서를 재지정합니다."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: 서비스 옵션이 거부되었습니다."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: 명령을 다시 시도합니다."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: 액세스하지 못했습니다."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: 선 점유되었습니다."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"긴급 통화만 가능합니다."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"잘못된 번호"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"잘못된 번호입니다."</string>
     <string name="confCall" msgid="1904840547188336828">"다자간 통화"</string>
     <string name="call_lost" msgid="317670617901479594">"통화가 끊겼습니다."</string>
-    <string name="retry" msgid="8462986804300767852">"다시 시도"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"통화 끊김"</string>
     <string name="ok" msgid="3811371167865772377">"확인"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI 코드 시작됨"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD 코드 실행 중..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"유선 헤드셋"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"블루투스"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"다음 톤을 보내시겠습니까?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"신호음 보내기"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"신호음 보내기"\n</string>
     <string name="send_button" msgid="4106860097497818751">"전송"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"예"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"아니요"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"와일드 문자를 다음으로 바꾸기"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"와일드 문자를 다음으로 바꿈:"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"음성사서함 번호 없음"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"SIM 카드에 저장된 음성사서함 번호가 없습니다."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"번호 추가"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"로드 중..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"SIM 카드의 잠금을 해제하려면 PIN 코드를 입력하세요."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM 잠금해제됨"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"새 SIM PIN 코드"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"확인을 위해 새 SIM PIN 코드 다시 입력"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"입력한 SIM PIN이 일치하지 않습니다. 다시 시도해 주세요."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"SIM 카드의 잠금을 해제하려면 PUK 코드 입력"</string>
-    <string name="badPuk" msgid="3213017898690275965">"PUK 코드가 잘못되었습니다."</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"계속"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"SIM 카드의 잠금이 해제되었습니다. 휴대전화의 잠금해제 중..."</string>
     <string name="label_ndp" msgid="780479633159517250">"SIM 네트워크 잠금해제 PIN"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"잠금해제"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"네트워크 잠금해제 요청 중..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"네트워크 잠금해제 요청이 실패했습니다."</string>
     <string name="unlock_success" msgid="6770085622238180152">"네트워크의 잠금을 해제했습니다."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM 통화 설정"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA 통화 설정"</string>
     <string name="apn_settings" msgid="9043423184895642077">"APN"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"CDMA 전용 통화 설정 추가"</string>
     <string name="labelNwService" msgid="4699970172021870983">"네트워크 서비스 설정"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"발신자 ID"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"설정 로드 중..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"발신자 표시 제한"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"발신전화의 번호 표시"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"기본 사업자 설정을 사용하여 발신전화에 내 번호 표시"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"통화 중인 경우 착신전환할 번호"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g>(으)로 착신전환 중"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"사용 중지됨"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"이동통신사에서 휴대전화가 사용 중일 때 착신전환 사용 중지를 지원하지 않습니다."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"휴대전화가 사용 중일 때 착신전환 사용 중지를 이동통신사에서 지원하지 않습니다."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"받지 않은 경우"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"전화를 받지 않은 경우 착신전환할 번호"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g>(으)로 착신전환 중"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"사용 중지됨"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"이동통신사에서 휴대전화가 응답하지 않을 때 착신전환 사용 중지를 지원하지 않습니다."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"휴대전화가 응답하지 않을 때 착신전환 사용 중지를 이동통신사에서 지원하지 않습니다."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"받을 수 없는 경우"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"전화를 받을 수 없는 경우 착신전환할 번호"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"<xliff:g id="PHONENUMBER">{0}</xliff:g>(으)로 착신전환 중"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"사용 중지됨"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"이동통신사에서 전화를 받을 수 없을 때 착신전환 사용 중지를 지원하지 않습니다."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"이동통신사에서 전화를 받을 수 없을 때 착신전환 사용 중지를 지원하지 않습니다."</string>
     <string name="updating_title" msgid="6146755386174019046">"통화 설정"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"통화 설정 오류"</string>
     <string name="reading_settings" msgid="1920291699287055284">"설정을 읽는 중..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"원래 설정으로 되돌리는 중..."</string>
     <string name="response_error" msgid="6674110501330139405">"네트워크에서 예기치 않은 응답이 전송되었습니다."</string>
     <string name="exception_error" msgid="7027667130619518211">"네트워크 또는 SIM 카드 오류입니다."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"발신 허용 번호에서만 허용되는 작업입니다."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"이러한 설정을 보려면 무선을 사용해야 합니다."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"휴대전화 앱의 발신 제한 번호 설정을 사용하기 때문에 일부 통화 관련 기능이 작동되지 않습니다."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"이러한 설정을 보려면 무선을 사용해야 합니다."</string>
     <string name="close_dialog" msgid="2365884406356986917">"확인"</string>
     <string name="enable" msgid="1059008390636773574">"사용"</string>
     <string name="disable" msgid="7274240979164762320">"사용 중지"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"발신자 표시 제한"</item>
     <item msgid="1108394741608734023">"발신자 표시"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"음성사서함 번호 저장"</string>
     <string name="vm_changed" msgid="380744030726254139">"음성사서함 번호가 변경되었습니다."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"음성사서함 번호를 변경하지 못했습니다."\n"문제가 계속되면 이동통신사에 문의하세요."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"착신전환할 번호를 변경하지 못했습니다."\n"문제가 계속되면 이동통신사에 문의하세요."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"음성사서함 번호를 변경하지 못했습니다."\n"문제가 계속되면 이동통신사에 문의하세요."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"착신전환할 번호를 변경하지 못했습니다."\n"문제가 계속되면 이동통신사에 문의하세요."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"현재 착신전환 번호 설정을 검색하고 저장하지 못했습니다."\n"그래도 새로운 통신사로 전환하시겠습니까?"</string>
     <string name="no_change" msgid="3186040086622435212">"변경사항이 없습니다."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"음성사서함 서비스 선택"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"네트워크 검색"</string>
     <string name="network_query_error" msgid="6828516148953325006">"네트워크를 검색하는 동안 오류가 발생했습니다."</string>
     <string name="register_on_network" msgid="9055203954040805084">"<xliff:g id="NETWORK">%s</xliff:g>에 등록 중..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"SIM 카드에서 이 네트워크에 연결할 수 없습니다."</string>
-    <string name="connect_later" msgid="500090982903469816">"현재 네트워크에 연결할 수 없습니다. 나중에 다시 시도해 주세요."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"SIM 카드에서 이 네트워크에 연결할 수 없습니다."</string>
+    <string name="connect_later" msgid="2308119155752343975">"현재 네트워크에 연결할 수 없습니다. 나중에 다시 시도해 주세요."</string>
     <string name="registration_done" msgid="495135664535876612">"네트워크에 등록되었습니다."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"네트워크 운영자 선택"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"네트워크 운영자 선택"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"사용 가능한 모든 네트워크 검색"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"자동으로 선택"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"기본 설정 네트워크를 자동으로 선택"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"자동 등록..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"자동으로 선택"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"기본 설정 네트워크를 자동으로 선택"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"자동 등록..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"네트워크 모드"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"네트워크 작동 모드 변경"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"기본 설정된 네트워크 모드"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"기본 네트워크 모드: EvDo 전용"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"기본 네트워크 모드: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"EvDo 전용"</item>
     <item msgid="454610224530856274">"EvDo없는 CDMA"</item>
-    <item msgid="8928247118825616081">"CDMA/EvDo 자동"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA 자동"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo 자동"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA 자동"</item>
     <item msgid="5189164180446264504">"WCDMA 전용"</item>
     <item msgid="5714714953966979187">"GSM 전용"</item>
-    <item msgid="4775796025725908913">"GSM/WCDMA로 기본 설정"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA로 기본 설정"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"데이터 사용"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"데이터 로밍"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"로밍 시 데이터 서비스에 연결"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"로밍 시 데이터 서비스에 연결"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"데이터 로밍을 사용 중지한 상태에서 홈 네트워크를 벗어났으므로 데이터 연결이 끊어졌습니다."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"데이터 로밍을 사용 중지한 상태에서 홈 네트워크를 벗어났으므로 데이터 연결이 끊어졌습니다."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"데이터 로밍을 허용하시겠습니까? 높은 로밍 요금이 부과될 수 있습니다."</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS 옵션"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA 옵션"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"데이터 사용"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"이동통신사 데이터 정책"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"현재 데이터 사용량"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"데이터 사용 기간"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"데이터 속도 정책"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"주기의 <xliff:g id="USED_0">%1$d</xliff:g>٪ 경과"\n"다음 기간은 <xliff:g id="USED_1">%2$d</xliff:g>일 후에 시작(<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"데이터 사용량 제한을 초과하면 데이터 속도는 <xliff:g id="USED">%1$d</xliff:g>Kb/s로 줄어듭니다."</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"이동통신사의 모바일 네트워크 데이터 사용 정책에 대한 자세한 정보"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"셀 브로드캐스트 SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"셀 브로드캐스트 SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"셀 브로드캐스트 SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"셀 브로드캐스트 SMS 사용"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"한국어"</item>
     <item msgid="1933212028684529632">"중국어"</item>
     <item msgid="1908428006803639064">"히브리어"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"언어"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"지역 날씨 정보"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"채용 정보"</string>
     <string name="eo_enable" msgid="8623559062015685813">"채용 정보 사용"</string>
     <string name="eo_disable" msgid="3863812478090907609">"채용 정보 사용 중지"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"의료, 건강 및 병원 정보"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"의료, 건강 및 병원 정보 사용"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"의료, 건강 및 병원 정보 사용 중지"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"의료, 건강 및 병원 정보"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"의료, 건강 및 병원 정보 사용"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"의료, 건강 및 병원 정보 사용 중지"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"기술 뉴스"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"기술 뉴스 사용"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"기술 뉴스 사용 중지"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"WCDMA 전용"</item>
     <item msgid="8776934131146642662">"GSM 전용"</item>
     <item msgid="4684679567848300935">"GSM/WCDA(WCDMA로 기본 설정)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"2G 네트워크만 사용"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"배터리 절약"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"시스템 선택"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"cdma 로밍 모드 변경"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA 로밍 모드 변경"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"시스템 선택"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"집 전용"</item>
     <item msgid="1205664026446156265">"자동"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA 로밍 모드"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"cdma 로밍 모드 변경"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA 로밍 모드"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"홈 네트워크 전용"</item>
-    <item msgid="8174642753290624634">"소속된 네트워크"</item>
-    <item msgid="2241951431403168661">"모든 네트워크"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA 가입"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA 네트워크 환경설정"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"아직 구현되지 않았습니다."</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA 네트워크 환경설정"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"CDMA 전용"</item>
     <item msgid="2683555124647197574">"EvDo 전용"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA 가입"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"RUIM/SIM과 NV 간 변경"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"가입"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"기기 활성화"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"데이터 서비스 설정"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"발신 허용 번호 관리"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"FDN 액세스를 위해 PIN 변경"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"전화번호 목록 관리"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"음성 개인정보 보호"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"음성 개인정보 보호"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"향상된 개인정보 보호 모드 사용"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY 모드"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"TTY 모드 사용"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY 모드"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY 모드 설정"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"자동으로 다시 시도"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"자동 다시 시도 모드 사용"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"자동으로 다시 시도"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"자동 다시 시도 모드 사용"</string>
     <string name="menu_add" msgid="1882023737425114762">"연락처 추가"</string>
     <string name="menu_edit" msgid="7143003705504672374">"연락처 수정"</string>
     <string name="menu_delete" msgid="3977150783449642851">"연락처 삭제"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"PIN2 입력"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"PIN2 유형"</string>
     <string name="name" msgid="7329028332786872378">"이름"</string>
     <string name="number" msgid="7905950798349903858">"번호"</string>
     <string name="save" msgid="4094274636321939086">"저장"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"발신 허용 번호 삭제"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"발신 허용 번호를 삭제하는 중..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"발신 허용 번호가 삭제되었습니다."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN 업데이트 안됨: 잘못된 PIN을 입력했습니다."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN 업데이트 안됨: 번호는 20자리를 초과할 수 없습니다."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"잘못된 PIN을 입력하여 FDN 업데이트 안됨"</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"숫자가 20자리를 초과할 수 없으므로 FDN을 업데이트하지 못했습니다."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN이 업데이트되지 않았습니다. PIN2가 잘못되었거나 전화번호가 거부되었습니다."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM 카드에서 읽는 중..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM 카드에 주소록이 없습니다."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"가져올 주소록 선택"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"SIM 카드에서 주소록을 가져오려면 비행기 모드를 사용 중지하세요."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"SIM 카드에서 주소록을 가져오려면 먼저 비행기 모드를 사용 중지하세요."</string>
     <string name="enable_pin" msgid="5422767284133234860">"SIM PIN 사용/사용 중지"</string>
     <string name="change_pin" msgid="9174186126330785343">"SIM PIN 변경"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"이전 PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"새 PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"새 PIN 확인"</string>
-    <string name="badPin" msgid="4154316827946559447">"입력한 이전 PIN이 올바르지 않습니다. 다시 시도해 주세요."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"입력한 PIN이 일치하지 않습니다. 다시 시도해 주세요."</string>
+    <string name="badPin" msgid="8955102849303984935">"입력한 이전 PIN이 올바르지 않습니다. 다시 시도해 주세요."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"입력한 PIN이 일치하지 않습니다. 다시 시도해 주세요."</string>
     <string name="invalidPin" msgid="5981171102258684792">"4~ 8자리 숫자로 된 PIN을 입력하세요."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"SIM PIN 사용 중지"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"SIM PIN 사용"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"잠시 기다려 주세요..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"SIM PIN 사용"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM PIN 사용 중지됨"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"입력한 PIN이 올바르지 않습니다."</string>
-    <string name="pin_changed" msgid="9000716792724195093">"SIM PIN이 변경되었습니다."</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM PIN 사용"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM PIN 사용 안함"</string>
+    <string name="pin_failed" msgid="2298841192582192277">"입력한 PIN이 올바르지 않습니다."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"SIM PIN이 변경되었습니다."</string>
     <string name="puk_requested" msgid="3898394204193202803">"비밀번호 틀림. SIM 잠겨 있음! PUK2 요청됨."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"이전 PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"새 PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"새 PIN2 확인"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"입력한 PUK2가 올바르지 않습니다. 다시 시도해 주세요."</string>
-    <string name="badPin2" msgid="515218795152422178">"입력한 이전 PIN2가 올바르지 않습니다. 다시 시도해 주세요."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"입력한 PIN2가 일치하지 않습니다. 다시 시도해 주세요."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"입력한 PUK2가 올바르지 않습니다. 다시 시도해 주세요."</string>
+    <string name="badPin2" msgid="1041576234483629991">"입력한 이전 PIN2가 올바르지 않습니다. 다시 시도해 주세요."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"입력한 PIN2가 일치하지 않습니다. 다시 시도해 주세요."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"4-8자리 수로 구성된 PIN2를 입력합니다."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"8자리 숫자로 된 PUK2를 입력하세요."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2가 변경되었습니다."</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2가 변경되었습니다."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"PUK2 코드 입력"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"비밀번호가 잘못되었습니다. PIN2를 변경한 후 다시 시도하세요."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"비밀번호 틀림. SIM 잠겨 있음! PUK2 요청됨."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"비밀번호가 잘못되었습니다. PIN2를 변경한 후 다시 시도하세요."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"비밀번호 틀림. SIM 잠겨 있음. PUK2 요청한 상태임."</string>
     <string name="doneButton" msgid="2859593360997984240">"완료"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"다자간 통화 <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"통화로 돌아가기"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"SIM 카드 없이 계속"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"SIM 카드가 없습니다. 휴대전화에 SIM 카드를 삽입하세요."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"취소"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"잠금해제"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"PIN을 인증하는 중..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"음성사서함 번호"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"전화 거는 중"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"다시 시도 중"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"다자간 통화"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"수신전화"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Cdma 통화 대기"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"통화 종료됨"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"대기 중"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"전화 끊는 중"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"부재중 통화"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"부재중 통화 <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>통"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>의 부재중 전화"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"현재 통화(<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"현재 통화"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"대기 중"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"수신 전화"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"새 음성사서함"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"알 수 없는 음성사서함 번호"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"서비스 불가"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"선택한 네트워크(<xliff:g id="OPERATOR_NAME">%s</xliff:g>)를 사용할 수 없음"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"전화 끊기"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"통화하기"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"문자 메시지"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"전화를 걸려면 먼저 비행기 모드를 해제하세요."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"네트워크에서 등록되지 않았습니다."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"모바일 네트워크를 사용할 수 없습니다."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"잘못된 번호를 입력했으므로 전화를 걸지 못했습니다."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"전화를 걸지 못했습니다."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI 시퀀스 시작 중..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"기능 코드 시퀀스 시작 중..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"지원되지 않는 서비스입니다."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"통화를 전환할 수 없습니다."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"통화를 분리할 수 없습니다."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"긴급 전화"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"무선을 켜는 중..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"서비스 지역을 벗어났습니다. 다시 시도하는 중..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>은(는) 비상 번호가 아니므로 전화를 걸지 못했습니다."</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"전화를 걸지 못했습니다. 긴급 전화번호로 전화를 걸어 보세요."</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>은(는) 긴급 번호가 아니므로 전화를 걸지 못했습니다."</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"전화를 걸지 못했습니다. 비상 전화번호로 전화를 걸어 보세요."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"키보드를 사용하여 전화걸기"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"터치톤 키패드"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"대기"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"대기 해제"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"종료"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"다이얼패드"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"숨기기"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"스피커"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"음소거"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"블루투스"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"통화 추가"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"통화 병합"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"전환"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI 텍스트"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF 신호음"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF 신호음"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"DTMF 신호음 길이 설정"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"보통"</item>
     <item msgid="2883365539347850535">"길게"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"네트워크 메시지"</string>
+    <string name="network_message" msgid="4483886461245213802">"네트워크 메시지"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"전화 활성화"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"전화 서비스를 활성화하려면 특수 통화를 해야 합니다. "\n\n"\'활성화\'를 누른 다음 지시사항을 듣고 전화를 활성화하세요."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"\'활성화\'를 터치하면 이동통신사의 모바일 네트워크에서 휴대전화를 활성화하는 특수 통화가 걸리며 모바일 데이터 네트워크에 연결할 수 있습니다."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"활성화를 건너뛰시겠습니까?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"활성화를 건너뛰면 Wi-Fi 네트워크에는 연결할 수 있지만 전화를 걸거나 모바일 데이터 네트워크에 연결할 수 없습니다. 휴대전화를 활성화할 때까지 휴대전화를 켤 때마다 활성화하라는 메시지가 표시됩니다."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"건너뛰기"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"활성화"</string>
     <string name="ota_activate" msgid="1368528132525626264">"활성화"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"전화가 활성화되었습니다."</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"전화가 활성화되었습니다."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"활성화 문제"</string>
     <string name="ota_listen" msgid="162923839877584937">"활성화가 완료되었다는 메시지를 들을 때까지 음성 안내를 따르세요."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"키패드"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"스피커"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"전화가 프로그래밍되는 동안 기다려 주세요."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"프로그래밍 실패"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"전화가 프로그래밍되는 동안 기다려 주세요."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"프로그래밍 실패"</string>
     <string name="ota_successful" msgid="1880780692887077407">"전화가 이제 활성화되었습니다. 서비스가 시작하는 데 최대 15분이 걸릴 수 있습니다."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"전화가 활성화되지 않았습니다. "\n"신호가 잘 잡히는 지역(창 근처나 바깥)을 찾아야 할 수 있습니다. "\n\n"다시 시도하거나 고객지원팀에 전화해서 다른 옵션에 대해 문의하세요."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"전화가 활성화되지 않았습니다. "\n"신호가 잘 잡히는 지역(창 근처나 바깥)을 찾아야 할 수도 있습니다. "\n\n"다시 시도하거나 고객지원팀에 전화해서 다른 옵션에 대해 문의하세요."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"너무 많은 SPC 실패"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"뒤로"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"다시 시도"</string>
     <string name="ota_next" msgid="3904945374358235910">"다음"</string>
-    <string name="ota_back" msgid="2190038043403850052">"뒤로"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"긴급 콜백 모드 시작"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"긴급 콜백 모드"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"<xliff:g id="COUNT">%s</xliff:g>분 동안 데이터 연결 없음"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"전화의 긴급 콜백 모드가 <xliff:g id="COUNT">%s</xliff:g>분 동안 지속됩니다. 이 모드에서는 데이터 연결을 사용하는 애플리케이션을 사용할 수 없습니다. 지금 종료하시겠습니까?"</item>
-    <item quantity="other" msgid="3231879566243957821">"전화의 긴급 콜백 모드가 <xliff:g id="COUNT">%s</xliff:g>분 동안 지속됩니다. 이 모드에서는 데이터 연결을 사용하는 애플리케이션을 사용할 수 없습니다. 지금 종료하시겠습니까?"</item>
+    <item quantity="one" msgid="8060210887681426682">"휴대전화가 <xliff:g id="COUNT">%s</xliff:g>분간 긴급 콜백 모드를 유지합니다. 그 동안 데이터 연결이 필요한 앱을 사용할 수 없습니다. 종료하시겠습니까?"</item>
+    <item quantity="other" msgid="8617116564023933114">"휴대전화가 <xliff:g id="COUNT">%s</xliff:g>분간 긴급 콜백 모드를 유지합니다. 그 동안 데이터 연결이 필요한 애플리케이션을 사용할 수 없습니다. 종료하시겠습니까?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"긴급 콜백 모드에서는 선택한 동작을 사용할 수 없습니다. 휴대전화의 긴급 콜백 모드 상태가 <xliff:g id="COUNT">%s</xliff:g>분 동안 지속됩니다. 지금 종료하시겠습니까?"</item>
-    <item quantity="other" msgid="3489076611710869904">"긴급 콜백 모드에서는 선택한 동작을 사용할 수 없습니다. 휴대전화의 긴급 콜백 모드 상태가 <xliff:g id="COUNT">%s</xliff:g>분 동안 지속됩니다. 지금 종료하시겠습니까?"</item>
+    <item quantity="one" msgid="2585506997024726599">"긴급 콜백 모드에서는 선택한 작업을 사용할 수 없습니다. 휴대전화가 <xliff:g id="COUNT">%s</xliff:g>분간 현재 모드를 유지합니다. 종료하시겠습니까?"</item>
+    <item quantity="other" msgid="6115622137771382224">"긴급 콜백 모드에서는 선택한 작업을 사용할 수 없습니다. 휴대전화가 <xliff:g id="COUNT">%s</xliff:g>분간 현재 모드를 유지합니다. 종료하시겠습니까?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"긴급 통화 중에는 선택한 동작을 사용할 수 없습니다."</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"긴급 콜백 모드 종료하는 중"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"긴급 통화 중에는 선택한 작업을 사용할 수 없습니다."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"긴급 콜백 모드 종료하는 중"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"예"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"아니요"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"해제"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"음성사서함 설정"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;설정 안함&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"음성사서함 서비스"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> 설정"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"서비스"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"설정"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;설정 안됨&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"기타 통화 설정"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"전화걸기"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"^1"\n<b>"^2"</b>"을(를) 통해 전화걸기"</string>
-    <string name="slide_to_answer" msgid="255903188611244476">"응답하려면 오른쪽으로 드래그"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"벨소리 장치를 무음 모드로 전환하려면 왼쪽으로 드래그"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"거부하려면 왼쪽으로 드래그"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"응답하고"\n"현재 통화를 보류하려면 오른쪽으로 드래그"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"응답하고"\n"현재 통화를 종료하려면 오른쪽으로 드래그"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"응답하고"\n"보류 중인 통화를 종료하려면 오른쪽으로 드래그"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"응답"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"거부"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>을(를) 통해 걸려온 전화"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"연락처 사진"</string>
     <string name="goPrivate" msgid="865837794424530980">"비공개로 실행"</string>
     <string name="selectContact" msgid="781975788478987237">"연락처 선택"</string>
     <string name="sip_settings" msgid="6699045718560859691">"인터넷 통화 설정"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"인터넷 전화(SIP) 계정"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"계정"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"인터넷 전화(SIP) 계정 및 상태 관리"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"수신전화 받기"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"배터리가 빨리 방전될 수 있습니다."</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"통화 옵션 구성"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"인터넷 전화 사용"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"인터넷 통화 사용(Wi-Fi 전용)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"데이터 네트워크 사용 가능 시 모든 통화에 사용"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"인터넷 통화 전용"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"통화할 때마다 묻기"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"모든 통화에 사용"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"자동 등록"</string>
-    <string name="call_priority" msgid="8374917577270504387">"SIP 발신 통화"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"발신 전화 유형"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"인터넷 전화 계정 사용:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"인터넷 전화를 걸 때 항상 사용"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"통화 설정의 인터넷 전화 설정 아래에서 다른 계정을 선택하여 전화를 걸 때 기본적으로 사용할 인터넷 전화 계정을 변경할 수 있습니다."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"\'휴대전화 &gt; 설정 &gt; 인터넷 통화 설정 &gt; 계정 화면\'에서 기본으로 사용할 인터넷 통화 계정을 변경할 수 있습니다."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"휴대전화 통화"</string>
     <string name="internet_phone" msgid="1147922660195095810">"인터넷 전화"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"인터넷 전화 계정 없음"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"이 휴대전화에 인터넷 전화 계정이 없습니다. 계정을 추가하시겠습니까?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"휴대전화에 인터넷 통화 계정이 없습니다. 지금 추가하시겠습니까?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"추가"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"계정 추가"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"계정 삭제"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP 계정"</string>
-    <string name="saving_account" msgid="7468818916695729968">"계정 저장 중..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"계정 삭제 중..."</string>
+    <string name="saving_account" msgid="52903398217017954">"계정 저장 중..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"계정 삭제 중..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"저장"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"취소"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"프로필 닫기"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"확인"</string>
     <string name="close_profile" msgid="6886968271423155284">"닫기"</string>
-    <string name="primary_account" msgid="2229538308291934245">"기본"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"내 기본 계정으로 설정"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"발신 전화에 사용됨"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"고급 설정"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"기본 계정. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"상태 확인 중..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"등록 중..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"계속 시도 중..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"전화를 받지 않음"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"인터넷에 연결되어 있지 않기 때문에 계정 등록이 중지되었습니다"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Wi-Fi에 연결되어 있지 않기 때문에 계정 등록이 중지되었습니다"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"계정을 등록하지 못했습니다."</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"전화 받기"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"등록 중..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"계속 시도 중..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"전화를 수신하지 않습니다."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"인터넷에 연결되어 있지 않기 때문에 계정 등록이 중지되었습니다."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Wi-Fi에 연결되어 있지 않기 때문에 계정 등록이 중지되었습니다."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"계정을 등록하지 못했습니다."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"전화를 수신합니다."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"계정을 등록하지 못했습니다(<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). 나중에 다시 시도합니다."</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"계정을 등록하지 못했습니다. 사용자 이름 또는 비밀번호가 잘못되었습니다."</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"계정을 등록하지 못했습니다. 서버 이름을 확인하세요."</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"<xliff:g id="ACCOUNT_OWNER">%s</xliff:g> 애플리케이션에서 이 계정을 현재 사용 중입니다."</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"계정을 등록하지 못했습니다. 사용자 이름 또는 비밀번호가 잘못되었습니다."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"계정을 등록하지 못했습니다. 서버 이름을 확인하세요."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"<xliff:g id="ACCOUNT_OWNER">%s</xliff:g> 앱에서 현재 이 계정을 사용 중입니다."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIP 계정 세부정보"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP 계정 세부정보"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"서버"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"포트 번호"</string>
     <string name="transport_title" msgid="8253139511847746640">"전송 유형"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"연결 유지 메시지 보내기"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"SIP 연결 유지 메시지 보내기"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"자동 등록"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"프로필 자동 등록"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"기본 계정으로 설정"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"발신 전화에 사용됨"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"설정(선택사항)"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;선택사항&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ 모두 표시하려면 터치"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ 모두 숨기려면 터치"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>은(는) 필수이므로 비워 둘 수 없습니다."</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"포트 번호는 1000에서 65534 이내여야 합니다"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>은(는) 필수이므로 비워 둘 수 없습니다."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"포트 번호는 1000에서 65534 이내여야 합니다."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"인터넷에 연결되지 않음"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Wi-Fi 연결 없음"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"인터넷 전화를 걸려면 먼저 인터넷 연결을 확인하세요."</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"인터넷 전화를 사용하려면 Wi-Fi 네트워크에 연결되어 있어야 합니다(\'무선 및 네트워크\' 설정 사용)."</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"인터넷 전화를 걸려면 먼저 인터넷 연결을 확인하세요."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"인터넷 전화를 사용하려면 Wi-Fi 네트워크에 연결되어 있어야 합니다(\'무선 및 네트워크\' 설정 사용)."</string>
     <string name="no_voip" msgid="8901474054537199865">"인터넷 전화가 지원되지 않습니다."</string>
     <string name="sip_system_decide" msgid="368030746310423471">"자동"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"항상 보내기"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"바로 다시 전화드리겠습니다."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"나중에 전화드리겠습니다."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"통화 불가. 나중에 전화주세요."</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"메시지 맞춤설정..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"맞춤 메시지"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"빠른 응답"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"빠른 응답 수정"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"별"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"0"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"파운드"</string>
-    <string name="description_search_button" msgid="239929880630534731">"검색"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"전화걸기"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"백스페이스"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"스피커폰이 사용 설정되었습니다."</string>
@@ -715,9 +615,33 @@
     <string name="description_target_decline" msgid="4789834364389731957">"거부"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"진동"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"진동"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"벨소리"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"항상"</item>
     <item msgid="1595097872875714252">"무음 시에만"</item>
-    <item msgid="1458182414036878616">"사용 안함"</item>
+    <item msgid="1458182414036878616">"안함"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"전화 벨소리"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"전화 수신 시 진동"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"다이얼패드 터치음"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"벨소리"</string>
+    <string name="perm_change_mobile_network">네트워크 바꾸기 (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">이 권한을 가진 어플리케이션은 아무 때나 2G 데이터와 3G 데이터를 선택할 수 있습니다. 3G는 더 빠르지만 배터리를 더 많이 소모하며 요금이 더 많이 나올 수 있습니다.</string>
+    <!-- Dialer UI Settings -->
+    <string name="dialer_ui_settings_title">"다이얼패드 설정"</string>
+    <string name="dialer_ui_settings_summary">"다이얼패드의 설정을 변경"</string>
+
+    <!-- Noise suppression -->
+    <string name="noise_suppression_title">"잡음 제거"</string>
+    <string name="noise_suppression_summary">"통화 중 잡음을 제거"</string>
+    <!-- End Noise suppression -->
+
+    <string name="phone_number_label">"내 전화번호"</string>
+    <string name="phone_number_summary">"기기의 전화번호를 설정"</string>
+    <string name="advanced_setting">고급 설정</string>
+    <string name="vibrate_outgoing">통화 시작 시 진동</string>
+    <string name="vibrate_45">45초마다 진동</string>
+    <string name="vibrate_45_sum">거는 통화일 때 45초마다 진동합니다.</string>
+    <string name="vibrate_hangup">통화 종료 시 진동</string>
+    <string name="vibrate_call_waiting">통화 중 대기시 진동</string>
 </resources>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 21ea3e368..56ad1594d 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -15,6 +15,4 @@
 -->
 <resources>
     <dimen name="emergency_dialer_digits_height">66dip</dimen>
-    <dimen name="emergency_dialer_digits_margin_bottom">69dip</dimen>
-    <dimen name="emergency_dialer_digits_text_size">28sp</dimen>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 1fbe6be4d..0c3f4b761 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Privatus numeris"</string>
     <string name="payphone" msgid="1931775086311769314">"Mokamas telefonas"</string>
     <string name="onHold" msgid="9035493194749959955">"Sulaikyta"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Dabartinis skambutis"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Linija užimta"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Tinklas užimtas"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Nėra atsako, baigėsi laikas"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Serveris nepasiekiamas"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numeris nepasiekiamas"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Neteisingas naudotojo vardas arba slaptažodis"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Skambinta iš už tinklo ribų"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Skambinta ne iš šio tinklo"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Serverio klaida. Vėliau bandykite dar kartą."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Nėra signalo"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Pasiekta ACM riba"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radijas išjungtas"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Nėra SIM kortelės arba SIM kortelės klaida"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Nėra SIM kortelės arba įvyko SIM kortelės klaida"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Sritis, kurioje neteikiamos paslaugos"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Išeinančius skambučius apriboja FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Negalite skambinti, kai įjungtas skambučių draudimas."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Negalite skambinti, kai įjungtas skambučių draudimas."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Visi skambučiai apriboti prieigos valdymu."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Pagalbos skambučius apriboja prieigos valdymas."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Įprastus skambučius riboja prieigos valdymas."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: telefonas užrakintas iki maitinimo ciklo."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: skambutis atmestas."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: skambutis sustabdytas."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: užsakymas iš naujo."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: paslaugos parinkties atmetimas."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: užsakymas bandyti iš naujo."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA – nepavyko pasiekti."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: sukliudyta."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Galimi tik pagalbos skambučiai."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Neteisingas numeris"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Neteisingas numeris"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferencinis skambutis"</string>
     <string name="call_lost" msgid="317670617901479594">"Skambutis prarastas."</string>
-    <string name="retry" msgid="8462986804300767852">"Bandyti dar kartą"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Prarastas skambutis"</string>
     <string name="ok" msgid="3811371167865772377">"Gerai"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Paleistas MMI kodas"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Paleistas USSD kodas..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Laidinės ausinės"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Siųsti šiuo tonus?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Siunčiami tonai"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Siunčiami tonai"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Siųsti"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Taip"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Ne"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Pakaitos simbolį pakeisti"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Pakaitos simbolį pakeisti"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Trūksta balso pašto numerio"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"SIM kortelėje nėra išsaugoto balso pašto numerio."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Pridėti numerį"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Įkeliama…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Jei norite atrakinti SIM kortelę, įveskite PIN kodą."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM atrakinta"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Naujas SIM kortelės PIN kodas"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Įveskite naują SIM kortelės PIN kodą dar kartą, kad patvirtintumėte"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Įvesti SIM kortelės PIN kodai neatitinka. Bandykite dar kartą."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Jei norite atrakinti SIM kortelę, įveskite PUK kodą"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Neteisingas PUK kodas!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Tęsti"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Jūsų SIM kortelė buvo atblokuota. Atrakinamas telefonas..."</string>
     <string name="label_ndp" msgid="780479633159517250">"SIM tinklo atrakinimo PIN"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Atblokuoti"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Pateikiama užklausa atrakinti tinklą..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Nesėkminga tinklo atrakinimo užklausa."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Tinklas sėkmingai atrakintas."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM skambinimo nustatymai"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA skambučio nustatymai"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Prieigos taškų pavadinimai"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Papildomi tik CDMA nustatymai"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Tinklo paslaugos nustatymai"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Skambintojo ID"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Įkeliami nustatymai…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Numeris paslėptas išeinančiuose skambučiuose"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Numeris pateikiamas išeinančiuose skambučiuose"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Naudoti numatytuosius nustatymus, kad išeinančiuose skambučiuose būtų pateikiamas mano numeris"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Numeris, kai užimta"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Peradresuojama į <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Išjungta"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Jūsų operatorius nepalaiko skambučių peradresavimo, kai telefonas užimtas, išjungimo."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operatorius nepalaiko skambučių peradresavimo išjungimo, kai telefonas užimtas."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Peradresuoti, kai neatsiliepiama"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Numeris kai neatsiliepiama"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Peradresuojama į <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Išjungta"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Jūsų operatorius nepalaiko skambučių peradresavimo, kai neatsiliepiama, išjungimo."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operatorius nepalaiko skambučių peradresavimo išjungimo, kai neatsiliepiama."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Peradresuoti, kai nepasiekiama"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Numeris, kai nepasiekiama"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Peradresuojama į <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Išjungta"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Jūsų operatorius nepalaiko skambučių peradresavimo išjungimo, kai telefonas nepasiekiamas."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Operatorius nepalaiko skambučių peradresavimo išjungimo, kai telefonas nepasiekiamas."</string>
     <string name="updating_title" msgid="6146755386174019046">"Skambinimo nustatymai"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Skambinimo nustatymų klaida"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Skaitomi nustatymai..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Grąžinami nustatymai…"</string>
     <string name="response_error" msgid="6674110501330139405">"Netikėtas atsakas iš tinklo."</string>
     <string name="exception_error" msgid="7027667130619518211">"Tinklo ar SIM kortelės klaida."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Operacijos leidžiamos tik naudojant fiksuoto rinkimo numerius."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Prieš žiūrėdami šiuos nustatymus, įjunkite radiją."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Įjungtas jūsų telefono programos fiksuotojo rinkimo numerių nustatymas. Todėl neveikia kai kurios su skambinimu susijusios funkcijos."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Prieš žiūrėdami šiuos nustatymus, įjunkite radiją."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Gerai"</string>
     <string name="enable" msgid="1059008390636773574">"Įgalinti"</string>
     <string name="disable" msgid="7274240979164762320">"Išjungti"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Slėpti numerį"</item>
     <item msgid="1108394741608734023">"Rodyti numerį"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Išsaugoti balso pašto numerį"</string>
     <string name="vm_changed" msgid="380744030726254139">"Pasikeitė balso pašto numeris."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Nesėkmingas balso pašto numerio pakeitimas."\n"Jei ši problema išliks, susisiekite su savo operatoriumi."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Nesėkmingas peradresavimo numerio pakeitimas."\n"Jie ši problema išliks, kreipkitės į savo operatorių."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Balso pašto numerio pakeisti nepavyko."\n"Jei ši problema kartosis, kreipkitės į operatorių."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Persiuntimo numerio pakeisti nepavyko."\n"Jei ši problema kartosis, kreipkitės į operatorių."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Nepavyko pateikti ir išsaugoti dabartinio peradresavimo numerio nustatymų."\n"Vis tiek perjungti naują teikėją?"</string>
     <string name="no_change" msgid="3186040086622435212">"Neatlikta jokių pakeitimų."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Pasirinkti balso pašto paslaugą"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Ieškoti tinklų"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Klaida ieškant tinklų."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registruojama <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Jūsų SIM kortelė neleidžia užmegzti ryšio su šiuo tinklu."</string>
-    <string name="connect_later" msgid="500090982903469816">"Šiuo metu neįmanoma prisijungti prie šio tinklo. Vėliau bandykite dar kartą."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"SIM kortelė neleidžia užmegzti ryšio su šiuo tinklu."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Dabar prie šio tinklo prisijungti nepavyksta. Bandykite dar kartą vėliau."</string>
     <string name="registration_done" msgid="495135664535876612">"Registruota tinkle."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Pasirinkite tinklo operatorių"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Pasirinkite tinklo operatorių"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Ieškoti galimų tinklų"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Parinkti automatiškai"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Automatiškai pasirinkti pageidaujamą tinklą"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automatinė registracija..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Pasirinkti automatiškai"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Automatiškai pasirinkti pageidaujamą tinklą"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automatinė registracija..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Tinklo režimas"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Pakeisti tinklo veikimo režimą"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Pageidaujamas tinklo režimas"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Pageidaujamas tinklo režimas: tik „EvDo“"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Pageidaujamas tinklo režimas: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE / CDMA"</item>
     <item msgid="3273348576277144124">"Tik EvDo"</item>
     <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo automatinis"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA automatinis"</item>
+    <item msgid="648505122852496166">"CDMA / „EvDo“ automatinis"</item>
+    <item msgid="7148247646407324800">"GSM / WCDMA automatinis"</item>
     <item msgid="5189164180446264504">"Tik WCDMA"</item>
     <item msgid="5714714953966979187">"Tik GSM"</item>
-    <item msgid="4775796025725908913">"Pageidaujama GSM / WCDMA"</item>
+    <item msgid="8508331239546115206">"Pageidaujama GSM / WCDMA"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE / CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Duomenys įgalinti"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Tarptinklinis duomenų ryšys"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Veikiant tarptinkliniam ryšiui, prisijungti prie duomenų paslaugų"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Veikiant tarptinkliniam ryšiui, prisijungti prie duomenų paslaugų"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Praradote duomenų jungiamumą, nes pagrindinį tinklą palikote išjungę tarptinklinį ryšį."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Ryšys su duomenimis nutrūko, nes iš pagrindinio tinklo išėjote neįjungę tarptinklinio ryšio."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Leisti tarptinklinį duomenų ryšį? Galite būti apmokestinti nemažais tarptinklinio ryšio mokesčiais!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM / UMTS parinktys"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA parinktys"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Duomenų naudojimas"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Operatoriaus duomenų politika"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Duomenys, naudojami dabartiniame laikotarpyje"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Duomenų naudojimo laikotarpis"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Duomenų perdavimo spartos politika"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Praėjo <xliff:g id="USED_0">%1$d</xliff:g>٪ ciklo"\n"Kitas laikotarpis prasidės po<xliff:g id="USED_1">%2$d</xliff:g> dienų (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Duomenų perdavimo sparta sumažinta iki <xliff:g id="USED">%1$d</xliff:g> kB / sek., jei pasiekiama duomenų naudojimo riba"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Daugiau informacijos apie operatoriaus mobiliojo ryšio duomenų naudojimo politiką"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS perdavimas į mobilųjį telefoną"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS perdavimas į mobilųjį telefoną"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS perdavimas į mobilųjį telefoną"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Įgalintas SMS perdavimas į mobilųjį telefoną"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Korėjų"</item>
     <item msgid="1933212028684529632">"Kinų k."</item>
     <item msgid="1908428006803639064">"Hebrajų"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Kalbos"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Vietiniai orai"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Darbo galimybės"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Įgalintos darbo galimybės"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Išjungtos darbo galimybės"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Medicinos, sveikatos ir ligoninės"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Medicina, sveikata ir ligoninė įjungta"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Medicina, sveikata ir ligoninė išjungta"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Medicina, sveikata ir ligoninė"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"„Medicina, sveikata ir ligoninė“ įgalinta"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"„Medicina, sveikata ir ligoninė“ neleidžiama"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Technologijų naujienos"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Įgalintos technologijų naujienos"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Išjungtos technologijų naujienos"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"Tik WCDMA"</item>
     <item msgid="8776934131146642662">"Tik GSM"</item>
     <item msgid="4684679567848300935">"GSM / WCDA (pageidaujama WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Naudoti tik 2G tinklus"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Taupo akumuliatorių"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Sistemos pasirinkimas"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Pakeisti tarptinklinio CDMA ryšio režimą"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Pakeisti tarptinklinio CDMA ryšio režimą"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistemos pasirinkimas"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Tik pagrindinis"</item>
     <item msgid="1205664026446156265">"Automatinis"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA tarptinklinio ryšio režimas"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Pakeisti tarptinklinio CDMA ryšio režimą"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA tarptinklinio ryšio režimas"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Tik pagrindiniai tinklai"</item>
-    <item msgid="8174642753290624634">"Susiję tinklai"</item>
-    <item msgid="2241951431403168661">"Bet kuris tinklas"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA prenumerata"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA tinklo nuostatos"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Dar neįdiegta!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA tinklo nuostatos"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"Tik CDMA"</item>
     <item msgid="2683555124647197574">"Tik EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA prenumerata"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Keisti RUIM / SIM ir NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"prenumerata"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM / SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Suaktyvinti įrenginį"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Nustatyti duomenų paslaugą"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Valdyti fiksuoto rinkimo numerius"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Pakeisti PIN kodą FDN prieigai"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Valdyti telefono numerių sąrašą"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Balso privatumas"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Balso privatumas"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Įgalinti patobulintą privatumo režimą"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY režimas"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Įgalinti TTY režimą"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY režimas"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Nustatyti TTY režimą"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Automatinis bandymas iš naujo"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Įgalinti automatinio bandymo iš naujo režimą"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Automatinis bandymas iš naujo"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Įgalinti automatinio kartotinio bandymo režimą"</string>
     <string name="menu_add" msgid="1882023737425114762">"Pridėti adresatą"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Redaguoti adresatą"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Ištrinti adresatą"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Įvesti PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Įveskite PIN2 kodą"</string>
     <string name="name" msgid="7329028332786872378">"Pavadinimas"</string>
     <string name="number" msgid="7905950798349903858">"Numeris"</string>
     <string name="save" msgid="4094274636321939086">"Išsaugoti"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Ištrinti fiksuoto rinkimo numerį"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Trinamas fiksuoto rinkimo numeris..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Ištrintas fiksuoto rinkimo numeris."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN neatnaujintas: įvedėte neteisingą PIN kodą."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN neatnaujinta: skaičius negali viršyti 20 skaitmenų."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN neatnaujintas, nes įvedėte neteisingą PIN kodą."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN neatnaujintas, nes numerį gali sudaryti ne daugiau kaip 20 skaitmenų."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN nebuvo atnaujintas. Įvestas PIN2 kodas buvo netinkamas arba telefono numeris buvo atmestas."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Skaitoma iš SIM kortelės..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM kortelėje adresatų nėra."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Pasirinkti importuojamus adresatus"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Jei norite importuoti kontaktų duomenis iš SIM kortelės, išjunkite skrydžio režimą."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Jei norite importuoti kontaktus iš SIM kortelės, pirmiausia išjunkite lėktuvo režimą."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Įgalinti / išjungti SIM kortelės PIN"</string>
     <string name="change_pin" msgid="9174186126330785343">"Pakeisti SIM kortelės PIN kodą"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM kortelės PIN kodas:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Senas PIN kodas"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Naujas PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Patvirtinti naują PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Įvestas senasis PIN neteisingas. Bandykite dar kartą."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Įvesti PIN kodai neatitinka. Bandykite dar kartą."</string>
+    <string name="badPin" msgid="8955102849303984935">"Įvestas senasis PIN kodas yra neteisingas. Bandykite dar kartą."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Įvesti PIN kodai nesutampa. Bandykite dar kartą."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Įveskite PIN kodą, sudarytą iš 4–8 skaičių."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Išjunti SIM kortelės PIN"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Įgalinti SIM kortelės PIN"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Palaukite..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"Įgalintas SIM kortelės PIN kodas"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM kortelės PIN kodas išjungtas"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Įvestas PIN kodas neteisingas"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"SIM kortelės PIN kodas sėkmingai pakeistas"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM kortelės PIN kodas įgalintas"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM kortelės PIN kodas neleidžiamas."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Įvestas PIN kodas neteisingas."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"SIM kortelės PIN kodas pakeistas sėkmingai."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Slaptažodis neteisingas, SIM kortelė užrakinta! Reikia PUK2 kodo."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Senas PIN2 kodas"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Naujas PIN2 kodas"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Patvirtinti naują PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Įvestas PUK2 neteisingas. Bandykite dar kartą."</string>
-    <string name="badPin2" msgid="515218795152422178">"Įvestas senasis PIN2 neteisingas. Bandykite dar kartą."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Įvesti PIN2 neatitinka. Bandykite dar kartą."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Įvestas PUK2 kodas yra neteisingas. Bandykite dar kartą."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Įvestas senasis PIN2 kodas neteisingas. Bandykite dar kartą."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Įvesti PIN2 kodai nesutampa. Bandykite dar kartą."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Įveskite PIN2 kodą, sudarytą iš 4–8 skaičių."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Įveskite 8 skaičių PUK2."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 sėkmingai pakeistas"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 kodas pakeistas sėkmingai."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Įveskite PUK2 kodą"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Neteisingas slaptažodis, pakeiskite PIN2 ir bandykite iš naujo!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Slaptažodis neteisingas, SIM kortelė užrakinta! Reikia PUK2 kodo."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Neteisingas slaptažodis. Pakeiskite PIN2 kodą ir bandykite dar kartą."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Slaptažodis neteisingas, todėl SIM kortelė užrakinta. Būtina įvesti PUK2 kodą."</string>
     <string name="doneButton" msgid="2859593360997984240">"Atlikta"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferencinis skambutis <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Atgal į skambinimą"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Tęsti be SIM kortelės"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Nerasta SIM kortelė. Įdėkite SIM kortelę į telefoną."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Atsisakyti"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Atblokuoti"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Patvirtinamas PIN kodo autentiškumas..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Balso pašto numeris"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Renkamas numeris"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Bandoma dar kartą"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferencinis skambutis"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Gaunamas skambutis"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Laukia CDMA skambutis"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Skambutis baigtas"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Sulaikyta"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Baigiamas pokalbis"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Praleisti skambučiai"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> praleisti (-ų) skambučiai (-ų)"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"praleistas skambutis nuo <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Dabartinis skambutis (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Vykstantis pokalbis"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Sulaikyta"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Skambina"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Naujas balso pašto pranešimas"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nežinomas balso pašto numeris"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nėra paslaugos"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Pasirinktas tinklas (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) negalimas"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Padėti ragelį"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Perskambinti"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Pranešimas"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Jei norite skambinti, išjunkite lėktuvo režimą."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Neregistruota tinkle."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilusis tinklas negalimas."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Skambutis neišsiųstas; neįvestas teisingas numeris."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Skambutis neišsiųstas."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Paleidžiama MMI seka..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Paleidžiama funkcijos kodo seka..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nepalaikoma paslauga."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Neįmanoma perjungti skambučių."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Neįmanoma atskirti skambučio."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Skambutis pagalbos numeriu"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Įjungiamas radijas…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Sritis, kurioje paslauga neteikiama, bandoma iš naujo..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Nepaskambinta, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nėra pagalbos numeris!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Nepaskambinta, surinkite pagalbos numerį!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Nepaskambinta. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nėra pagalbos numeris!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Nepaskambinta. Surinkite pagalbos numerį!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Naudokite klaviatūrą ir rinkite numerius"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Palieskite tonų klaviatūrą"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Sulaikyti"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Panaikinti sulaikymą"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Pabaiga"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Numerio rinkimo klaviatūra"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Slėpti"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Garsiakalbis"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Nutildyti"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Pridėti skambutį"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Sujungti skambučius"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Apkeisti"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI tekstas"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DMTF tonai"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DMTF tonai"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Nustatyti DTMF tonų ilgį"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Įprastas"</item>
     <item msgid="2883365539347850535">"Ilgas"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Tinklo pranešimas"</string>
+    <string name="network_message" msgid="4483886461245213802">"Tinklo pranešimas"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktyvinkite savo telefoną"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Kad suaktyvintumėte telefono paslaugą, reikia atlikti specialų skambutį. "\n\n"Paspaudę „Aktyvinti“ klausykite pateikiamų telefono aktyvinimo instrukcijų."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Palieskite „Aktyvinti“, kad atliktumėte specialų skambutį, kuris suaktyvina jūsų telefoną operatoriaus mobiliajame tinkle, kad galėtumėte skambinti ir prisijungti prie mobiliųjų duomenų tinklų."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Praleisti aktyvinimą?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Jei praleisite aktyvinimą, negalėsite skambinti ar prisijungti prie mobilių duomenų tinklų (nors ir galite prisijungti prie „Wi-Fi“ tinklų). Iki tol, kol suaktyvinsite telefoną, aktyvinkite jį kaskart jį įjungdami."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Praleisti"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktyvinti"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktyvinti"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Telefonas suaktyvintas!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefonas suaktyvintas."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Aktyvinimo problema"</string>
     <string name="ota_listen" msgid="162923839877584937">"Vadovaukitės girdimomis instrukcijomis, kol išgirsite, kad aktyvinimas baigtas."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Klaviatūra"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Garsiakalbis"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Palaukite, kol bus užprogramuotas jūsų telefonas."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Nesėkmingas programavimas"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Palaukite, kol bus užprogramuotas telefonas."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Užprogramuoti nepavyko"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Dabar jūsų telefonas suaktyvintas. Gali praeiti iki 15 min., kol paslauga bus paleista."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Telefonas nebuvo suaktyvintas. "\n"Jums gali reikėti rasti sritį, kurioje geresnė aprėptis (prie lango arba lauke). "\n\n"Bandykite dar kartą arba skambinkite klientų tarnybai, kad sužinotumėte kitas parinktis."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Telefonas nebuvo suaktyvintas. "\n"Galbūt reikia rasti vietą, kurioje ryšys veikia geriau (prie lango arba lauke). "\n\n"Bandykite dar kartą arba skambinkite klientų aptarnavimo tarnybai ir išsiaiškinkite, ką dar galima padaryti."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"PER DAUG SCP TRIKČIŲ"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Atgal"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Bandyti dar kartą"</string>
     <string name="ota_next" msgid="3904945374358235910">"Kitas"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Atgal"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Įvestas atgalinio skambinimo pagalbos numeriu režimas"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Atgalinio skambinimo pagalbos numeriu režimas"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"Jokio duomenų ryšio <xliff:g id="COUNT">%s</xliff:g> min."</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Šis telefonas bus atgalinio skambinimo pagalbos numeriu režime <xliff:g id="COUNT">%s</xliff:g> min. Kol veikia šis režimas, negalima naudoti jokių programų, naudojančių duomenų ryšį. Ar norite išeiti dabar?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Šis telefonas bus atgalinio skambinimo pagalbos numeriu režimu veiks <xliff:g id="COUNT">%s</xliff:g> min. Kol veikia šis režimas, negalima naudoti jokių programų, naudojančių duomenų ryšį. Ar norite išeiti dabar?"</item>
+    <item quantity="one" msgid="8060210887681426682">"<xliff:g id="COUNT">%s</xliff:g> min. telefonas veiks atgalinio skambinimo pagalbos numeriu režimu. Telefonui veikiant šiuo režimu, negalėsite naudoti jokių ryšio su duomenimis programų. Ar norite šį režimą išjungti dabar?"</item>
+    <item quantity="other" msgid="8617116564023933114">"<xliff:g id="COUNT">%s</xliff:g> min. telefonas veiks atgalinio skambinimo pagalbos numeriu režimu. Telefonui veikiant šiuo režimu, negalėsite naudoti jokių ryšio su duomenimis programų. Ar norite šį režimą išjungti dabar?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Pasirinkto veiksmo atlikti negalima, kai veikia atgalinio skambinimo pagalbos numeriu režimas. Telefonas šiuo režimu veiks <xliff:g id="COUNT">%s</xliff:g> min. Ar norite išeiti dabar?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Pasirinkto veiksmo atlikti negalima, kai veikia atgalinio skambinimo pagalbos numeriu režimas. Telefonas šiuo režimu veiks <xliff:g id="COUNT">%s</xliff:g> min. Ar norite išeiti dabar?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Skambinant pagalbos telefonu pasirinkto veiksmo atlikti nepavyks. Šiuo režimu telefonas veiks <xliff:g id="COUNT">%s</xliff:g> min. Ar norite šį režimą išjungti dabar?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Skambinant atgalinio pagalbos numerio režimu pasirinkto veiksmo atlikti nepavyks. Šiuo režimu telefonas veiks <xliff:g id="COUNT">%s</xliff:g> min. Ar norite šį režimą išjungti dabar?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Pasirinktas veiksmas negalimas, kai skambinama pagalbos numeriu"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Išeinama iš atgalinio skambinimo pagalbos numeriu režimo"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Skambinant pagalbos numeriu pasirinkto veiksmo atlikti nepavyks."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Išeinama iš atgalinio skambinimo pagalbos numeriu režimo"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Taip"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Ne"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Atsisakyti"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Balso pašto nustatymai"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;nenustatyta&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Balso pašto paslauga"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"„<xliff:g id="PROVIDER_NAME">%s</xliff:g>“ nustatymai"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Paslauga"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Sąranka"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nenustatyta&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Kiti skambučio nustatymai"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Rinkti numerį"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Skambinama naudojant ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Vilkite į dešinę, kad atsilieptumėte"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Vilkite į kairę, kad nutildytumėte skambutį"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Vilkite į kairę, kad atmestumėte"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Vilkite į dešinę, kad atsilieptumėte ir"\n"sulaikytumėte aktyvų skambutį"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Vilkite į dešinę, kad atsilieptumėte ir"\n"užbaigtumėte aktyvų skambutį"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Vilkite į dešinę, kad atsilieptumėte ir "\n" užbaigtumėte sulaikytą skambutį"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Atsiliepti"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Atmesti"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Skambinama naudojantis „<xliff:g id="PROVIDER_NAME">%s</xliff:g>“ paslaugomis"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"kontakto nuotrauka"</string>
     <string name="goPrivate" msgid="865837794424530980">"naudoti privatų režimą"</string>
     <string name="selectContact" msgid="781975788478987237">"pasirinkti kontaktą"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Skambučio internetu nustatymai"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Skambinimo internetu (SIP) paskyros"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Paskyros"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Valdyti skambinimo internetu (SIP) paskyras ir būseną"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Gauti gaunamus skambučius"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Sutrumpėja akumuliatoriaus naudojimo laikas"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Konfigūruoti skambučių parinktis"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Naudoti skambinimą internetu"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Naudoti skambinimą internetu (tik „Wi-Fi“)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Visiems skambučiams, kai pasiekiamas duomenų tinklas"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Tik skambučiams internetu"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Klausti dėl kiekvieno skambučio"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Visiems skambučiams"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Automatinė registracija"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Siunčiamas skambutis per SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Skambinti"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Naudoti skambinimo internetu paskyrą:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Visada naudoti skambinant internetu"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Kad pakeistumėte skambinant pagal numatytuosius nustatymus naudojamą skambinimo internetu paskyrą, galite naudoti skambučių nustatymus, skambučių internetu nustatymuose pasirinkdami kitą paskyrą"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Numatytą naudoti skambinimo internetu paskyrą galite pakeisti čia: „Telefonas“ &gt; „Nustatymai“ &gt; „Skambučio internetu nustatymai“ &gt; „Paskyrų“ ekranas."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Skambutis mobiliuoju telefonu"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Skambutis internetu"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Nėra skambinimo internetu paskyros"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Šiame telefone nėra skambinimo internetu paskyrų. Dabar pridėti?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Šiame telefone nenustatyta nė viena skambinimo internetu paskyra. Ar norite pridėti ją dabar?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Pridėti"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Pridėti paskyrą"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Pašalinti paskyrą"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP paskyros"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Išsaugoma paskyra..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Pašalinama paskyra..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Išsaugoma paskyra..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Pašalinama paskyra..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Išsaugoti"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Atmesti"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Uždaryti profilį"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"Gerai"</string>
     <string name="close_profile" msgid="6886968271423155284">"Uždaryti"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Pagrindinė"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Padaryti šią paskyrą pagrindine"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Naudojama siunčiamiems skambučiams"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Išplėstiniai nustatymai"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Pagrindinė paskyra. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Tikrinama būsena..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Registruojama..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Vis dar bandoma..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Negaunami skambučiai"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Paskyros registracija sustabdyta, nes nėra interneto ryšio"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Paskyros registracija sustabdyta, nes nėra „Wi-Fi“ ryšio"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Nesėkminga paskyros registracija"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Gaunami skambučiai"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registruojama..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Vis dar bandoma..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Skambučiai negaunami."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Paskyros registracija sustabdyta, nes neprisijungta prie interneto."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Paskyros registracija sustabdyta, nes neprisijungta prie „Wi-Fi“."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Paskyros užregistruoti nepavyko."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Gaunami skambučiai."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Paskyros registracija nepavyko: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); bus bandoma vėliau"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Paskyros registracija nepavyko: netinkamas naudotojo vardas arba slaptažodis"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Nesėkminga paskyros registracija: patikrinkite serverio pavadinimą"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Šią paskyrą šiuo metu naudoja programa „<xliff:g id="ACCOUNT_OWNER">%s</xliff:g>“"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Paskyros užregistruoti nepavyko: netinkamas naudotojo vardas arba slaptažodis."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Paskyros užregistruoti nepavyko. Patikrinkite serverio pavadinimą."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Šią paskyrą dabar naudoja programa „<xliff:g id="ACCOUNT_OWNER">%s</xliff:g>“."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Išsami SIP paskyros informacija"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Išsami SIP paskyros informacija"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Serveris"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Prievado numeris"</string>
     <string name="transport_title" msgid="8253139511847746640">"Transportavimo tipas"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Siųsti „palaikyti“"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Siųsti SIP palaikymo pranešimus"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Automatinė registracija"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Automatiškai užregistruoti profilį"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Nustatyti kaip pagrindinę paskyrą"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Naudojama siunčiamiems skambučiams"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Pasirenkami nustatymai"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Pasirenkama&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▽ Jei norite viską parodyti, palieskite"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Jei norite viską paslėpti, palieskite"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> laukas privalomas, negalima palikti tuščio"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Prievado numeris turi būti nuo 1000 iki 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Lauke „<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>“ reikšmę nurodyti būtina – jis negali likti tuščias."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Prievado numeris turi būti nuo 1000 iki 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Nėra interneto ryšio"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Nėra „Wi-Fi“ ryšio"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Jei norite skambinti internetu, pirmiausia patikrinkite interneto ryšį"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Kad galėtumėte skambinti internetu, turite būti prisijungę prie „Wi-Fi“ tinklo (naudokite nustatymus „Belaidis ir tinklas“)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Jei norite skambinti internetu, pirmiausia patikrinkite interneto ryšį."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Jei norite skambinti internetu, turite būti prisijungę prie „Wi-Fi“ ryšio tinklo (naudokite nustatymus „Belaidis ir tinklas“)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Skambinimas internetu nepalaikomas"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automatinis"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Visada siųsti"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Netrukus perskambinsiu."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Paskambinsiu vėliau."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Dabar negaliu kalb. Pask. vėliau."</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Priskirtas pranešimas..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Priskirtas pranešimas"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Greiti atsakai"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Redaguoti greitus atsakus"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"žvaigždutė"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"nulis"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"svaras"</string>
-    <string name="description_search_button" msgid="239929880630534731">"ieškoti"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"rinkti numerį"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"naikinimo klavišas"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Garsiakalbis įgalintas."</string>
@@ -715,9 +615,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Atmesti"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibruoti"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibruoti"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Skambėjimo tonas"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Visada"</item>
-    <item msgid="1595097872875714252">"Tik kai veikia tyliai"</item>
+    <item msgid="1595097872875714252">"Tik kai veikia tylos režimu"</item>
     <item msgid="1458182414036878616">"Niekada"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Telefono skambėjimo tonas"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibruoti, kai skambina"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Numerio rinkimo lietimo tonas"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Skambėjimo tonas"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 2bccb509f..3292ed361 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Privāts numurs"</string>
     <string name="payphone" msgid="1931775086311769314">"Taksofons"</string>
     <string name="onHold" msgid="9035493194749959955">"Aizturēts"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Pašreizējais zvans"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Līnija ir aizņemta"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Tīkls ir aizņemts"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Nav atbildes; noildze"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Serveris nav sasniedzams"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numurs nav sasniedzams"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nepareizs lietotājvārds vai parole"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Zvans tika veikts ārpus tīkla"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Zvans tika veikts ārpus tīkla."</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Servera kļūda. Vēlāk mēģiniet vēlreiz."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Nav signāla"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM ierobežojums ir pārsniegts."</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio ir izslēgts."</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Nav SIM vai SIM kļūda"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Nav SIM, vai SIM kļūda"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Ārpus apkalpošanas apgabala"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"FNSN ierobežo izejošos zvanus."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Izejošos zvanus nevar veikt, ja ir ieslēgts zvanu aizliegums."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Izejošos zvanus nevar veikt, ja ir ieslēgts zvanu aizliegums."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Piekļuves vadība ierobežo visus zvanus."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Piekļuves vadība ierobežo ārkārtas zvanus."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Piekļuves vadība ierobežo parastos zvanus."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: tālrunis ir bloķēts līdz nākamajai restartēšanas reizei."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: zvans ir pārtraukts."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: zvans ir pārtverts."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: pārkārtošana."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: pakalpojuma opcija ir noraidīta."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: atkārtotu mēģinājumu kārtība."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: piekļuve neizdevās."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: iegūts ātrāk."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Iespējami ir tikai ārkārtas zvani."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Nederīgs numurs"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Numurs nav derīgs."</string>
     <string name="confCall" msgid="1904840547188336828">"Konferences zvans"</string>
     <string name="call_lost" msgid="317670617901479594">"Zvans ir zaudēts."</string>
-    <string name="retry" msgid="8462986804300767852">"Mēģināt vēlreiz"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Zvans ir zaudēts"</string>
     <string name="ok" msgid="3811371167865772377">"Labi"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI kods ir startēts."</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD kods darbojas…"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Austiņas ar vadu"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Vai sūtīt tālāk norādītos signālus?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Sūtīšanas signāli"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Sūtīšanas signāli"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Sūtīt"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Jā"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Nē"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Aizstāt aizstājējzīmi ar"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Aizstāt aizstājējzīmi ar:"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Trūkst balss pasta numura"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"SIM kartē neviens balss pasta numurs nav saglabāts."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Pievienot numuru"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Notiek ielāde…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Ierakstiet PIN kodu, lai atbloķētu SIM karti."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM ir atbloķēts"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Jauns SIM PIN kods"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Lai apstiprinātu, vēlreiz ierakstiet jauno SIM PIN kodu."</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Ierakstītie SIM PIN neatbilst. Lūdzu, mēģiniet vēlreiz."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Ierakstiet PUK kodu, lai atbloķētu SIM karti."</string>
-    <string name="badPuk" msgid="3213017898690275965">"Nepareizs PUK kods!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Turpināt"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"SIM karte ir atbloķēta. Notiek tālruņa atbloķēšana..."</string>
     <string name="label_ndp" msgid="780479633159517250">"SIM tīkla atbloķēšanas PIN"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Atbloķēt"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Notiek tīkla atbloķēšanas pieprasīšana..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Tīkla atbloķēšanas pieprasījums nav veiksmīgs."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Tīkla atbloķēšana bija veiksmīga."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM zvanu iestatījumi"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA zvanu iestatījumi"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Piekļuves punktu nosaukumi"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Tikai CDMA zvanu papildu iestatījumi"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Tīkla pakalpojuma iestatījumi"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Zvanītāja ID"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Notiek iestatījumu ielāde..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Izejošajos zvanos numurs tiek slēpts"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Izejošajos zvanos redzamais numurs"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Izmantot noklusējuma operatora iestatījumus, lai rādītu manu numuru izejošajos zvanos"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Numurs, ja ir aizņemts"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Pāradresēšana uz: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Atspējots"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Jūsu mobilo sakaru operators neatbalsta zvanu pāradresācijas atspējošanu, ja tālrunis ir aizņemts."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Jūsu operators neatbalsta zvanu pāradresācijas atspējošanu, ja tālrunis ir aizņemts."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Pāradresēt, ja nav atbildes"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Numurs, ja nav atbildes"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Pāradresēšana uz: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Atspējots"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Jūsu mobilo sakaru operators neatbalsta zvanu pāradresācijas atspējošanu, ja tālrunis neatbild."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Jūsu operators neatbalsta zvanu pāradresācijas atspējošanu, ja tālrunis neatbild."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Pāradresēt, ja nevar sasniegt"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Numurs, ja nav sasniedzams"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Pāradresēšana uz: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Atspējots"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Jūsu mobilo sakaru operators neatbalsta zvanu pāradresācijas atspējošanu, ja tālrunis nav sasniedzams."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Jūsu mobilo sakaru operators neatbalsta zvanu pāradresācijas atspējošanu, ja tālrunis nav sasniedzams."</string>
     <string name="updating_title" msgid="6146755386174019046">"Zvanu iestatījumi"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Zvanu iestatījumu kļūda"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Notiek iestatījumu lasīšana..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Notiek iestatījumu atsaukšana..."</string>
     <string name="response_error" msgid="6674110501330139405">"Neparedzēta atbilde no tīkla."</string>
     <string name="exception_error" msgid="7027667130619518211">"Tīkla vai SIM kartes kļūda."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Darbības ir atļautas, tikai zvanot uz fiksētajiem numuriem."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Pirms šo iestatījumu skatīšanas, lūdzu, ieslēdziet radio."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Jūsu tālrunī ir ieslēgta fiksēto numuru sastādīšanas lietotne. Tādēļ dažas zvanu funkcijas nav pieejamas."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Pirms šo iestatījumu skatīšanas ieslēdziet radio."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Labi"</string>
     <string name="enable" msgid="1059008390636773574">"Iespējot"</string>
     <string name="disable" msgid="7274240979164762320">"Atspējot"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Slēpt numuru"</item>
     <item msgid="1108394741608734023">"Rādīt numuru"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Saglabāt balss pasta numuru"</string>
     <string name="vm_changed" msgid="380744030726254139">"Balss pasta numurs ir mainīts."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Balss pasta numura maiņa nebija veiksmīga."\n"Lūdzu, sazinieties ar mobilo sakaru operatoru, ja šī problēma joprojām pastāv."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Pāradresācijas numura maiņa nebija veiksmīga."\n"Lūdzu, sazinieties ar mobilo sakaru operatoru, ja šī problēma joprojām pastāv."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Nevarēja mainīt balss pasta numuru."\n"Ja problēmu neizdodas novērst, sazinieties ar savu mobilo sakaru operatoru."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Nevarēja mainīt pāradresācijas numuru."\n"Ja problēmu neizdodas novērst, sazinieties ar savu mobilo sakaru operatoru."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Nevarēja izgūt un saglabāt pašreizējos pāradresācijas numura iestatījumus."\n"Vai tomēr pārslēgties uz jauno pakalpojumu sniedzēju?"</string>
     <string name="no_change" msgid="3186040086622435212">"Izmaiņas netika veiktas."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Izvēlieties balss pasta pakalpojumu"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Meklēt tīklus"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Tīklu meklēšanas laikā radās kļūda."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Notiek reģistrēšana šādā tīklā: <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"SIM karte neļauj izveidot savienojumu ar šo tīklu."</string>
-    <string name="connect_later" msgid="500090982903469816">"Pašlaik nevar izveidot savienojumu ar šo tīklu. Lūdzu, vēlāk mēģiniet vēlreiz."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"SIM karte neļauj izveidot savienojumu ar šo tīklu."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Pašlaik nevar izveidot savienojumu ar šo tīklu. Vēlāk mēģiniet vēlreiz."</string>
     <string name="registration_done" msgid="495135664535876612">"Reģistrēts tīklā."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Atlasīt tīkla operatoru"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Izvēlēties tīkla operatoru"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Meklēt visus pieejamos tīklus"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Atlasīt automātiski"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Automātiski atlasīt vēlamo tīklu"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automātiska reģistrācija..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Izvēlēties automātiski"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Automātiski izvēlēties vajadzīgo tīklu"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automātiska reģistrācija..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Tīkla režīms"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Mainiet tīkla darbības režīmu"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Vēlamais tīkla režīms"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Ieteicamais tīkla režīms: tikai EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Ieteicamais tīkla režīms: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Tikai EvDo"</item>
     <item msgid="454610224530856274">"CDMA bez EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA/EvDo automātiski"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA automātiski"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo automātiski"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA automātiski"</item>
     <item msgid="5189164180446264504">"Tikai WCDMA"</item>
     <item msgid="5714714953966979187">"Tikai GSM"</item>
-    <item msgid="4775796025725908913">"Priekšroka GSM/WCDMA režīmam"</item>
+    <item msgid="8508331239546115206">"Priekšroka GSM/WCDMA režīmam"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Dati ir iespējoti."</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Datu viesabonēšana"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Viesabonēšanas laikā izveidot savienojumu ar datu pakalpojumiem"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Viesabonēšanas laikā izveidot savienojumu ar datu pakalpojumiem"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Datu savienojamība ir zaudēta, jo mājas tīkls ar datu viesabonēšanu ir izslēgts."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Datu savienojamība ir zaudēta, jo mājas tīkls ar datu viesabonēšanu ir izslēgts."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Vai atļaut datu viesabonēšanu? Var rasties ievērojamas viesabonēšanas izmaksas."</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS opcijas"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA opcijas"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Datu lietojums"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Mobilo sakaru operatora datu politika"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Pašreizējā periodā izmantotie dati"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Datu izmantošanas periods"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Datu ātruma politika"</string>
@@ -228,7 +204,6 @@
     <skip />
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Datu ātrums tiek samazināts līdz <xliff:g id="USED">%1$d</xliff:g> Kb/s, ja ir pārsniegts datu lietojuma ierobežojums."</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Papildinformācija par mobilo sakaru operatora mobilā tīkla datu lietošanas politiku"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Šūnu apraides īsziņa"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Šūnu apraides īsziņa"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Šūnu apraides īsziņa"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Šūnu apraides īsziņas ir iespējotas."</string>
@@ -269,15 +244,6 @@
     <item msgid="1858401628368130638">"korejiešu"</item>
     <item msgid="1933212028684529632">"ķīniešu"</item>
     <item msgid="1908428006803639064">"ivrits"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Valodas"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Vietējā laika prognoze"</string>
@@ -307,9 +273,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Nodarbinātības iespējas"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Nodarbinātības iespējas ir iespējotas."</string>
     <string name="eo_disable" msgid="3863812478090907609">"Nodarbinātības iespējas ir atspējotas."</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Medicīna, veselība un slimnīcas"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Medicīna, veselība un slimnīcas ir iespējotas."</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Medicīna, veselība un slimnīcas ir atspējotas."</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Medicīna, veselība un slimnīcas"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Opcija Medicīna, veselība un slimnīcas ir iespējota."</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Opcija Medicīna, veselība un slimnīcas ir atspējota."</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Tehnoloģiju ziņas"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Tehnoloģiju ziņas ir iespējotas."</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Tehnoloģiju ziņas ir atspējotas."</string>
@@ -324,35 +290,17 @@
     <item msgid="8912042051809329533">"Tikai WCDMA"</item>
     <item msgid="8776934131146642662">"Tikai GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (ieteicams WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Izmantot tikai 2G tīklus"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Ietaupa akumulatora jaudu"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Sistēmas atlasīšana"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Mainiet CDMA viesabonēšanas režīmu"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Mainīt CDMA viesabonēšanas režīmu"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistēmas atlasīšana"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Tikai mājās"</item>
     <item msgid="1205664026446156265">"Automātiski"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA viesabonēšanas režīms"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Mainiet CDMA viesabonēšanas režīmu"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA viesabonēšanas režīms"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Tikai mājas tīkli"</item>
-    <item msgid="8174642753290624634">"Saistītie tīkli"</item>
-    <item msgid="2241951431403168661">"Jebkurš tīkls"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA abonements"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA tīkla preferences"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Vēl nav ieviests."</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA tīkla preferences"</string>
@@ -361,21 +309,11 @@
     <item msgid="6143696847467859795">"Tikai CDMA"</item>
     <item msgid="2683555124647197574">"Tikai EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA abonements"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Mainīt no RUIM/SIM uz NV un otrādi"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"abonements"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Ierīces aktivizēšana"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Datu pakalpojuma iestatīšana"</string>
@@ -392,18 +330,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Pārvaldiet fiksētos numuru sastādīšanas numurus"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Mainīt PIN kodu FNSN piekļuvei"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Pārvaldīt tālruņa numuru sarakstu"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Balss konfidencialitāte"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Balss konfidencialitāte"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Iespējot uzlabotās konfidencialitātes režīmu"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Teletaipa režīms"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Iespējot teletaipa režīmu"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Teletaipa režīms"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Iestatīt teletaipa režīmu"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Automātiska atkārtota mēģināšana"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Iespējot automātiskā atkārtotā mēģinājuma režīmu"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Automātisks atkārtots mēģinājums"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Iespējot automātiskā atkārtotā mēģinājuma režīmu"</string>
     <string name="menu_add" msgid="1882023737425114762">"Pievienot kontaktpersonu"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Rediģēt kontaktpersonu"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Dzēst kontaktpersonu"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Ievadiet PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Ievadiet PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Vārds"</string>
     <string name="number" msgid="7905950798349903858">"Numurs"</string>
     <string name="save" msgid="4094274636321939086">"Saglabāt"</string>
@@ -416,56 +352,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Fiksētā numura sastādīšanas numura dzēšana"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Notiek fiksētā numuru sastādīšanas numura dzēšana…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Fiksētais numuru sastādīšanas numurs ir atspējots."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FNSN nav atjaunināts: tika ievadīts nepareizs PIN."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FNSN nav atjaunināts: numurā nedrīkst būt vairāk par 20 cipariem."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN nav atjaunināts, jo tika ievadīts nepareizs PIN."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN netika atjaunināts, jo numurā nedrīkst būt vairāk par 20 cipariem."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN netika atjaunināts. Ievadītais PIN2 nebija pareizs, vai tālruņa numurs tika noraidīts."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Notiek lasīšana no SIM kartes..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM kartē nav nevienas kontaktpersonas."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Importējamo kontaktpersonu atlasīšana"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Lai importētu kontaktinformāciju no SIM kartes, lūdzu, izslēdziet lidmašīnas režīmu."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Lai importētu kontaktinformāciju no SIM kartes, vispirms izslēdziet lidojuma režīmu."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Iespējot/atspējot SIM PIN"</string>
     <string name="change_pin" msgid="9174186126330785343">"SIM PIN mainīšana"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Iepriekšējais PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Jauns PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Apstiprināt jauno PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Ierakstītais iepriekšējais PIN nav pareizs. Lūdzu, mēģiniet vēlreiz."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Ievadītie PIN neatbilst. Lūdzu, mēģiniet vēlreiz."</string>
+    <string name="badPin" msgid="8955102849303984935">"Ievadītais iepriekšējais PIN nav pareizs. Mēģiniet vēlreiz."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Ievadītie PIN neatbilst. Mēģiniet vēlreiz."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Ierakstiet PIN, kas sastāv no 4 līdz 8 cipariem."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"SIM PIN atspējošana"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"SIM PIN iespējošana"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Lūdzu, uzgaidiet…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"SIM PIN ir iespējots."</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM PIN ir atspējots."</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Ierakstītais PIN nav pareizs."</string>
-    <string name="pin_changed" msgid="9000716792724195093">"SIM PIN ir veiksmīgi nomainīts"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM kartes PIN ir iespējots."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM kartes PIN ir atspējots."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Ievadītais PIN nav pareizs."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"SIM kartes PIN ir veiksmīgi mainīts."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Parole nav pareiza, SIM ir bloķēts. Ir jāievada PUK2 kods."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Iepriekšējais PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Jauns PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Apstiprināt jauno PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Ierakstītais PUK2 nav pareizs. Lūdzu, mēģiniet vēlreiz."</string>
-    <string name="badPin2" msgid="515218795152422178">"Ierakstītais iepriekšējais PIN2 nav pareizs. Lūdzu, mēģiniet vēlreiz."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Ievadītie PIN2 neatbilst. Lūdzu, mēģiniet vēlreiz."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Ievadītais PUK2 nav pareizs. Mēģiniet vēlreiz."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Ievadītais iepriekšējais PIN2 nav pareizs. Mēģiniet vēlreiz."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Ievadītie PIN2 neatbilst. Mēģiniet vēlreiz."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Ierakstiet PIN2, kas sastāv no 4 līdz 8 cipariem."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Ierakstiet PUK2, kas sastāv no 8 cipariem."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 ir veiksmīgi nomainīts"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 ir mainīts veiksmīgi."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Ierakstiet PUK2 kodu"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Parole nav pareiza, lūdzu, mainiet PIN2 un mēģiniet vēlreiz!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Parole nav pareiza, SIM ir bloķēts. Ir jāievada PUK2 kods."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Parole nav pareiza. Mainiet PIN2 un mēģiniet vēlreiz."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Parole nav pareiza, SIM karte ir bloķēta. Ir jāievada PUK2 kods."</string>
     <string name="doneButton" msgid="2859593360997984240">"Gatavs"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferences zvans <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Atpakaļ pie zvana"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Turpināt bez SIM kartes"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"SIM karte netika atrasta. Lūdzu, ievietojiet tālrunī SIM karti."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Noraidīt"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Atbloķēt"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Notiek PIN autentifikācija…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Balss pasta numurs"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Notiek numura sastādīšana"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Notiek atkārtota mēģināšana"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferences zvans"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Ienākošais zvans"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"CDMA zvana gaidīšana"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Zvans ir pabeigts"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Aizturēts"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Notiek klausules nolikšana"</string>
@@ -475,7 +405,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Neatbildētie zvani"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> neatbildēts(-i) zvans(-i)"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Neatbildēts zvans no: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Pašreizējais zvans (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Pašreizējā saruna"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Aizturēts"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Ienākošs zvans"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Jauns balss pasts"</string>
@@ -484,13 +414,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Balss pasta numurs nav zināms."</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nav pakalpojuma"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Atlasītais tīkls (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nav pieejams"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Pārtraukt"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Atzvanīt"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Ziņojums"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Lai veiktu zvanu, vispirms izslēdziet lidojuma režīmu."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Tīklā nav reģistrēts."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilais tīkls nav pieejams."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Zvans nav nosūtīts; derīgs numurs nav ievadīts."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Zvans nav nosūtīts."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Notiek MMI secības startēšana…"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Notiek funkcijas koda secības startēšana..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Neatbalstīts pakalpojums."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Nevar pārslēgt zvanus."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Nevar atdalīt zvanu."</string>
@@ -502,18 +434,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Ārkārtas zvans"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Notiek radio ieslēgšana..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Ārpus apkalpošanas apgabala, tiek mēģināts vēlreiz..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Zvans netika nosūtīts, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nav ārkārtas numurs!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Zvans nav nosūtīts, lūdzu, sastādiet ārkārtas numuru!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Zvans netika nosūtīts. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nav ārkārtas izsaukuma numurs."</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Zvans nav nosūtīts. Ievadiet ārkārtas izsaukuma numuru."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Izmantojiet tastatūru, lai sastādītu numuru."</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Skārientastatūra"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Aizturēt"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Noņemt aizturēšanu"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Beigt"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Numuru sastādīšanas tastatūra"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Slēpt"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Skaļrunis"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Izslēgt skaņu"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Pievienot zvanu"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Sapludināt zvanus"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Mainīt"</string>
@@ -532,36 +459,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI teksts"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF signāli"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF toņi"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Iestatiet DTMF signālu ilgumu"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normāls"</item>
     <item msgid="2883365539347850535">"Ilgs"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Tīkla ziņojums"</string>
+    <string name="network_message" msgid="4483886461245213802">"Tīkla ziņojums"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Tālruņa aktivizēšana"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Lai aktivizētu tālruņa pakalpojumu, ir jāveic īpašs zvans. "\n\n"Nospiediet uz Aktivizēt un pēc tam klausieties tālruņa aktivizēšanas norādījumus."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Pieskarieties Aktivizēt, lai veiktu īpašu zvanu, kas aktivizē tālruni jūsu mobilo sakaru operatora mobilajā tīklā, lai varat veikt zvanus un izveidot savienojumu ar mobilajiem datu tīkliem."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Vai izlaist aktivizāciju?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ja tiks izlaista aktivizācija, nevarēs veikt zvanus vai izveidot savienojumu ar mobilajiem datu tīkliem (taču varēs izveidot savienojumu ar Wi-Fi tīkliem). Ikreiz ieslēdzot tālruni, tiks prasīts to aktivizēt (līdz brīdim, kad tas tiks aktivizēts)."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Izlaist"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktivizēt"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktivizēt"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Tālrunis ir aktivizēts!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Tālrunis ir aktivizēts."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problēma aktivizācijas laikā"</string>
     <string name="ota_listen" msgid="162923839877584937">"Izpildiet izteiktos norādījumus, līdz dzirdat, ka aktivizācija ir pabeigta."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Papildtastatūra"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Skaļrunis"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Lūdzu, uzgaidiet, līdz tālruņa programmēšana ir pabeigta."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programmēšana nav veiksmīga."</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Uzgaidiet, līdz tālruņa programmēšana ir pabeigta."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programmēšana neizdevās."</string>
     <string name="ota_successful" msgid="1880780692887077407">"Tālrunis tagad ir aktivizēts. Iespējams, būs nepieciešamas 15 minūtes, lai pakalpojums sāktu darboties."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Tālrunis netika aktivizēts. "\n"Iespējams, ir jāatrod vieta ar labāku tīkla pārklājumu (pie loga vai ārpusē). "\n\n"Mēģiniet vēlreiz vai zvaniet uz klientu apkalpošanas dienestu, lai uzzinātu par citām opcijām."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Tālrunis netika aktivizēts."\n"Iespējams, ir jāatrod vieta ar labāku tīkla pārklājumu (pie loga vai ārpus telpām)."\n\n"Mēģiniet vēlreiz vai zvaniet uz klientu apkalpošanas dienestu, lai uzzinātu par citām iespējām."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"SPC PAPILDKĻŪMES"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Atpakaļ"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Mēģināt vēlreiz"</string>
     <string name="ota_next" msgid="3904945374358235910">"Tālāk"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Atpakaļ"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Ievadītais ārkārtas atzvana režīms"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Ārkārtas atzvana režīms"</string>
@@ -571,87 +493,69 @@
     <item quantity="other" msgid="3122217344579273583">"<xliff:g id="COUNT">%s</xliff:g> minūti(-es) nav datu savienojuma."</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Tālrunis būs ārkārtas atzvana režīmā <xliff:g id="COUNT">%s</xliff:g> minūti. Šajā režīmā nevar izmantot nevienu lietojumprogrammu, kas lieto datu savienojumu. Vai vēlaties iziet tūlīt?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Tālrunis būs ārkārtas atzvana režīmā <xliff:g id="COUNT">%s</xliff:g> minūti(-es). Šajā režīmā nevar izmantot nevienu lietojumprogrammu, kas lieto datu savienojumu. Vai vēlaties iziet tūlīt?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Tālrunis ārkārtas atzvana režīmā atradīsies <xliff:g id="COUNT">%s</xliff:g> minūti. Lietojot šo režīmu, nevar izmantot nevienu lietotni, kurai nepieciešams datu savienojums. Vai vēlaties iziet tūlīt?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Tālrunis ārkārtas atzvana režīmā atradīsies <xliff:g id="COUNT">%s</xliff:g> minūti(-es). Lietojot šo režīmu, nevar izmantot nevienu lietojumprogrammu, kurai nepieciešams datu savienojums. Vai vēlaties iziet tūlīt?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Ārkārtas atzvana režīmā atlasītā darbība nav pieejama. Tālrunis šajā režīmā būs <xliff:g id="COUNT">%s</xliff:g> minūti. Vai vēlaties iziet tūlīt?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Ārkārtas atzvana režīmā atlasītā darbība nav pieejama. Tālrunis šajā režīmā būs <xliff:g id="COUNT">%s</xliff:g> minūti(-es). Vai vēlaties iziet tūlīt?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Atlasītā darbība nav pieejama, izmantojot ārkārtas atzvana režīmu. Tālrunis šajā režīmā atradīsies <xliff:g id="COUNT">%s</xliff:g> minūti. Vai vēlaties iziet tūlīt?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Atlasītā darbība nav pieejama, izmantojot ārkārtas atzvana režīmu. Tālrunis šajā režīmā atradīsies <xliff:g id="COUNT">%s</xliff:g> minūti(-es). Vai vēlaties iziet tūlīt?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Atlasītā darbība nav pieejama, veicot ārkārtas zvanu."</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Notiek iziešana no ārkārtas atzvana režīma"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Atlasītā darbība nav pieejama, veicot ārkārtas izsaukumu."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Notiek iziešana no ārkārtas atzvana režīma"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Jā"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Nē"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Noraidīt"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Balss pasta iestatījumi"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;nav iestatīts&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Balss pasta pakalpojums"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> iestatījumi"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Pakalpojums"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Iestatīšana"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nav iestatīts&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Citi zvanu iestatījumi"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Sastādīt numuru"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Zvanīšana, izmantojot ^1:"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Velciet pa labi, lai atbildētu"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Velciet pa kreisi, lai klusinātu zvanītāju"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Velciet pa kreisi, lai noraidītu"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Velciet pa labi, lai atbildētu un"\n"aizturētu aktīvo zvanu"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Velciet pa labi, lai atbildētu un"\n"beigtu aktīvo zvanu"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Velciet pa labi, lai atbildētu un"\n"beigtu aizturēto zvanu"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Atbildēt"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Noraidīt"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Zvans, ko nodrošina <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"kontaktpersonas fotoattēls"</string>
     <string name="goPrivate" msgid="865837794424530980">"pārslēgt uz privāto režīmu"</string>
     <string name="selectContact" msgid="781975788478987237">"atlasīt kontaktpersonu"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Interneta zvanu iestatījumi"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Interneta zvanu (SIP) konti"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Konti"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Interneta zvanu (SIP) kontu un statusa pārvaldība"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Saņemt ienākošos zvanus"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Samazina akumulatora darbības mūža ilgumu"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Konfigurēt zvana opcijas"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Interneta zvanu izmantošana"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Izmantot interneta zvanus (tikai Wi-Fi tīklā)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Visiem zvaniem, ja ir pieejams datu tīkls"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Tikai interneta zvaniem"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Jautāt katram zvanam"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Visiem zvaniem"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Automātiskā reģistrācija"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Izejošais zvans, izmantojot SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Veikt zvanu"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Izmantot interneta zvanu kontu:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Vienmēr izmantot interneta zvanu veikšanai"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Varat izmantot izvēlni Zvana iestatījumi, lai, veicot zvanus, mainītu noklusējuma interneta zvanu kontu, atlasot citu kontu sadaļā Interneta zvanu iestatījumi"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Varat mainīt pēc noklusējuma izmantoto interneta zvanu kontu, atverot ekrānu Tālrunis &gt; Iestatījumi &gt; Interneta zvanu iestatījumi &gt; Konti."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Mobilā tālruņa zvans"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Interneta zvans"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Nav interneta zvanu konta"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Šajā tālrunī nav interneta zvanu kontu. Vai pievienot vienu tūlīt?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Šajā tālrunī nav neviena interneta zvanu konta. Vai vēlaties pievienot kontu tūlīt?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Pievienot"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Pievienot kontu"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Noņemt kontu"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP konti"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Notiek konta saglabāšana..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Notiek konta noņemšana..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Notiek konta saglabāšana..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Notiek konta noņemšana..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Saglabāt"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Atmest"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Profila aizvēršana"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"Labi"</string>
     <string name="close_profile" msgid="6886968271423155284">"Aizvērt"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Primārais"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Iestatīt šo kontu kā manu primāro kontu"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Tiek izmantots izejošajiem zvaniem"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Papildiestatījumi"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Primārais konts. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Notiek statusa pārbaude..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Notiek reģistrēšana..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Joprojām mēģina..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Zvani netiek saņemti"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Konta reģistrācija tika apturēta, jo nav interneta savienojuma"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Konta reģistrācija tika apturēta, jo nav Wi-Fi savienojuma"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Konta reģistrācija neizdevās."</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Notiek zvanu saņemšana"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Notiek reģistrācija..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Joprojām mēģina..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Zvani netiek saņemti"</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Konta reģistrācija tika apturēta, jo nav interneta savienojuma."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Konta reģistrācija ir apturēta, jo nav Wi-Fi savienojuma."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Konta reģistrācija neizdevās."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Zvani tiek saņemti."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Konta reģistrācija neizdevās: <xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>; vēlāk tā tiks veikta atkārtoti."</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Konta reģistrācija neizdevās: nepareizs lietotājvārds vai parole."</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Konta reģistrācija neizdevās: pārbaudiet servera nosaukumu."</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Šis konts pašlaik tiek izmantots lietojumprogrammā <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Konta reģistrācija neizdevās: nepareizs lietotājvārds vai parole."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Konta reģistrācija neizdevās: pārbaudiet servera nosaukumu."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Šis konts pašlaik tiek izmantots lietotnē <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Dati par SIP kontu"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Dati par SIP kontu"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Serveris"</string>
@@ -662,9 +566,6 @@
     <string name="port_title" msgid="5952939408078626657">"Porta numurs"</string>
     <string name="transport_title" msgid="8253139511847746640">"Transporta veids"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Saites darbības pārbaudes ziņojuma sūtīšana"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Sūta SIP saites darbības pārbaudes ziņojumus"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Automātiskā reģistrācija"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Reģistrēt profilu automātiski"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Iestatīt kā primāro kontu"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Tiek izmantots izejošajiem zvaniem"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Neobligāti iestatījumi"</string>
@@ -675,12 +576,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Neobligāti&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Pieskarieties, lai rādītu visu"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Pieskarieties, lai paslēptu visu"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"Lauks <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ir jāaizpilda obligāti, tas nedrīkst būt tukšs"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Porta numuram ir jābūt no 1000 līdz 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Lauks <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ir jāaizpilda obligāti; tas nedrīkst būt tukšs."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Porta numuram ir jābūt skaitlim no 1000 līdz 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Nav interneta savienojuma"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Nav Wi-Fi savienojuma"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Lai veiktu interneta zvanu, vispirms pārbaudiet interneta savienojumu"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Lai veiktu interneta zvanus, ir jābūt izveidotam savienojumam ar Wi-Fi tīklu (izmantojiet sadaļu Bezvadu un tīkla iestatījumi)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Lai veiktu interneta zvanu, vispirms pārbaudiet interneta savienojumu."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Lai veiktu interneta zvanus, ir jābūt izveidotam savienojumam ar Wi-Fi tīklu (izmantojiet iestatījumus sadaļā Bezvadu savienojumi un tīkli)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Interneta zvani netiek atbalstīti"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automātiski"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Vienmēr sūtīt"</string>
@@ -689,7 +590,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Tūlīt atzvanīšu."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Piezvanīšu vēlāk."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Nevaru runāt. Vai piezvanīsi vēlāk?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Pielāgots ziņojums..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Pielāgots ziņojums"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Ātrās atbildes"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Ātro atbilžu rediģēšana"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -707,7 +608,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"zvaigznīte"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"nulle"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"cipara simbols"</string>
-    <string name="description_search_button" msgid="239929880630534731">"meklēt"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"sastādīt numuru"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"atpakaļatkāpe"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Skaļrunis ir iespējots."</string>
@@ -717,9 +617,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Noraidīt"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrozvans"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrozvans"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Zvana signāls"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Vienmēr"</item>
     <item msgid="1595097872875714252">"Tikai klusuma režīmā"</item>
     <item msgid="1458182414036878616">"Nekad"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Tālruņa zvana signāls"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrēt zvanot"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Num. sast. tastatūras piesk. signāli"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Zvana signāls"</string>
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 225da6253..0bebdbe23 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Nombor peribadi"</string>
     <string name="payphone" msgid="1931775086311769314">"Telefon awam"</string>
     <string name="onHold" msgid="9035493194749959955">"Ditunda"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Panggilan semasa"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Talian sibuk"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Rangkaian sibuk"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Tiada respons, tamat masa"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Pelayan tidak boleh dicapai"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nombor tidak dapat dihubungi"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nama pengguna atau kata laluan tidak betul"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Dipanggil dari luar rangkaian"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Dipanggil dari luar rangkaian"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Ralat pelayan. Cuba lagi kemudian"</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Tiada isyarat"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Melebihi had ACM"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio dimatikan"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Tiada SIM atau ralat SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Tiada SIM atau ralat SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Di luar kawasan perkhidmatan"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Panggilan keluar dihadkan oleh FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Anda tidak boleh membuat panggilan keluar semasa sekatan panggilan dihidupkan."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Anda tidak boleh membuat panggilan keluar semasa sekatan panggilan dihidupkan."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Semua panggilan dihadkan oleh kawalan akses."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Panggilan kecemasan dihadkan oleh kawalan akses."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Panggilan biasa dihadkan oleh kawalan akses."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Telefon dikunci sehingga kitaran kuasa."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Panggilan terputus."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Panggilan dipintas."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: susun semula."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Pilihan Perkhidmatan Ditolak."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: cuba semula susunan."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Akses tidak berjaya."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Diganti."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Hanya Panggilan kecemasan sahaja yang boleh dibuat."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Nombor Tidak Sah"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Nombor tidak sah"</string>
     <string name="confCall" msgid="1904840547188336828">"Panggilan sidang"</string>
     <string name="call_lost" msgid="317670617901479594">"Panggilan telah terputus."</string>
-    <string name="retry" msgid="8462986804300767852">"Cuba semula"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Panggilan Terputus"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Kod MMI dimulakan"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Kod USSD dijalankan..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Set kepala berwayar"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Hantar nada berikut?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Menghantar Nada"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Menghantar nada"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Hantar"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Ya"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Tidak"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Gantikan aksara bebas dengan"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Gantikan aksara bebas dengan"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Nombor mel suara tiada"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Tidak ada nombor mel suara disimpan pada kad SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Tambah nombor"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Memuatkan..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Taipkan kod PIN untuk membuka kunci kad SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM dibukakan kuncinya"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Kod PIN SIM baru"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Taipkan kod PIN SIM baru sekali lagi untuk mengesahkan"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Pin SIM yang anda taipkan tidak sepadan. Sila cuba lagi."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Taipkan kod PUK untuk membuka kunci kad SIM"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Kod PUK salah!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Teruskan"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Kad SIM anda telah dinyahsekat. Telefon anda dibuka kunci..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN buka kunci rangkaian SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Buka kunci"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Meminta dibukakan kunci rangkaian..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Permintaan dibukakan kunci rangkaian tidak berjaya."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Berjaya membuka kunci rangkaian."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Tetapan panggilan GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Tetapan panggilan CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Nama Titik Capaian"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Tetapan panggilan tambahan CDMA sahaja"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Tetapan perkhidmatan rangkaian"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"ID Pemanggil"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Memuatkan tetapan…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Nombor disembunyikan dalam panggilan keluar"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Nombor yang ditunjukkan dalam panggilan keluar"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Gunakan tetapan lalai pengendali untuk memaparkan nombor saya dalam panggilan keluar"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Nombor semasa sibuk"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Memajukan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Dilumpuhkan"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Pembawa anda tidak menyokong pelumpuhan pemajuan panggilan semasa telefon anda sibuk."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Pembawa anda tidak menyokong pelumpuhan pemajuan panggilan semasa telefon anda sibuk."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Majukan apabila tidak dijawab"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Nombor apabila tidak dijawab"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Memajukan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Dilumpuhkan"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Pembawa anda tidak menyokong pelumpuhan pemajuan panggilan semasa telefon anda tidak menjawab."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Pengendali anda tidak menyokong pelumpuhan pemajuan panggilan semasa telefon anda tidak menjawab."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Majukan apabila tidak dapat dihubungi"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Nombor apabila tidak dapat dihubungi"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Memajukan ke <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Dilumpuhkan"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Pembawa anda tidak menyokong pelumpuhan pemajuan panggilan semasa telefon anda tidak boleh dihubungi."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Pembawa anda tidak menyokong pelumpuhan pemajuan panggilan semasa telefon anda tidak boleh dihubungi."</string>
     <string name="updating_title" msgid="6146755386174019046">"Tetapan panggilan"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Ralat tetapan panggilan"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Membaca tetapan..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Mengembalikan tetapan kepada sebelumnya..."</string>
     <string name="response_error" msgid="6674110501330139405">"Respons tidak dijangka daripada rangkaian."</string>
     <string name="exception_error" msgid="7027667130619518211">"Ralat Rangkaian atau kad SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Pengendalian hanya dibenarkan pada nombor dailan tetap sahaja."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Sila hidupkan radio sebelum melihat tetapan ini"</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Tetapan Nombor Pendailan Tetap apl Telefon anda dihidupkan. Hasilnya, beberapa ciri berkaitan panggilan tidak berfungsi."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Hidupkan radio sebelum melihat tetapan ini."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Dayakan"</string>
     <string name="disable" msgid="7274240979164762320">"Lumpuhkan"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Sembunyikan nombor"</item>
     <item msgid="1108394741608734023">"Tunjukkan nombor"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Simpan nombor mel suara"</string>
     <string name="vm_changed" msgid="380744030726254139">"Nombor mel suara ditukar."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Penukaran nombor mel suara tidak berjaya."\n"Sila hubungi pembawa anda jika masalah ini berterusan."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Penukaran nombor pemajuan tidak berjaya."\n"Sila hubungi pembawa anda jika masalah ini berterusan."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Tidak dapat menukar nombor mel suara."\n"Hubungi pembawa anda jika masalah ini berterusan."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Tidak boleh menukar nombor pemajuan."\n"Hubungi pembawa anda jika masalah ini berterusan."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Tidak boleh mengambil dan menyimpan tetapan nombor pemajuan semasa. "\n" Tukar kepada pembekal yang baru juga?"</string>
     <string name="no_change" msgid="3186040086622435212">"Tiada perubahan dibuat."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Pilih perkhidmatan mel suara"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Cari dalam rangkaian"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Ralat ketika mencari rangkaian."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Mendaftar di <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Kad SIM anda tidak membenarkan sambungan ke rangkaian ini."</string>
-    <string name="connect_later" msgid="500090982903469816">"Tidak boleh menyambungkan rangkaian ini pada masa ini. Sila cuba sebentar lagi."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Kad SIM anda tidak membenarkan sambungan ke rangkaian ini."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Tidak dapat menyambung kepada rangkaian ini sekarang. Cuba lagi nanti."</string>
     <string name="registration_done" msgid="495135664535876612">"Didaftarkan pada rangkaian."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Pilih pengendali rangkaian"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Pilih pengendali rangkaian"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Cari semua rangkaian tersedia"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Pilih secara automatik"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Pilih rangkaian keutamaan secara automatik"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Pendaftaran automatik..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Pilih secara automatik"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Pilih rangkaian keutamaan secara automatik"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Pendaftaran automatik..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Mod Rangkaian"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Tukar mod pengendalian rangkaian"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Mod rangkaian diutamakan"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Mod rangkaian pilihan: EvDo sahaja"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Mod rangkaian pilihan: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"EvDo sahaja"</item>
     <item msgid="454610224530856274">"CDMA tanpa EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo auto"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA auto"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo auto"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA auto"</item>
     <item msgid="5189164180446264504">"WCDMA sahaja"</item>
     <item msgid="5714714953966979187">"GSM sahaja"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA diutamakan"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA diutamakan"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data didayakan"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Perayauan data"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Sambung ke perkhidmatan data apabila melakukan perayauan"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Bersambung ke perkhidmatan data semasa melakukan perayauan"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Anda telah kehilangan kesambungan data kerana anda meninggalkan rangkaian rumah anda dengan perayauan data dimatikan."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Anda telah kehilangan kesambungan data kerana anda meninggalkan rangkaian rumah anda dengan data perayauan dimatikan."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Benarkan perayauan data? Anda boleh dikenakan caj perayauan yang tinggi!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Pilihan GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Pilihan CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Penggunaan data"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Dasar data pembawa"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Data yang digunakan dalam tempoh semasa"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Tempoh penggunaan data"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Dasar kadar data"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ daripada kitaran telah berlalu"\n"Tempoh berikutnya bermula dalam <xliff:g id="USED_1">%2$d</xliff:g> hari (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Kadar data dikurangkan kepada <xliff:g id="USED">%1$d</xliff:g> Kb/s jika melebihi had penggunaan data"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Lagi maklumat mengenai dasar penggunaan data rangkaian mudah alih pembawa anda"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS Siaran Sel"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS Siaran Sel"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS Siaran Sel"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS Siaran Sel didayakan"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Bahasa Korea"</item>
     <item msgid="1933212028684529632">"Bahasa Cina"</item>
     <item msgid="1908428006803639064">"Bahasa Ibrani"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Bahasa"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Cuaca Tempatan"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Peluang Pekerjaan"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Peluang Pekerjaan didayakan"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Peluang Pekerjaan dilumpuhkan"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Perubatan, Kesihatan dan Hospital"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Perubatan, Kesihatan dan Hospital didayakan"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Perubatan, Kesihatan dan Hospital dilumpuhkan"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Perubatan, Kesihatan dan Hospital"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Perubatan, Kesihatan dan Hospital didayakan"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Perubatan, Kesihatan dan Hospital dilumpuhkan"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Berita Teknologi"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Berita Teknologi didayakan"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Berita Teknologi dilumpuhkan"</string>
@@ -323,34 +289,17 @@
     <item msgid="8776934131146642662">"GSM sahaja"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA diutamakan)"</item>
   </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
-  </string-array>
+
     <string name="prefer_2g" msgid="8442550937280449639">"Gunakan rangkaian 2G sahaja"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Menjimatkan bateri"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Pilihan sistem"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Tukar mod perayauan cdma"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Tukar mod perayauan CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Pilihan sistem"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Rumah sahaja"</item>
     <item msgid="1205664026446156265">"Automatik"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Mod Perayauan CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Tukar mod perayauan cdma"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Mod perayauan CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Rangkaian Rumah sahaja"</item>
-    <item msgid="8174642753290624634">"Rangkaian Gabungan"</item>
-    <item msgid="2241951431403168661">"Sebarang Rangkaian"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Langganan CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Keutamaan Rangkaian CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Belum lagi dilaksanakan!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Keutamaan rangkaian CDMA"</string>
@@ -359,21 +308,11 @@
     <item msgid="6143696847467859795">"CDMA sahaja"</item>
     <item msgid="2683555124647197574">"EvDo sahaja"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Langganan CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Tukar antara RUIM/SIM dan NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"langganan"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktifkan peranti"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Penyediaan perkhidmatan data"</string>
@@ -390,18 +329,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Urus Nombor Dailan Tetap"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Tukar PIN untuk akses FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Urus senarai nombor telefon"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Privasi Suara"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Privasi suara"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Dayakan mod privasi dipertingkat"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Mod TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Dayakan mod TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Mod TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Tetapkan mod TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Autocuba Semula"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Dayakan mod Autocuba Semula"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Autocuba Semula"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Dayakan mod Autocuba Semula"</string>
     <string name="menu_add" msgid="1882023737425114762">"Tambah kenalan"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Edit kenalan"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Padamkan kenalan"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Masukkan PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Jenis PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Nama"</string>
     <string name="number" msgid="7905950798349903858">"Nombor"</string>
     <string name="save" msgid="4094274636321939086">"Simpan"</string>
@@ -414,56 +351,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Padam nombor dailan tetap"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Memadamkan nombor dailan tetap..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Nombor dailan tetap dipadamkan."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN tidak dikemaskinikan: anda telah memasukkan PIN yang salah."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN tidak dikemaskinikan: nombor tidak boleh melebihi 20 digit."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN tidak dikemaskini kerana anda telah menaip PIN yang salah."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN tidak dikemas kini kerana nombor tidak boleh melebihi 20 digit."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN tidak dikemaskini. PIN2 salah atau nombor telefon telah ditolak."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Membaca dari kad SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Tiada kenalan pada kad SIM anda."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Pilih kenalan untuk diimport"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Untuk mengimport kenalan daripada kad SIM, sila matikan mod Pesawat."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Untuk mengimport kenalan dari kad SIM, mula-mula matikan mod Pesawat."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Dayakan/lumpuhkan PIN SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Tukar PIN SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"PIN lama"</string>
     <string name="newPinLabel" msgid="207488227285336897">"PIN Baru"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Sahkan PIN baru"</string>
-    <string name="badPin" msgid="4154316827946559447">"PIN lama yang anda taipkan, salah. Sila cuba lagi."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"PIN yang anda masukkan tidak sepadan. Sila cuba lagi."</string>
+    <string name="badPin" msgid="8955102849303984935">"PIN lama yang anda taipkan tidak betul. Cuba lagi."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"PIN yang anda taip tidak sepadan. Cuba lagi."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Taipkan PIN yang mengandungi 4 hingga 8 nombor."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Lumpuhkan PIN SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Dayakan PIN SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Sila tunggu..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"PIN SIM didayakan"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN SIM dilumpuhkan"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"PIN yang anda taipkan salah"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"PIN SIM berjaya ditukar"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN SIM didayakan."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN SIM dilumpuhkan."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"PIN yang anda taipkan adalah salah."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"PIN SIM berjaya ditukar."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Kata laluan salah, SIM dikunci! PUK2 diminta."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 lama"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 baru"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Sahkan PIN2 baru"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"PUK2 yang anda taipkan, salah. Sila cuba lagi."</string>
-    <string name="badPin2" msgid="515218795152422178">"PIN2 lama yang anda taipkan, salah. Sila cuba lagi."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"PIN2 yang anda masukkan tidak sepadan. Sila cuba lagi."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"PUK2 yang anda taipkan salah. Cuba lagi."</string>
+    <string name="badPin2" msgid="1041576234483629991">"PIN2 lama yang anda taipkan tidak betul. Cuba lagi."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"PIN2 yang anda taip tidak sepadan. Cuba lagi."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Taipkan PIN2 yang mengandungi 4 hingga 8 nombor."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Taipkan PUK2 yang mengandungi 8 nombor."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 berjaya ditukar"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 berjaya ditukar."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Taipkan kod PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Kata laluan salah, sila tukar PIN2 dan cuba lagi!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Kata laluan salah, SIM dikunci! PUK2 diminta."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Kata laluan tidak betul. Tukar PIN2 dan cuba lagi."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Kata laluan salah, SIM dikunci. PUK2 diminta."</string>
     <string name="doneButton" msgid="2859593360997984240">"Selesai"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Panggilan sidang <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Kembali ke panggilan"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Teruskan tanpa kad SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Tiada kad SIM ditemui. Sila masukkan kad SIM ke dalam telefon."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Ketepikan"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Buka kunci"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Mengesahkan PIN..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nombor mel suara"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Mendail"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Mencuba semula"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Panggilan sidang"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Panggilan masuk"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Panggilan menunggu Cdma"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Panggilan tamat"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Ditunda"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Menamatkan panggilan"</string>
@@ -473,7 +404,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Panggilan tidak dijawab"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> panggilan tidak dijawab"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Panggilan tidak dijawab daripada <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Panggilan semasa (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Panggilan sedang berjalan"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Ditunda"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Panggilan masuk"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Mel suara baru"</string>
@@ -482,13 +413,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nombor mel suara tidak dikenali"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Tiada perkhidmatan"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Rangkaian pilihan (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) tidak tersedia"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Letakkan gagang"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Panggil balik"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mesej"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Untuk membuat panggilan, matikan mod Pesawat terlebih dahulu."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Tidak didaftarkan pada rangkaian."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Rangkaian mudah alih tidak tersedia."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Panggilan tidak dihantar, tiada nombor yang sah dimasukkan."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Panggilan tidak dihantar."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Memulakan jujukan MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Memulakan jujukan kod ciri..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Perkhidmatan tidak disokong."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Tidak boleh bertukar panggilan."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Tidak boleh memisahkan panggilan."</string>
@@ -500,18 +433,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Panggilan kecemasan"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Menghidupkan radio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Di luar kawasan perkhidmatan, mencuba lagi..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Panggilan tidak dihantar, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bukan nombor kecemasan!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Panggilan tidak dihantar, sila dail nombor kecemasan!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Panggilan tidak dihantar. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bukan nombor kecemasan!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Panggilan tidak dihantar. Dail nombor kecemasan!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Gunakan papan kekunci untuk mendail"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Pad kekunci nada sentuh"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Tunda"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Nyahtunda"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Tamat"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Pad dail"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Sembunyikan"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Pembesar suara"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Redam"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Tambah panggilan"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Gabung panggilan"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Silih"</string>
@@ -530,36 +458,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Teks ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Nada DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Nada DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Tetapkan panjang nada DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Biasa"</item>
     <item msgid="2883365539347850535">"Panjang"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Mesej Rangkaian"</string>
+    <string name="network_message" msgid="4483886461245213802">"Mesej rangkaian"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktifkan telefon anda"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Panggilan khas perlu dibuat untuk mengaktifkan perkhidmatan telefon anda. "\n\n"Selepas menekan “Aktifkan”, dengar arahan yang diberi untuk mengaktifkan telefon anda."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Sentuh “Aktifkan” untuk membuat panggilan khas yang mengaktifkan telefon anda pada rangkaian mudah alih pembawa anda supaya anda boleh membuat panggilan dan bersambung ke rangkaian data mudah alih."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Langkau pengaktifan?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Jika anda melangkau pengaktifan, anda tidak boleh membuat panggilan atau bersambung ke rangkaian data mudah alih (walaupun anda boleh bersambung ke rangkaian Wi-Fi). Sehingga anda mengaktifkan telefon anda, anda akan diminta untuk mengaktifkannya setiap kali anda menghidupkannya."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Langkau"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktifkan"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktifkan"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Telefon diaktifkan!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefon diaktifkan."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Masalah dengan pengaktifan"</string>
     <string name="ota_listen" msgid="162923839877584937">"Ikuti arahan yang diucapkan sehingga anda mendengar bahawa pengaktifan selesai."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Pad kekunci"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Pembesar suara"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Sila tunggu sementara telefon anda diprogramkan."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Pemprograman Tidak Berjaya"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Tunggu sementara telefon anda diprogramkan."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Pemprograman tidak berjaya"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Telefon anda kini sudah diaktifkan. Tempoh sehingga 15 minit mungkin diperlukan untuk perkhidmatan dimulakan."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Telefon anda tidak diaktifkan. "\n"Anda mungkin perlu mencari kawasan yang mempunyai liputan yang lebih baik (berhampiran tingkap atau di luar). "\n\n"Cuba lagi atau hubungi khidmat pelanggan untuk mendapatkan lagi pilihan."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Telefon anda tidak diaktifkan. "\n"Anda mungkin perlu mencari kawasan yang mempunyai liputan yang lebih baik (berhampiran tingkap atau di luar). "\n\n"Cuba lagi atau hubungi khidmat pelanggan untuk mendapatkan lagi pilihan."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"KEGAGALAN SPC BERLEBIHAN"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Kembali"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Cuba lagi"</string>
     <string name="ota_next" msgid="3904945374358235910">"Seterusnya"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Kembali"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Telah Memasuki Mod Panggil Balik Kecemasan"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Mod Paggil Balik Kecemasan"</string>
@@ -569,87 +492,69 @@
     <item quantity="other" msgid="3122217344579273583">"Tiada sambungan data selama <xliff:g id="COUNT">%s</xliff:g> minit"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Telefon akan berada dalam mod panggil balik kecemasan selama <xliff:g id="COUNT">%s</xliff:g> minit. Semasa berada dalam mod ini, tiada aplikasi yang menggunakan sambungan data boleh digunakan. Adakah anda mahu keluar sekarang?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Telefon akan berada dalam mod panggil balik kecemasan selama <xliff:g id="COUNT">%s</xliff:g> minit. Semasa berada dalam mod ini, tiada aplikasi yang menggunakan sambungan data boleh digunakan. Adakah anda mahu keluar sekarang?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Telefon akan berada dalam mod Panggilan Balik Kecemasan untuk <xliff:g id="COUNT">%s</xliff:g> minit. Semasa dalam mod ini tiada sebarang aplikasi yang menggunakan sambungan data boleh digunakan. Adakah anda mahu keluar sekarang?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Telefon akan berada dalam mod Panggilan Balik Kecemasan untuk <xliff:g id="COUNT">%s</xliff:g> minit. Semasa dalam mod ini tiada sebarang aplikasi yang menggunakan sambungan data boleh digunakan. Adakah anda mahu keluar sekarang?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Tindakan yang dipilih tidak tersedia semasa berada dalam mod panggil balik kecemasan. Telefon akan berada dalam mod ini selama <xliff:g id="COUNT">%s</xliff:g> minit. Adakah anda mahu keluar sekarang?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Tindakan yang dipilih tidak tersedia semasa berada dalam mod panggil balik kecemasan. Telefon akan berada dalam mod ini selama <xliff:g id="COUNT">%s</xliff:g> minit. Adakah anda mahu keluar sekarang?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Tindakan yang dipilih tidak tersedia dalam mod Panggilan Balik Kecemasan. Telefon akan berada dalam mod ini untuk <xliff:g id="COUNT">%s</xliff:g> minit. Adakah anda mahu keluar sekarang?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Tindakan yang dipilih tidak tersedia dalam mod Panggilan Balik Kecemasan. Telefon akan berada dalam mod ini untuk <xliff:g id="COUNT">%s</xliff:g> minit. Adakah anda mahu keluar sekarang?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Tindakan yang dipilih tidak tersedia semasa berada dalam panggilan kecemasan"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Keluar Daripada Mod Panggil Balik Kecemasan"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Tindakan yang dipilih tidak tersedia semasa berada dalam panggilan kecemasan."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Keluar Daripada mod Panggil Balik Kecemasan"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Ya"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Tidak"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Ketepikan"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Tetapan mel suara"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;tidak ditetapkan&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Perkhidmatan mel suara"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Tetapan untuk <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Perkhidmatan"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Persediaan"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Tidak ditetapkan&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Tetapan panggilan lain"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Dail"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Memanggil melalui ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Seret ke kanan untuk menjawab"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Seret ke kiri untuk menyenyapkan pendering"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Seret ke kiri untuk menolak"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Seret ke kanan untuk menjawab dan"\n"menunda panggilan aktif"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Seret ke kanan untuk menjawab dan"\n"menamatkan panggilan aktif"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Seret ke kanan untuk menjawab dan"\n"menamatkan panggilan tertunda"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Jawapan"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Tolak"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Memanggil melalui <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"foto kenalan"</string>
     <string name="goPrivate" msgid="865837794424530980">"jadi tertutup"</string>
     <string name="selectContact" msgid="781975788478987237">"pilih kenalan"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Tetapan panggilan Internet"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Akaun panggilan Internet (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Akaun"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Menguruskan akaun dan status panggilan Internet (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Menerima panggilan masuk"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Mengurangkan hayat bateri"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Konfigurasikan pilihan panggilan"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Guna panggilan Internet"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Guna panggilan Internet (Wi-Fi sahaja)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Untuk semua panggilan semasa rangkaian data tersedia"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Hanya untuk panggilan Internet"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Tanya untuk setiap panggilan"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Untuk semua panggilan"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Auto-pendaftaran"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Panggilan keluar melalui SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Membuat panggilan"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Gunakan akaun panggilan Internet:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Sentiasa gunakan untuk membuat panggilan Internet"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Anda boleh menggunakan Tetapan Panggilan untuk akaun panggilan Internet mana yang hendak digunakan sebagai lalai semasa membuat panggilan, dengan memilih akaun lain di bawah tetapan panggilan Internet"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Anda boleh menukar akaun panggilan Internet mana untuk digunakan secara lalai daripada skrin Telefon &gt; Tetapan &gt; tetapan panggilan Internet &gt; Akaun."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Panggilan telefon bimbit"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Panggilan internet"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Tiada akaun panggilan Internet"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Tiada akaun panggilan Internet pada telefon ini. Tambah akaun sekarang?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Tidak ada akaun panggilan internet pada telefon ini. Adakah anda mahu menambah satu sekarang?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Tambah"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Tambah akaun"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Alih keluar akaun"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Akaun SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Menyimpan akaun..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Mengalih keluar akaun..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Menyimpan akaun..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Mengalih keluar akaun..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Simpan"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Buang"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Tutup profil"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Tutup"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Utama"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Jadikan ini akaun utama saya"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Digunakan untuk panggilan keluar"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Tetapan terperinci"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Akaun utama. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Menyemak status..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Mendaftar..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Masih mencuba..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Tidak menerima panggilan"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Pendaftaran akaun terhenti kerana tiada sambungan Internet"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Pendaftaran akaun terhenti kerana tiada sambungan Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Pendaftaran akaun tidak berjaya"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Menerima panggilan"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Mendaftar..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Masih mencuba..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Tidak menerima panggilan."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Pendaftaran akaun terhenti kerana tiada sambungan Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Pendaftaran akaun terhenti kerana tiada sambungan Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Pendaftaran akaun tidak berjaya."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Menerima panggilan"</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Pendaftaran akaun tidak berjaya: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); akan mencuba kemudian"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Pendaftaran akaun tidak berjaya: nama pengguna atau kata laluan salah"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Pendaftaran akaun tidak berjaya: periksa nama pelayan"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Akaun ini sedang digunakan buat masa ini oleh aplikasi <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Pendaftaran akaun tidak berjaya: Nama pengguna atau kata laluan salah."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Pendaftaran akaun tidak berjaya: Periksa nama pelayan."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Akaun ini sedang digunakan buat masa ini oleh aplikasi <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Butiran akaun SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Butiran akaun SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Pelayan"</string>
@@ -660,9 +565,6 @@
     <string name="port_title" msgid="5952939408078626657">"Nombor port"</string>
     <string name="transport_title" msgid="8253139511847746640">"Jenis pengangkutan"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Hantar pengekal"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Hantar mesej pengekal SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Auto-pendaftaran"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Daftarkan profil secara automatik"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Tetapkan sebagai akaun utama"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Digunakan untuk panggilan keluar"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Tetapan pilihan"</string>
@@ -673,12 +575,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Pilihan&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Sentuh untuk menunjukkan semua"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Sentuh untuk sembunyikan semua"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> diperlukan, tidak boleh dibiarkan kosong"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Nombor port harus berada dalam 1000 dan 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> diperlukan dan tidak boleh dibiarkan kosong."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Nombor port harus berada dalam lingkungan 1000 dan 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Tiada sambungan Internet"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Tiada sambungan Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Untuk membuat panggilan Internet, semak sambungan Internet anda terlebih dahulu"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Anda mesti disambungkan kepada rangkaian Wi-Fi untuk membuat panggilan Internet (guna tetapan Wayarles &amp; Rangkaian)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Untuk membuat panggilan Internet, semak sambungan Internet anda terlebih dahulu."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Anda perlu disambungkan kepada rangkaian Wi-Fi untuk membuat panggilan Internet (guna tetapan Wayarles &amp; Rangkaian)"</string>
     <string name="no_voip" msgid="8901474054537199865">"Panggilan Internet tidak disokong"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automatik"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Sentiasa hantar"</string>
@@ -687,7 +589,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Saya akn segera hubungi awak nanti."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Saya akan hubungi awak kemudian."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Tdk blh berckp skg. Tel saya nanti?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Mesej peribadi..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Mesej peribadi"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respons pantas"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edit respons pantas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +607,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"bintang"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"sifar"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"paun"</string>
-    <string name="description_search_button" msgid="239929880630534731">"cari"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"dail"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Telefon pembesar suara didayakan."</string>
@@ -715,9 +616,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Tolak"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Getar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Getar"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Nada dering"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Sentiasa"</item>
     <item msgid="1595097872875714252">"Apabila senyap sahaja"</item>
     <item msgid="1458182414036878616">"Jangan sekali-kali"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Nada dering telefon"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Bergetar apabila berdering"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Nada sentuh pad dail"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Nada dering"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 14305dd88..6db669681 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Hemmelig nummer"</string>
     <string name="payphone" msgid="1931775086311769314">"Telefonkiosk"</string>
     <string name="onHold" msgid="9035493194749959955">"Parkert"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Aktiv samtale"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Opptatt"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Nettverket er opptatt"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Ingen respons, tidsavbrudd"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Tjeneren kan ikke nås"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nummeret kan ikke nås"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Feil brukernavn eller passord"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Anrop utenfor nettverk"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Anrop utenfor nettverk"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Tjenerfeil. Prøv igjen senere."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Mangler signal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-grense nådd"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radioen er av"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Mangler SIM-kort, eller SIM-feil"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Ikke noe SIM-kort eller SIM-kortfeil"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Utenfor dekningsområde"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Utgående samtaler er begrenset til faste nummer."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Du kan ikke ringe ut mens samtaleblokkering er på."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Du kan ikke foreta utgående anrop når samtalesperre er på."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Alle samtaler er begrenset av tilgangskontroll."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Nødsamtaler er begrenset av tilgangskontroll."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Vanlige samtaler er begrenset av tilgangskontroll."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Telefonen er låst til varmstart."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Samtalen ble droppet."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Samtalen ble avskåret."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: omordnet."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: tjenestevalg avslått."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: forsøk ordning på nytt."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Tilgang mislykket."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: ble kommet i forkjøpet."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Kun nødsamtaler er mulig."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Ugyldig nummer"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Ugyldig tall"</string>
     <string name="confCall" msgid="1904840547188336828">"Telefonmøte"</string>
     <string name="call_lost" msgid="317670617901479594">"Samtalen er mistet."</string>
-    <string name="retry" msgid="8462986804300767852">"Prøv på nytt"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Samtale mistet"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-kode påbegynt"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-kode kjører…"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Hodetelefon med kabel"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Send disse tonene?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Sender ringetoner"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Sendetoner"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Send"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Ja"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Nei"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Erstatt jokertegnet med"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Erstatt jokertegn med"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Mangler nummer til telefonsvarer"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Det er ikke lagret noe telefonsvarernummer på SIM-kortet."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Legg til nummer"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Laster…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Skriv inn PIN-kode for å låse opp SIM-kortet."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM-kort låst opp"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Ny PIN-kode for SIM-kort"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Skriv SIM-koden igjen for å bekrefte"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"PIN-kodene du skrev inn stemmer ikke overens. Prøv igjen."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Skriv inn PUK-kode for å låse opp SIM-kortet"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Gal PUK-kode!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Fortsett"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"SIM-kortet er blitt avblokkert. Telefonen låses opp…"</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN-kode for å fjerne operatørlås"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Lås opp"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Spør om fjerning av operatørlås…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Fikk ikke fjerne operatørlås."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Operatørlåsen er fjernet."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Innstillinger for GSM-samtaler"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Innstillinger for CDMA-samtaler"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Navn på aksesspunkt"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Flere CDMA-spesifikke innstillinger"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Nettverkstjenester"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Nummervisning"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Laster inn innstillinger …"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Skjul nummer ved utgående samtaler"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Vis nummer ved utgående samtaler"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"La operatøren bestemme om nummeret vises ved utgående samtaler"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Nummer ved opptattsignal"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Viderekobler til <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Deaktivert"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Operatøren håndterer ikke deaktivering av viderekobling når telefonen er opptatt."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operatøren støtter ikke deaktivering av viderekobling når telefonen er opptatt."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Viderekoble når det ikke svares"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Nummer for når det ikke svares"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Viderekobler til <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Deaktivert"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Operatøren håndterer ikke deaktivering av viderekobling når anropet ikke besvares."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operatøren støtter ikke deaktivering av viderekobling når anropet ikke besvares."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Viderekoble ved manglende dekning"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Nummer ved manglende dekning"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Viderekobler til <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Deaktivert"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Operatøren håndterer ikke deaktivering av viderekobling når telefonen er utenfor dekning."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Operatøren støtter ikke deaktivering av viderekobling når telefonen er utenfor dekning."</string>
     <string name="updating_title" msgid="6146755386174019046">"Samtaleinnstillinger"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Feil ved samtaleinnstillinger"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Leser innstillinger…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Tilbakestiller innstillinger ..."</string>
     <string name="response_error" msgid="6674110501330139405">"Uventet svar fra nettverket."</string>
     <string name="exception_error" msgid="7027667130619518211">"Nettverks- eller SIM-kort-feil."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Handlingene kan kun utføres på numre med anropsbegrensning."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Slå på radioen før du ser på disse innstillingene."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Telefonappens innstilling for Faste numre er aktivert. Derfor fungerer ikke enkelte av ringefunksjonene."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Slå på radioen før du ser på disse innstillingene."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Aktiver"</string>
     <string name="disable" msgid="7274240979164762320">"Deaktiver"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Skjul nummer"</item>
     <item msgid="1108394741608734023">"Vis nummer"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Lagre nummer til telefonsvarer"</string>
     <string name="vm_changed" msgid="380744030726254139">"Telefonsvarernummeret ble endret."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Endring av nummeret til talemeldingtjenesten mislyktes."\n"Ta kontakt med operatøren hvis dette problemet vedvarer."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Videresending av nummerendring mislyktes."\n"Ta kontakt med operatøren hvis dette problemet vedvarer."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Kan ikke endre mobilsvarnummeret."\n"Kontakt operatøren din hvis dette problemet vedvarer."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Kunne ikke endre viderekoblingsnummeret."\n"Kontakt operatøren hvis dette problemet vedvarer."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Kunne ikke hente og lagre gjeldende innstillinger for viderekoblingsnummer."\n"Vil du likevel bytte til den nye leverandøren?"</string>
     <string name="no_change" msgid="3186040086622435212">"Ingen endringer ble utført."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Velg talemeldingsleverandør"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Søk etter nettverk"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Det oppsto en feil under søking etter nettverk."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Kobler til <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"SIM-kortet tillater ikke tilkobling til dette nettverket."</string>
-    <string name="connect_later" msgid="500090982903469816">"Kan ikke koble til nettverket. Prøv på nytt senere."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"SIM-kortet tillater ingen tilkobling til dette nettverket."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Kan ikke koble til dette nettverket akkurat nå. Prøv på nytt senere."</string>
     <string name="registration_done" msgid="495135664535876612">"Registrert i nettverket."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Velg en nettoperatør"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Velg en nettverksoperatør"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Søk etter alle tilgjengelige nettverk"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Velg automatisk"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Velg foretrukket nettverk automatisk"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automatisk registrering …"</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Velg automatisk"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Velg foretrukket nettverk automatisk"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automatisk registrering"</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Nettverksmodus"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Bytt nettverksmodus"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Foretrukket nettverksmodus"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Foretrukket nettverksmodus: kun EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Foretrukket nettverksmodus: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Kun EvDo"</item>
     <item msgid="454610224530856274">"CDMA uten EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo auto"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA auto"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo automatisk"</item>
+    <item msgid="7148247646407324800">"GSM / WCDMA automatisk"</item>
     <item msgid="5189164180446264504">"Kun WCDMA"</item>
     <item msgid="5714714953966979187">"Kun GSM"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA foretrukket"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA foretrukket"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data aktivert"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Dataroaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Koble til datatjenester ved roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Koble til datatjenester ved roaming"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Du har mistet datakonnektivitet fordi du har forlatt hjemmenettet ditt med dataroaming slått av."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Du har mistet datatilkoblingen fordi du forlot hjemmenettet med datastreifing avslått."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Tillat dataroaming? Dette kan koste mye penger!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS-innstillinger"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA-innstillinger"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Databruk"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Retningslinjer for mobildata"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Data som er brukt i inneværende periode"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Databrukperiode"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Retningslinjer for datahastighet"</string>
@@ -232,7 +208,6 @@
     <skip />
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Datahastigheten reduseres til <xliff:g id="USED">%1$d</xliff:g> Kb/s hvis databruken overskrider grenseverdien"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Les mer om mobiloperatørens retningslinjer for bruk av nettverksdata"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Kringkastings-SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Kringkastings-SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Kringkastings-SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Kringkastings-SMS aktivert"</string>
@@ -273,15 +248,6 @@
     <item msgid="1858401628368130638">"Koreansk"</item>
     <item msgid="1933212028684529632">"Kinesisk"</item>
     <item msgid="1908428006803639064">"Hebraisk"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Språk"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Lokalt vær"</string>
@@ -311,9 +277,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Jobbmuligheter"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Jobbmuligheter aktivert"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Jobbmuligheter deaktivert"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Helse og sykehus"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Helse og sykehus aktivert"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Helse og sykehus deaktivert"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Helse og sykehus"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Helse og sykehus aktivert"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Helse og sykehus deaktivert"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Teknologinyheter"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Teknologinyheter aktivert"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Teknologinyheter deaktivert"</string>
@@ -328,35 +294,17 @@
     <item msgid="8912042051809329533">"Bare WCDMA"</item>
     <item msgid="8776934131146642662">"Kun GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA foretrekkes)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Bruk kun 2G-nettverk"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Sparer batteri"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Systemvalg"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Velg roamingmodus for CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Velg streifingsmodus for CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Systemvalg"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Kun hjemmenett"</item>
     <item msgid="1205664026446156265">"Automatisk"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA-roamingmodus"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Velg roamingmodus for CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA-roamingmodus"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Kun hjemmenett"</item>
-    <item msgid="8174642753290624634">"Tilknyttede nettverk"</item>
-    <item msgid="2241951431403168661">"Alle nettverk"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA-abonnement"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA-nettverksinnstillinger"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Ikke implementert ennå!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA-nettverksinnstillinger"</string>
@@ -365,21 +313,11 @@
     <item msgid="6143696847467859795">"Bare CDMA"</item>
     <item msgid="2683555124647197574">"Kun EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA-abonnement"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Bytt mellom RUIM/SIM og NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"abonnement"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktiver enhet"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Konfigurer datatjeneste"</string>
@@ -396,18 +334,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Vedlikehold liste over faste nummer"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Endre PIN-kode for å styre faste nummer"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Endre liste over telefonnummer"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Samtale-personvern"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Personvern for Google Voice"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Aktiver forbedret personvern"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY-modus"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Aktiver TTY-modus"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY-modus"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Velg TTY-modus"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Automatisk nytt forsøk"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Aktiver Automatisk nytt forsøk"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Automatisk nytt forsøk"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Aktiver Automatisk nytt forsøk"</string>
     <string name="menu_add" msgid="1882023737425114762">"Legg til kontakt"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Rediger kontakt"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Fjern kontakt"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Skriv inn PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Skriv inn PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Navn"</string>
     <string name="number" msgid="7905950798349903858">"Num,er"</string>
     <string name="save" msgid="4094274636321939086">"Lagre"</string>
@@ -420,56 +356,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Slett programmert telefonnummer"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Sletter programmert telefonnummer ..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Programmert telefonnummer er slettet."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Anropsbegrensning er ikke oppdatert: du har angitt feil PIN-kode."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"Anropsbegrensning er ikke oppdatert: nummeret kan kun inneholde 20 sifrer."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN er ikke oppdatert fordi du skrev inn feil PIN-kode."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN ble ikke oppdatert fordi tallet ikke kan overstige 20 sifre."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Fast nummer ble ikke oppdatert. PIN2 var feil, eller telefonnummeret ble avvist."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Leser fra SIM-kort…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Ingen kontakter på SIM-kortet."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Velg kontakter som skal importeres"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Du må slå av flymodus for å importere kontakter fra SIM-kortet."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Du må slå av flymodus før du kan importere kontakter fra SIM-kortet."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Slå av/på PIN-kode for SIM-kort"</string>
     <string name="change_pin" msgid="9174186126330785343">"Endre PIN-kode for SIM-kort"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM-kortets PIN-kode:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Gammel PIN-kode"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Ny PIN-kode"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Bekreft ny PIN-kode"</string>
-    <string name="badPin" msgid="4154316827946559447">"Du skrev gal gammel PIN-kode. Prøv igjen."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"PIN-kodene du skrev inn, stemmer ikke overens. Prøv igjen."</string>
+    <string name="badPin" msgid="8955102849303984935">"Den gamle personlige koden du skrev inn, er feil. Prøv på nytt."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"De personlige kodene du skrev inn, stemmer ikke overens. Prøv på nytt."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Skriv inn en PIN-kode som er fra 4 til 8 siffer."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Slå av PIN-kode for SIM-kort"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Slå på PIN-kode for SIM-kort"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Vent litt…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"PIN-kode for SIM-kort slått på"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN-kode for SIM-kort slått av"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"PIN-koden du skrev inn var gal"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"PIN-koden for SIM-kortet ble endret"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"Personlig kode for SIM-kort aktivert."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"Personlig kode for SIM-kort deaktivert."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Den personlige koden du skrev inn, er feil."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"Personlig kode for SIM-kort er endret."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Galt passord, SIM-kortet er låst! Skriv inn PUK2-koden."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2-kode"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Gammel PIN2-kode"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Ny PIN2-kode"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Bekreft ny PIN2-kode"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"PUK2-koden er ikke riktig. Prøv igjen."</string>
-    <string name="badPin2" msgid="515218795152422178">"Den gamle PIN2-koden du skrev er ikke riktig. Prøv igjen."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"PIN2-kodene du skrev inn, stemmer ikke overens. Prøv igjen."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"PUK2-koden du skrev inn, er feil. Prøv på nytt."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Den gamle personlige koden (PIN2) du skrev inn, er feil. Prøv på nytt."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"PIN2-kodene du skrev inn, stemmer ikke overens. Prøv på nytt."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Skriv inn en PIN2-kode som er mellom 4 og 8 siffer."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Skriv inn en PUK2-kode som er 8 siffer."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2-koden ble endret."</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"Personlig kode (PIN2) er endret"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Skriv inn PUk2-kode"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Galt passord, endre PIN2-koden og prøv igjen!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Galt passord, SIM-kortet er låst! Skriv inn PUK2-koden."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Passordet er feil. Endre PIN2 og prøv på nytt."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Feil passord – SIM-kortet er låst. Bruk PUK2 for å låse opp."</string>
     <string name="doneButton" msgid="2859593360997984240">"Ferdig"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Telefonmøte <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Tilbake til samtale"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Fortsett uten SIM-kort"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Fant ikke noe SIM-kort. Sett et SIM-kort i telefonen."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Skjul"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Lås opp"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Godkjenner PIN-kode…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nummer til telefonsvarer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Ringer"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Prøver på nytt"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Telefonmøte"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Innkommende anrop"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"CDMA samtale venter"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Samtale avsluttet"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Parkert"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Legger på"</string>
@@ -479,7 +409,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Tapte anrop"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> tapte anrop"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Tapt anrop fra <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Aktiv samtale (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Pågående samtale"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Parkert"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Innkommende samtale"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nye beskjeder på telefonsvarer"</string>
@@ -488,13 +418,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Mangler nummer til telefonsvarer"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ingen tjeneste"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Valgt nettverk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) er ikke tilgjengelig"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Legg på"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Ring tilbake"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Melding"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"For å ringe, slå av flymodus først."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ikke registrert på nettverket."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilnettverket er ikke tilgjengelig."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Samtalen ble ikke opprettet, mangler eller ugyldig nummer."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Samtalen ble ikke opprettet."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Begynner MMI-sekvens…"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Starter funksjonskode …"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Ustøttet tjeneste."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Kan ikke bytte samtale."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Kan ikke skille samtale."</string>
@@ -506,18 +438,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Nødanrop"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Slår på radio…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Utenfor dekningsområde, prøver igjen…"</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Samtalen ble ikke opprettet, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ikke et nødnummer!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Samtalen ble ikke opprettet, ring et nødnummer!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Anrop ikke utført. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> er ikke et nødnummer!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Anrop ikke foretatt. Ring et nødnummer!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Bruk tastaturet for å ringe"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Talltastatur for tastetoner"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Hold"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Opphev"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Avslutt"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Talltastatur"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Skjul"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Høyttaler"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Lyd av"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Tilføy anrop"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Slå sammen samtaler"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Bytt"</string>
@@ -536,36 +463,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI-tekst"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF-toner"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF-toner"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Velg lengde på DTMF-toner"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Vanlig"</item>
     <item msgid="2883365539347850535">"Lang"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Nettverksmelding"</string>
+    <string name="network_message" msgid="4483886461245213802">"Nettverksmelding"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktiver telefonen din"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Det må foretas en spesifikk oppringning for at telefontjenesten skal aktiveres. "\n\n"Trykk «Aktiver», og lytt deretter til instruksjonene for å aktivere telefonen."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Trykk på Aktiver for å foreta et spesielt anrop som aktiverer telefonen på mobiltjenesteleverandørens nettverk, slik at du kan foreta anrop og koble til mobildatanettverk."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Hopp over aktivering?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Hvis du hopper over aktiveringen, kan du ikke foreta anrop eller koble til mobildatanettverk (du kan imidlertid koble til trådløse nettverk). Du blir bedt om å aktivere hver gang du slår på telefonen, inntil aktivering er fullført."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Hopp over"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktiver"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktiver"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Telefonen er aktivert!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefonen er aktivert."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problemer med aktivering"</string>
     <string name="ota_listen" msgid="162923839877584937">"Følg taleinstruksjonene inntil du får beskjed om at aktiveringen er fullført."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Tastatur"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Høyttaler"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Vent mens telefonen programmeres."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programmering mislyktes"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Vent mens telefonen programmeres."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programmeringen mislyktes"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Telefonen din er aktivert. Det kan ta opptil 15 minutter før tjenestene er i gang."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Telefonen din ble ikke aktivert. "\n" Prøv å finne et område med bedre dekning (ved et vindu eller utendørs). "\n\n"Prøv på nytt, eller ring kundetjenestene for å få flere forslag."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Telefonen ble ikke aktivert."\n"Prøv å finne et område med bedre dekning (ved et vindu eller utendørs)."\n\n"Prøv på nytt, eller ring kundetjenesten for å få flere alternativer."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"Omfattende SPC-feil"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Tilbake"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Prøv igjen"</string>
     <string name="ota_next" msgid="3904945374358235910">"Neste"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Tilbake"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Startet modusen nødsamtale-tilbakeringing"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Modusen nødsamtale-tilbakeringing"</string>
@@ -575,87 +497,69 @@
     <item quantity="other" msgid="3122217344579273583">"Ingen datatilkobling i <xliff:g id="COUNT">%s</xliff:g> minutter"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Telefonen vil være i modusen nødsamtale-tilbakeringing i <xliff:g id="COUNT">%s</xliff:g> minutt. Ingen apper med datatilkobling kan brukes når telefonen er i denne modusen. Vil du avslutte?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Telefonen vil være i modusen nødsamtale-tilbakeringing i <xliff:g id="COUNT">%s</xliff:g> minutter. Ingen apper med datatilkobling kan brukes når telefonen er i denne modusen. Vil du avslutte?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Telefonen kommer til å være i nødsamtalemodus i <xliff:g id="COUNT">%s</xliff:g> minutt. Ingen apper som bruker en datatilkobling, kan brukes i denne modusen. Vil du avslutte nå?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Telefonen kommer til å være i nødsamtalesmodus i <xliff:g id="COUNT">%s</xliff:g> minutter. Ingen apper som bruker en datatilkobling, kan brukes i denne modusen. Vil du avslutte nå?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Den valgte handlingen er ikke tilgjengelig i modusen nødsamtale-tilbakeringing. Telefonen vil være i denne modusen i <xliff:g id="COUNT">%s</xliff:g> minutt. Vil du avslutte?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Den valgte handlingen er ikke tilgjengelig i modusen nødsamtale-tilbakeringing. Telefonen vil være i denne modusen i <xliff:g id="COUNT">%s</xliff:g> minutter. Vil du avslutte?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Den valgte handlingen er ikke tilgjengelig i nødsamtalemodus. Telefonen kommer til å være i denne modusen i <xliff:g id="COUNT">%s</xliff:g> minutt(er). Vil du avslutte nå?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Den valgte handlingen er ikke tilgjengelig i nødsamtalemodus. Telefonen kommer til å være i denne modusen i <xliff:g id="COUNT">%s</xliff:g> minutter. Vil du avslutte nå?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Ikke mulig under en nødsamtale"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Avslutter modusen nødsamtale-tilbakeringing"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Den valgte handlingen er ikke mulig under en nødsamtale."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Avslutter modusen nødsamtale-tilbakeringing"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Ja"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Nei"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Lukk"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Innstillinger for talemelding"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;ikke angitt&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Talemeldingtjeneste"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Innstillinger for <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Tjeneste"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Konfigurering"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ikke angitt&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Andre ringeinnstillinger"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Ring"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Ring via ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Dra mot høyre for å svare"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Dra mot venstre for å slå av ringetonen"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Dra mot venstre for å avslå"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Dra mot høyre for·å·svare·og·sette"\n"aktiv samtale på vent"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Dra mot høyre for å svare og"\n"avslutte aktiv samtale"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Dra mot høyre for·å·svare og"\n"avslutte ventende samtale"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Svar"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Ikke del"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Ringer via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"kontaktbilde"</string>
     <string name="goPrivate" msgid="865837794424530980">"aktiver privat samtale"</string>
     <string name="selectContact" msgid="781975788478987237">"velg kontakt"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Innstillinger for Internett-anrop"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"SIP-kontoer (Internett-anrop)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Kontoer"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Administrer SIP-kontoer og status for Internett-anrop"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Motta innkommende anrop"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Reduserer batterilevetiden"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Konfigurer samtalealternativer"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Bruk Internett-anrop"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Bruk konto for Internett-anrop (kun Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"For alle anrop hvor datanettverk er tilgjengelige"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Kun for Internett-anrop"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Spør ved alle anrop"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Bruk ved alle anrop"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Automatisk registrering"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Utgående samtale via SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Foreta anrop"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Bruk konto for Internett-anrop:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Standardvalg for Internett-anrop"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Du kan endre hvilken konto du bruker som standard for Internett-anrop ved å gå til innstillingene for anrop. Her kan du velge en annen konto under innstillinger for Internett-anrop"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Du kan endre hvilken konto for Internett-anrop som skal brukes som standard, under Telefon &gt; Innstillinger &gt; Innstillinger for Internett-anrop &gt; Kontoer."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Mobiltelefonanrop"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Internett-anrop"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Ingen konto for Internett-anrop"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Du har ingen kontoer for Internett-anrop på denne telefonen. Vil du legge til en nå?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Det er ingen konto for Internett-anrop på denne telefonen. Vil du legge til en nå?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Legg til"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Legg til konto"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Fjern konto"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP-kontoer"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Lagrer konto ..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Fjerner konto ..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Lagrer konto …"</string>
+    <string name="removing_account" msgid="7183999896088628100">"Fjerner konto …"</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Lagre"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Forkast"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Lukk profilen"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Lukk"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Primær"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Gjør dette til min hovedkonto"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Brukt til utgående anrop"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Avanserte innstillinger"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Primærkonto. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Kontrollerer status ..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Registrerer ..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Prøver fremdeles ..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Mottar ikke anrop"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Kontoregistreringen stoppet på grunn av manglende Internett-tilkobling"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Kontoregistreringen stoppet på grunn av manglende Wi-Fi-tilkobling"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Kontoregistrering mislyktes"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Mottar anrop"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registrerer …"</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Prøver fortsatt …"</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Mottar ikke anrop."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Kontoregistreringen stoppet på grunn av manglende Internett-tilkobling."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Kontoregistreringen stoppet på grunn av manglende Wi-Fi-tilkobling."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Kontoregistrering mislyktes."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Mottar anrop."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Kontoregistrering mislyktes: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); prøver på nytt senere"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Kontoregistrering mislyktes: feil brukernavn eller passord"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Kontoregistrering mislyktes: kontroller tjenernavnet"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Denne kontoen er for øyeblikket i bruk av appen <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Kontoregistrering mislyktes: feil brukernavn eller passord."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Kontoregistrering mislyktes: Kontroller tjenernavnet."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Denne kontoen er for øyeblikket i bruk av appen <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Kontoinnstillinger for SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Kontoinnstillinger for SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Tjener"</string>
@@ -666,9 +570,6 @@
     <string name="port_title" msgid="5952939408078626657">"Portnummer"</string>
     <string name="transport_title" msgid="8253139511847746640">"Transporttype"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Send hold-aktiv-meldinger"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Send hold-aktiv-meldinger for SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Automatisk registrering"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Registrer profilen automatisk"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Angi som hovedkonto"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Brukt til utgående anrop"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Valgfrie innstillinger"</string>
@@ -679,12 +580,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Valgfritt&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"Trykk for å vise alle"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"Trykk for å skjule alle"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> er obligatorisk, feltet kan ikke være tomt"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Portnummeret må være mellom 1000 og 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> er obligatorisk. Feltet kan ikke være tomt."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Portnummeret må være mellom 1000 og 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Ingen Internett-tilkobling"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Ingen Wi-Fi-tilkobling"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Kontroller Internett-tilkoblingen før du foretar et Internett-anrop"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Du må være koblet til et Wi-Fi-nettverk for å foreta Internett-anrop (gå til Innstillinger for (trådløse) nettverk)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Kontroller Internett-tilkoblingen før du foretar et Internett-anrop."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Du må være koblet til et Wi-Fi-nettverk for å foreta Internett-anrop (gå til innstillingene Trådløst og nettverk)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Internett-anrop håndteres ikke"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automatisk"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Send alltid"</string>
@@ -693,7 +594,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Jeg ringer deg straks tilbake."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Jeg ringer deg senere."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Ikke nå. Ringer du meg senere?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Egendefinert melding"</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Egendefinert melding"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Hurtigsvar"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Rediger hurtigsvar"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -711,7 +612,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"stjerne"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"null"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"firkant"</string>
-    <string name="description_search_button" msgid="239929880630534731">"søk"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ring"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"tilbaketast"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Høyttaler er aktivert."</string>
@@ -721,9 +621,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Avslå"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrering"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrering"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ringetone"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Alltid"</item>
-    <item msgid="1595097872875714252">"Kun ved stille modus"</item>
+    <item msgid="1595097872875714252">"Bare i stille modus"</item>
     <item msgid="1458182414036878616">"Aldri"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Telefonringetone"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrering når det ringer"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tastetoner for tastatur"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ringetone"</string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
new file mode 100644
index 000000000..9419e5e5f
--- /dev/null
+++ b/res/values-nl/arrays.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+     Copyright (C) 2012 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="clir_display_values">
+        <item msgid="5560134294467334594">"Netwerkstandaard"</item>
+        <item msgid="7876195870037833661">"Nummer verbergen"</item>
+        <item msgid="1108394741608734023">"Nummer tonen"</item>
+    </string-array>
+    <string-array name="preferred_network_mode_choices">
+        <item msgid="5543794538185064048">"LTE/CDMA"</item>
+        <item msgid="3273348576277144124">"Alleen EvDo"</item>
+        <item msgid="454610224530856274">"CDMA zonder EvDo"</item>
+        <item msgid="648505122852496166">"CDMA/EvDo (automatisch)"</item>
+        <item msgid="7148247646407324800">"GSM/WCDMA (automatisch)"</item>
+        <item msgid="5189164180446264504">"Alleen WCDMA"</item>
+        <item msgid="5714714953966979187">"Alleen GSM"</item>
+        <item msgid="8508331239546115206">"Voorkeur voor GSM/WCDMA"</item>
+    </string-array>
+    <string-array name="preferred_network_mode_choices_lte">
+        <item msgid="7002474529872452266">"LTE/CDMA"</item>
+        <item msgid="5541716989029928208">"CDMA"</item>
+    </string-array>
+    <string-array name="list_language_entries">
+        <item msgid="6137851079727305485">"Engels"</item>
+        <item msgid="1151988412809572526">"Frans"</item>
+        <item msgid="577840534704312665">"Spaans"</item>
+        <item msgid="8385712091143148180">"Japans"</item>
+        <item msgid="1858401628368130638">"Koreaans"</item>
+        <item msgid="1933212028684529632">"Chinees"</item>
+        <item msgid="1908428006803639064">"Hebreeuws"</item>
+    </string-array>
+    <string-array name="cdma_system_select_choices">
+        <item msgid="176474317493999285">"Alleen thuis"</item>
+        <item msgid="1205664026446156265">"Automatisch"</item>
+    </string-array>
+    <string-array name="tty_mode_entries">
+        <item msgid="512950011423868021">"TTY uit"</item>
+        <item msgid="3971695875449640648">"TTY vol"</item>
+        <item msgid="1937509904407445684">"TTY HCO"</item>
+        <item msgid="5644925873488772224">"TTY VCO"</item>
+    </string-array>
+    <string-array name="dtmf_tone_entries">
+        <item msgid="899650777817315681">"Normaal"</item>
+        <item msgid="2883365539347850535">"Lang"</item>
+    </string-array>
+    <string-array name="voicemail_notification_vibrate_when_entries">
+        <item msgid="468237575962916558">"Altijd"</item>
+        <item msgid="1595097872875714252">"Alleen indien stil"</item>
+        <item msgid="1458182414036878616">"Nooit"</item>
+    </string-array>
+
+    <!-- CYANOGENMOD EDITS -->
+
+    <!-- Mobile network settings, network mode choices for a device supporting GSM and LTE [CHAR LIMIT=25] -->
+    <string-array name="preferred_network_mode_choices_lte_gsm">
+        <item>LTE/GSM</item>
+        <item>GSM</item>
+    </string-array>
+</resources>
diff --git a/res/values-nl/plurals.xml b/res/values-nl/plurals.xml
new file mode 100644
index 000000000..6b0d524a3
--- /dev/null
+++ b/res/values-nl/plurals.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+     Copyright (C) 2012 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <plurals name="phone_in_ecm_notification_time">
+        <item quantity="one" msgid="4866221796252472622">"Er is al <xliff:g id="COUNT">%s</xliff:g> minuut geen gegevensverbinding"</item>
+        <item quantity="other" msgid="3122217344579273583">"Er is al <xliff:g id="COUNT">%s</xliff:g> minuten geen gegevensverbinding"</item>
+    </plurals>
+    <plurals name="alert_dialog_exit_ecm">
+        <item quantity="one" msgid="8060210887681426682">"De telefoon blijft <xliff:g id="COUNT">%s</xliff:g> minuut in de noodoproepmodus. In deze modus kunnen geen apps worden gebruikt waarvoor een gegevensverbinding nodig is. Wilt u nu sluiten?"</item>
+        <item quantity="other" msgid="8617116564023933114">"De telefoon blijft <xliff:g id="COUNT">%s</xliff:g> minuten in de noodoproepmodus. In deze modus kunnen geen apps worden gebruikt waarvoor een gegevensverbinding nodig is. Wilt u nu sluiten?"</item>
+    </plurals>
+    <plurals name="alert_dialog_not_avaialble_in_ecm">
+        <item quantity="one" msgid="2585506997024726599">"De geselecteerde actie is niet beschikbaar in de noodoproepmodus. De telefoon blijft <xliff:g id="COUNT">%s</xliff:g> minuut in deze modus. Wilt u nu sluiten?"</item>
+        <item quantity="other" msgid="6115622137771382224">"De geselecteerde actie is niet beschikbaar in de noodoproepmodus. De telefoon blijft <xliff:g id="COUNT">%s</xliff:g> minuten in deze modus. Wilt u nu sluiten?"</item>
+    </plurals>
+</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index bc08754cf..46fcc9796 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+     Copyright (C) 2012 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -13,7 +14,6 @@
      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="phoneAppLabel" product="tablet" msgid="8576272342240415145">"Mobiele gegevens"</string>
@@ -25,76 +25,53 @@
     <string name="private_num" msgid="6713286113000232309">"Privénummer"</string>
     <string name="payphone" msgid="1931775086311769314">"Betaaltelefoon"</string>
     <string name="onHold" msgid="9035493194749959955">"In de wacht"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Huidige oproep"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Lijn is bezet"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Netwerk bezet"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Geen reactie, time-out"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server niet bereikbaar"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nummer niet bereikbaar"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Ongeldige gebruikersnaam of wachtwoord"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Gebeld van buiten het netwerk"</string>
+    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Ongeldig(e) gebruikersnaam of wachtwoord"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Gebeld van buiten het netwerk"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Fout met server. Probeer het later opnieuw."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Geen kiestoon"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-limiet overschreden"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio uit"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Geen SIM-kaart of fout met SIM-kaart"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Geen simkaart of fout met simkaart"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Buiten servicegebied"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Uitgaande oproepen worden beperkt door FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Uitgaande oproepen zijn niet mogelijk als de functie voor oproepen blokkeren is ingeschakeld."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Uitgaande oproepen zijn niet mogelijk als de functie voor oproepen blokkeren is ingeschakeld."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Alle oproepen worden beperkt door toegangsbeheer."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Noodoproepen worden beperkt door toegangsbeheer."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Normale oproepen worden beperkt door toegangsbeheer."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: telefoon vergrendeld tot opstartcyclus."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: oproep afgebroken."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: oproep onderschept."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: nieuwe opdracht."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: serviceoptie geweigerd."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: opdracht opnieuw proberen."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: toegang mislukt."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: preëmptief gemaakt."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Alleen noodoproepen zijn mogelijk."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Ongeldig nummer"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Ongeldig getal"</string>
     <string name="confCall" msgid="1904840547188336828">"Telefonische vergadering"</string>
     <string name="call_lost" msgid="317670617901479594">"De verbinding is verbroken."</string>
-    <string name="retry" msgid="8462986804300767852">"Opnieuw proberen"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Verbinding verbroken"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-code gestart"</string>
-    <string name="ussdRunning" msgid="485588686340541690">"USSD-code uitvoeren..."</string>
+    <string name="ussdRunning" msgid="485588686340541690">"USSD-code uitvoeren\u2026"</string>
     <string name="mmiCancelled" msgid="2771923949751842276">"MMI-code geannuleerd"</string>
     <string name="cancel" msgid="5044513931633602634">"Annuleren"</string>
     <string name="manageConferenceLabel" msgid="4691922394301969053">"Telefonische vergadering beheren"</string>
     <string name="audio_mode_speaker" msgid="27649582100085266">"Luidspreker"</string>
-    <string name="audio_mode_earpiece" msgid="4156527186373869107">"Oortelefoon van handset"</string>
+    <string name="audio_mode_earpiece" msgid="4156527186373869107">"Oortelefoon van toestel"</string>
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Bedrade headset"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"De volgende tonen verzenden?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Nummers verzenden"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Nummers verzenden"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Verzenden"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Ja"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Nee"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Het jokerteken vervangen door"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Jokerteken vervangen door"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Voicemailnummer ontbreekt"</string>
-    <string name="no_vm_number_msg" msgid="1300729501030053828">"Er is geen voicemailnummer op de SIM-kaart opgeslagen."</string>
+    <string name="no_vm_number_msg" msgid="1300729501030053828">"Er is geen voicemailnummer op de simkaart opgeslagen."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Nummer toevoegen"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Laden..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Voer de PIN-code in om de SIM-kaart te ontgrendelen."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM-kaart ontgrendeld"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Nieuwe SIM PIN-code"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Voer de nieuwe SIM PIN-code nogmaals in ter bevestiging"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"De SIM PIN-codes die u heeft ingevoerd, komen niet overeen. Probeer het opnieuw."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Voer de PUK-code in om de SIM-kaart te ontgrendelen"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Onjuiste PUK-code!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Doorgaan"</string>
-    <string name="puk_unlocked" msgid="2284912838477558454">"Uw SIM-kaart is gedeblokkeerd. Uw telefoon wordt ontgrendeld..."</string>
-    <string name="label_ndp" msgid="780479633159517250">"PIN-code voor ontgrendelen SIM-netwerk"</string>
+    <string name="puk_unlocked" msgid="2284912838477558454">"Uw simkaart is gedeblokkeerd. Uw telefoon wordt ontgrendeld\u2026"</string>
+    <string name="label_ndp" msgid="780479633159517250">"Pincode voor ontgrendelen netwerk"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Ontgrendelen"</string>
     <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Negeren"</string>
-    <string name="requesting_unlock" msgid="6412629401033249351">"Verzoek om ontgrendelen netwerk..."</string>
+    <string name="requesting_unlock" msgid="6412629401033249351">"Verzoek om ontgrendelen netwerk\u2026"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Verzoek voor ontgrendelen netwerk mislukt."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Het netwerk is ontgrendeld."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI-nummer"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM-oproepinstellingen"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA-oproepinstellingen"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Namen toegangspunten"</string>
@@ -109,12 +86,13 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Aanvullende oproepinstellingen voor alleen CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Instellingen voor netwerkservice"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Beller-id"</string>
-    <string name="sum_hide_caller_id" msgid="1071407020290873782">"Nummer verborgen bij uitgaande oproepen"</string>
-    <string name="sum_show_caller_id" msgid="6768534125447290401">"Nummer weergegeven bij uitgaande oproepen"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Gebruik de standaard operatorinstellingen om mijn nummer bij uitgaande oproepen weer te geven"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Instellingen laden\u2026"</string>
+    <string name="sum_hide_caller_id" msgid="1071407020290873782">"Nummer verbergen bij uitgaande oproepen"</string>
+    <string name="sum_show_caller_id" msgid="6768534125447290401">"Nummer tonen bij uitgaande oproepen"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"Operatorinstellingen gebruiken bij uitgaande oproepen"</string>
     <string name="labelCW" msgid="6120513814915920200">"Wisselgesprek"</string>
     <string name="sum_cw_enabled" msgid="8083061901633671397">"Inkomende oproepen melden als ik aan het bellen ben"</string>
-    <string name="sum_cw_disabled" msgid="3648693907300104575">"Inkomende oproepen melden als ik aan het bellen ben"</string>
+    <string name="sum_cw_disabled" msgid="3648693907300104575">"Inkomende oproepen niet melden als ik aan het bellen ben"</string>
     <string name="call_forwarding_settings" msgid="3378927671091537173">"Instellingen voor doorschakelen van oproepen"</string>
     <string name="labelCF" msgid="2574386948026924737">"Oproep doorschakelen"</string>
     <string name="labelCFU" msgid="8147177368148660600">"Altijd doorschakelen"</string>
@@ -127,58 +105,52 @@
     <string name="messageCFB" msgid="3711089705936187129">"Nummer indien in gesprek"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Doorschakelen naar <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Uitgeschakeld"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Uw provider biedt geen ondersteuning voor het uitschakelen van oproepdoorschakelingen wanneer uw telefoon bezet is."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Uw provider biedt geen ondersteuning voor het uitschakelen van oproepdoorschakelingen wanneer uw telefoon bezet is."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Doorsch. bij onbeantwoord"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Nummer indien onbeantwoord"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Doorschakelen naar <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Uitgeschakeld"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Uw provider biedt geen ondersteuning voor het uitschakelen van oproepdoorschakelingen wanneer uw telefoon niet wordt opgenomen."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Uw provider biedt geen ondersteuning voor het uitschakelen van oproepdoorschakelingen wanneer uw telefoon niet wordt opgenomen."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Doorsch. bij onbereikbaar"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Nummer indien onbereikbaar"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Doorschakelen naar <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Uitgeschakeld"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Uw provider biedt geen ondersteuning voor het uitschakelen van oproepdoorschakelingen wanneer uw telefoon niet bereikbaar is."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Uw provider biedt geen ondersteuning voor het uitschakelen van oproepdoorschakelingen wanneer uw telefoon niet bereikbaar is."</string>
     <string name="updating_title" msgid="6146755386174019046">"Oproepinstellingen"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Fout met oproepinstellingen"</string>
-    <string name="reading_settings" msgid="1920291699287055284">"Instellingen lezen..."</string>
-    <string name="updating_settings" msgid="8171225533884883252">"Instellingen bijwerken..."</string>
-    <string name="reverting_settings" msgid="4752151682666912828">"Instellingen terugzetten..."</string>
+    <string name="reading_settings" msgid="1920291699287055284">"Instellingen lezen\u2026"</string>
+    <string name="updating_settings" msgid="8171225533884883252">"Instellingen bijwerken\u2026"</string>
+    <string name="reverting_settings" msgid="4752151682666912828">"Instellingen herstellen\u2026"</string>
     <string name="response_error" msgid="6674110501330139405">"Onverwachte reactie van netwerk."</string>
-    <string name="exception_error" msgid="7027667130619518211">"Netwerk- of SIM-kaartfout."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Bewerkingen zijn alleen toegestaan voor vaste nummers."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Schakel de radio in voordat u deze instellingen bekijkt."</string>
+    <string name="exception_error" msgid="7027667130619518211">"Netwerk- of simkaartfout."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"De instelling \'Vaste nummers\u2019 in Telefoon is ingeschakeld. Hierdoor werken sommige oproepgerelateerde functies niet."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Schakel de radio in voordat u deze instellingen bekijkt."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Inschakelen"</string>
     <string name="disable" msgid="7274240979164762320">"Uitschakelen"</string>
     <string name="change_num" msgid="239476305819844391">"Bijwerken"</string>
-  <string-array name="clir_display_values">
-    <item msgid="5560134294467334594">"Netwerkstandaard"</item>
-    <item msgid="7876195870037833661">"Nummer verbergen"</item>
-    <item msgid="1108394741608734023">"Nummer weergeven"</item>
-  </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Voicemailnummer opslaan"</string>
     <string name="vm_changed" msgid="380744030726254139">"Voicemailnummer gewijzigd."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Het wijzigen van het voicemailnummer is mislukt."\n"Neem contact op met uw provider als dit probleem zich blijft voordoen."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Het wijzigen van het doorschakelnummer is mislukt."\n"Neem contact op met uw provider als dit probleem zich blijft voordoen."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Kan het voicemailnummer niet wijzigen."\n"Neem contact op met uw provider als dit probleem zich blijft voordoen."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Kan het doorschakelnummer niet wijzigen."\n"Neem contact op met uw provider als dit probleem zich blijft voordoen."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Kan huidige instellingen voor doorschakelnummer niet ophalen en opslaan."\n"Toch overschakelen naar de nieuwe provider?"</string>
     <string name="no_change" msgid="3186040086622435212">"Er zijn geen wijzigingen aangebracht."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Service voor voicemail selecteren"</string>
     <string name="voicemail_default" msgid="5902099213882352338">"Mijn provider"</string>
     <string name="mobile_networks" msgid="5540397602919106177">"Instellingen mobiel netwerk"</string>
     <string name="label_available" msgid="1181658289009300430">"Beschikbare netwerken"</string>
-    <string name="load_networks_progress" msgid="5230707536168902952">"Zoeken..."</string>
+    <string name="load_networks_progress" msgid="5230707536168902952">"Zoeken\u2026"</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"Geen netwerken gevonden."</string>
     <string name="search_networks" msgid="1601136049300882441">"Netwerken zoeken"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Fout tijdens zoeken naar netwerken."</string>
-    <string name="register_on_network" msgid="9055203954040805084">"Registreren op <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Uw SIM-kaart staat geen verbinding met dit netwerk toe."</string>
-    <string name="connect_later" msgid="500090982903469816">"Kan momenteel geen verbinding maken met dit netwerk. Probeer het later opnieuw."</string>
+    <string name="register_on_network" msgid="9055203954040805084">"Registreren op <xliff:g id="NETWORK">%s</xliff:g>\u2026"</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Uw simkaart staat geen verbinding met dit netwerk toe."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Kan nu geen verbinding maken met dit netwerk. Probeer het later opnieuw."</string>
     <string name="registration_done" msgid="495135664535876612">"Geregistreerd op netwerk."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Een mobiele provider selecteren"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Een mobiele provider kiezen"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Alle beschikbare netwerken zoeken"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Automatisch selecteren"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Voorkeursnetwerk automatisch selecteren"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automatische registratie..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Automatisch kiezen"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Voorkeursnetwerk automatisch selecteren"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automatische registratie\u2026"</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Netwerkmodus"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"De netwerkgebruiksmodus wijzigen"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Voorkeursnetwerkmodus"</string>
@@ -191,31 +163,16 @@
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"Voorkeursnetwerkmodus: alleen CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Voorkeursnetwerkmodus: alleen EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Voorkeursnetwerkmodus: LTE/CDMA"</string>
-  <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Alleen EvDo"</item>
-    <item msgid="454610224530856274">"CDMA zonder EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA/EvDo automatisch"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA automatisch"</item>
-    <item msgid="5189164180446264504">"Alleen WCDMA"</item>
-    <item msgid="5714714953966979187">"Alleen GSM"</item>
-    <item msgid="4775796025725908913">"Voorkeur voor GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
-  </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Gegevenstoegang aan"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Gegevenstoegang via mobiel netwerk inschakelen"</string>
     <string name="roaming" msgid="8871412572928323707">"Gegevensroaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Verbinding maken met gegevensservices tijdens roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Verbinding maken met gegevensservices tijdens roaming"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"De gegevensverbinding is verbroken, omdat u uw thuisnetwerk heeft verlaten terwijl gegevensroaming was uitgeschakeld."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"De gegevensverbinding is verbroken, omdat u uw thuisnetwerk heeft verlaten terwijl gegevensroaming was uitgeschakeld."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Gegevensroaming toestaan? Er kunnen hoge roamingkosten in rekening worden gebracht."</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM-/UMTS-opties"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA-opties"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Gegevensgebruik"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Gegevensbeleid van provider"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Gegevensgebruik in huidige periode"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Periode voor gegevensgebruik"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Beleid voor gegevenssnelheid"</string>
@@ -226,7 +183,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">" ٪<xliff:g id="USED_0">%1$d</xliff:g>van cyclus verstreken"\n"De volgende periode start over <xliff:g id="USED_1">%2$d</xliff:g> dagen (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Gegevenssnelheid wordt verlaagd tot <xliff:g id="USED">%1$d</xliff:g> kB/s als de limiet voor gegevensgebruik wordt overschreden"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Meer informatie over het beleid voor gegevensgebruik van uw mobiele provider"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Infodienstbericht"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Infodienstbericht"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS Infodienstbericht"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS Infodienstbericht ingeschakeld"</string>
@@ -259,24 +215,6 @@
     <string name="international_disable" msgid="2850648591041088931">"Buitenlands nieuws uitgeschakeld"</string>
     <string name="list_language_title" msgid="2841683501919760043">"Taal"</string>
     <string name="list_language_summary" msgid="8109546531071241601">"De taal voor het nieuws selecteren"</string>
-  <string-array name="list_language_entries">
-    <item msgid="6137851079727305485">"Engels"</item>
-    <item msgid="1151988412809572526">"Frans"</item>
-    <item msgid="577840534704312665">"Spaans"</item>
-    <item msgid="8385712091143148180">"Japans"</item>
-    <item msgid="1858401628368130638">"Koreaans"</item>
-    <item msgid="1933212028684529632">"Chinees"</item>
-    <item msgid="1908428006803639064">"Hebreeuws"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
-  </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Talen"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Lokaal weerbericht"</string>
     <string name="local_weather_enable" msgid="6199315114382448922">"Lokaal weerbericht ingeschakeld"</string>
@@ -305,9 +243,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Vacatures"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Vacatures ingeschakeld"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Vacatures uitgeschakeld"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Medisch, gezondheid en ziekenhuis"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Medisch, gezondheid en ziekenhuis ingeschakeld"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Medisch, gezondheid en ziekenhuis uitgeschakeld"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Medisch, gezondheid en ziekenhuis"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Medisch, gezondheid en ziekenhuis ingeschakeld"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Medisch, gezondheid en ziekenhuis uitgeschakeld"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Technologienieuws"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Technologienieuws ingeschakeld"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Technologienieuws uitgeschakeld"</string>
@@ -322,35 +260,13 @@
     <item msgid="8912042051809329533">"Alleen WCDMA"</item>
     <item msgid="8776934131146642662">"Alleen GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (voorkeur voor WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Alleen 2G-netwerken"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Energiespaarstand"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Systeem selecteren"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"De CDMA-roamingmodus wijzigen"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"De CDMA-roamingmodus wijzigen"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Systeem selecteren"</string>
-  <string-array name="cdma_system_select_choices">
-    <item msgid="176474317493999285">"Alleen thuis"</item>
-    <item msgid="1205664026446156265">"Automatisch"</item>
-  </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA-roamingmodus"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"De CDMA-roamingmodus wijzigen"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA-roamingmodus"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Alleen thuisnetwerken"</item>
-    <item msgid="8174642753290624634">"Partnernetwerken"</item>
-    <item msgid="2241951431403168661">"Elk netwerk"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA-abonnement"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA-netwerkvoorkeuren"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Nog niet geïmplementeerd."</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA-netwerkvoorkeuren"</string>
@@ -359,22 +275,8 @@
     <item msgid="6143696847467859795">"Alleen CDMA"</item>
     <item msgid="2683555124647197574">"Alleen EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA-abonnement"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Schakelen tussen RUIM/SIM en NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"abonnement"</string>
-  <string-array name="cdma_subscription_choices">
-    <item msgid="2258014151300708431">"RUIM/SIM"</item>
-    <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
-  </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Apparaat activeren"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Gegevensservice instellen"</string>
     <string name="fdn" msgid="7878832555095183202">"Vaste nummers"</string>
@@ -384,86 +286,78 @@
     <string name="fdn_disabled" msgid="4700049736675368279">"Vaste nummers zijn uitgeschakeld"</string>
     <string name="enable_fdn" msgid="3740191529180493851">"FDN inschakelen"</string>
     <string name="disable_fdn" msgid="7944020890722540616">"FDN uitschakelen"</string>
-    <string name="change_pin2" msgid="2153563695382176676">"PIN2-code wijzigen"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"Pin2-code wijzigen"</string>
     <string name="enable_fdn_ok" msgid="7215588870329688132">"FDN uitschakelen"</string>
     <string name="disable_fdn_ok" msgid="5727046928930740173">"FDN inschakelen"</string>
     <string name="sum_fdn" msgid="1959399454900272878">"Vaste nummers beheren"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"PIN-code voor FDN-toegang wijzigen"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Pincode voor FDN-toegang wijzigen"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Lijst met telefoonnummers beheren"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Spraakprivacy"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Spraakprivacy"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Geavanceerde privacymodus inschakelen"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY-modus"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"TTY-modus inschakelen"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY-modus"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY-modus instellen"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Automatisch opnieuw proberen"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Modus voor automatisch opnieuw proberen inschakelen"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Automatisch opnieuw proberen"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Modus voor automatisch opnieuw proberen inschakelen"</string>
     <string name="menu_add" msgid="1882023737425114762">"Contact toevoegen"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Contact bewerken"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Contact verwijderen"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"PIN2-code invoeren"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Type PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Naam"</string>
     <string name="number" msgid="7905950798349903858">"Nummer"</string>
     <string name="save" msgid="4094274636321939086">"Opslaan"</string>
     <string name="add_fdn_contact" msgid="2481915899633353976">"Vast nummer toevoegen"</string>
-    <string name="adding_fdn_contact" msgid="7627379633721940991">"Vast nummer toevoegen..."</string>
+    <string name="adding_fdn_contact" msgid="7627379633721940991">"Vast nummer toevoegen\u2026"</string>
     <string name="fdn_contact_added" msgid="7458335758501736665">"Vast nummer toegevoegd."</string>
     <string name="edit_fdn_contact" msgid="7976936035587081480">"Vast nummer bewerken"</string>
-    <string name="updating_fdn_contact" msgid="8370929876849803600">"Vast nummer bijwerken..."</string>
+    <string name="updating_fdn_contact" msgid="8370929876849803600">"Vast nummer bijwerken\u2026"</string>
     <string name="fdn_contact_updated" msgid="5497828782609005017">"Vast nummer bijgewerkt."</string>
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Vast nummer verwijderen"</string>
-    <string name="deleting_fdn_contact" msgid="5669163206349319969">"Vast nummer verwijderen..."</string>
+    <string name="deleting_fdn_contact" msgid="5669163206349319969">"Vast nummer verwijderen\u2026"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Vast nummer verwijderd."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN niet bijgewerkt: u heeft een onjuiste PIN-code ingevoerd."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN niet bijgewerkt: nummer mag niet langer zijn dan 20 cijfers."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lezen vanaf SIM-kaart..."</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"Geen contacten op uw SIM-kaart."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN is niet bijgewerkt omdat u een onjuiste pincode heeft ingevoerd."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN is niet bijgewerkt omdat het nummer niet langer kan zijn dan 20 tekens."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN is niet bijgewerkt. De PIN2 was onjuist of het telefoonnummer is geweigerd."</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lezen vanaf simkaart\u2026"</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"Geen contacten op uw simkaart."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Contacten selecteren om te importeren"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Als u contacten wilt importeren van de simkaart, schakelt u de vliegmodus uit."</string>
-    <string name="enable_pin" msgid="5422767284133234860">"SIM PIN-code in-/uitschakelen"</string>
-    <string name="change_pin" msgid="9174186126330785343">"SIM PIN-code wijzigen"</string>
-    <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN-code:"</string>
-    <string name="oldPinLabel" msgid="5287773661246368314">"Oude PIN-code"</string>
-    <string name="newPinLabel" msgid="207488227285336897">"Nieuwe PIN-code"</string>
-    <string name="confirmPinLabel" msgid="257597715098070206">"Nieuwe PIN-code bevestigen"</string>
-    <string name="badPin" msgid="4154316827946559447">"De oude PIN-code die u heeft ingevoerd, is onjuist. Probeer het opnieuw."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"De PIN-codes die u heeft ingevoerd, komen niet overeen. Probeer het opnieuw."</string>
-    <string name="invalidPin" msgid="5981171102258684792">"Voer een PIN-code van 4 tot 8 cijfers in."</string>
-    <string name="disable_sim_pin" msgid="3992926931620188855">"SIM PIN-code uitschakelen"</string>
-    <string name="enable_sim_pin" msgid="5803702443844458831">"SIM PIN-code inschakelen"</string>
-    <string name="enable_in_progress" msgid="3695303775100109650">"Een ogenblik geduld..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"SIM PIN-code ingeschakeld"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM PIN-code uitgeschakeld"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"De PIN-code die u heeft ingevoerd, is onjuist"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"SIM PIN-code gewijzigd"</string>
-    <string name="puk_requested" msgid="3898394204193202803">"Wachtwoord onjuist, SIM-kaart is vergrendeld! PUK2-code vereist."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Voor het importeren van contacten vanaf de simkaart moet u eerst de vliegtuigmodus uitschakelen."</string>
+    <string name="enable_pin" msgid="5422767284133234860">"SIM-pincode in-/uitschakelen"</string>
+    <string name="change_pin" msgid="9174186126330785343">"SIM-pincode wijzigen"</string>
+    <string name="enter_pin_text" msgid="8532615714751931951">"SIM-pincode:"</string>
+    <string name="oldPinLabel" msgid="5287773661246368314">"Oude pincode"</string>
+    <string name="newPinLabel" msgid="207488227285336897">"Nieuwe pincode"</string>
+    <string name="confirmPinLabel" msgid="257597715098070206">"Nieuwe pincode bevestigen"</string>
+    <string name="badPin" msgid="8955102849303984935">"De oude pincode die u heeft ingevoerd, is onjuist. Probeer het opnieuw."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"De pincodes die u heeft ingevoerd, komen niet overeen. Probeer het opnieuw."</string>
+    <string name="invalidPin" msgid="5981171102258684792">"Voer een pincode van 4 tot 8 cijfers in."</string>
+    <string name="disable_sim_pin" msgid="3992926931620188855">"SIM-pincode uitschakelen"</string>
+    <string name="enable_sim_pin" msgid="5803702443844458831">"SIM-pincode inschakelen"</string>
+    <string name="enable_in_progress" msgid="3695303775100109650">"Een ogenblik geduld\u2026"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"Pincode voor simkaart ingeschakeld"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"Pincode voor simkaart uitgeschakeld."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"De pincode die u heeft ingevoerd, is onjuist."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"Pincode voor simkaart gewijzigd."</string>
+    <string name="puk_requested" msgid="3898394204193202803">"Wachtwoord onjuist, simkaart is vergrendeld! Puk2-code vereist."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
-    <string name="oldPin2Label" msgid="8559146795026261502">"Oude PIN2-code"</string>
-    <string name="newPin2Label" msgid="4573956902204349054">"Nieuwe PIN2-code"</string>
-    <string name="confirmPin2Label" msgid="8100319484454787708">"Nieuwe PIN2-code bevestigen"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"De PUK2-code die u heeft ingevoerd, is onjuist. Probeer het opnieuw."</string>
-    <string name="badPin2" msgid="515218795152422178">"De oude PIN2-code die u heeft ingevoerd, is onjuist. Probeer het opnieuw."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"De PIN2-codes die u heeft ingevoerd, komen niet overeen. Probeer het opnieuw."</string>
-    <string name="invalidPin2" msgid="8237110107480395938">"Voer een PIN2-code van 4 tot 8 cijfers in."</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"Voer een PUK2-code van 8 cijfers in."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2-code gewijzigd"</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"PUK2-code invoeren"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Wachtwoord onjuist, wijzig PIN2-code en probeer het opnieuw!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Wachtwoord onjuist, SIM-kaart is vergrendeld! PUK2-code vereist."</string>
+    <string name="oldPin2Label" msgid="8559146795026261502">"Oude pin2-code"</string>
+    <string name="newPin2Label" msgid="4573956902204349054">"Nieuwe pin2-code"</string>
+    <string name="confirmPin2Label" msgid="8100319484454787708">"Nieuwe pin2-code bevestigen"</string>
+    <string name="badPuk2" msgid="4851734468010000418">"De puk2-code die u heeft ingevoerd, is onjuist. Probeer het opnieuw."</string>
+    <string name="badPin2" msgid="1041576234483629991">"De oude pin2-code die u heeft ingevoerd, is onjuist. Probeer het opnieuw."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"De pin2-codes die u heeft ingevoerd, komen niet overeen. Probeer het opnieuw."</string>
+    <string name="invalidPin2" msgid="8237110107480395938">"Voer een pin2-code van 4 tot 8 cijfers in."</string>
+    <string name="invalidPuk2" msgid="1290977391033057871">"Voer een puk2-code van 8 cijfers in."</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"Pin2-code gewijzigd."</string>
+    <string name="label_puk2_code" msgid="302845876240219560">"Puk2-code invoeren"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Wachtwoord onjuist, wijzig de pin2-code en probeer het opnieuw."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Wachtwoord onjuist, simkaart is vergrendeld. Puk2-code vereist."</string>
     <string name="doneButton" msgid="2859593360997984240">"Gereed"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Telefonische vergadering <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Terug naar oproep"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Doorgaan zonder SIM-kaart"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Geen SIM-kaart gevonden. Plaats een SIM-kaart in de telefoon."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Negeren"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Ontgrendelen"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"PIN-code verifiëren..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Voicemailnummer"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Kiezen"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Opnieuw proberen"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Telefonische vergadering"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Inkomende oproep"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"CDMA-oproep in wacht"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Oproep beëindigd"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"In de wacht"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Ophangen"</string>
@@ -473,7 +367,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Gemiste oproepen"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> gemiste oproepen"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Gemiste oproep van <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Huidige oproep (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Actieve oproep"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"In de wacht"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Inkomende oproep"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nieuwe voicemail"</string>
@@ -482,13 +376,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Voicemailnummer onbekend"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Geen service"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Geselecteerd netwerk (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) niet beschikbaar"</string>
-    <string name="incall_error_power_off" msgid="6550191216405193368">"Als u wilt bellen, moet u eerst de Vliegmodus uitschakelen."</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Ophangen"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Terugbellen"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Bericht"</string>
+    <string name="incall_error_power_off" msgid="6550191216405193368">"Als u wilt bellen, moet u eerst de vliegtuigmodus uitschakelen."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Niet geregistreerd op netwerk."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobiel netwerk niet beschikbaar."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Oproep niet verzonden, geen geldig nummer ingevoerd."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Oproep niet verzonden."</string>
-    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI-reeks starten..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Functiecodereeks starten…"</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI-reeks starten\u2026"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Niet-ondersteunde service."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Kan niet overschakelen tussen oproepen."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Kan oproep niet scheiden."</string>
@@ -498,158 +394,107 @@
     <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Kan oproepen niet vrijgeven."</string>
     <string name="incall_call_type_label_sip" msgid="2310958283037924371">"Internetoproep"</string>
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Noodoproep"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Radio aanzetten..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Buiten servicegebied, nieuwe poging..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Oproep niet verzonden, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is geen alarmnummer!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Oproep niet verzonden, kies een alarmnummer!"</string>
+    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Radio aanzetten\u2026"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Buiten servicegebied, nieuwe poging\u2026"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Oproep niet verzonden. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> is geen alarmnummer!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Oproep niet verzonden. Kies een alarmnummer!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Toetsen gebruiken om te bellen"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Toetsenblok voor toetsgeluid"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"In de wacht"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Uit de wacht halen"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Beëindigen"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Toetsenblok"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Verbergen"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Luidspreker"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Dempen"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Oproep toevoegen"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Oproepen samenvoegen"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Wisselen"</string>
     <string name="onscreenManageCallsText" msgid="5473231160123254154">"Gesprekken beheren"</string>
     <string name="onscreenManageConferenceText" msgid="6485935856534311346">"Conferentie beheren"</string>
-    <string name="onscreenAudioText" msgid="1710087112800041743">"Audio"</string>
+    <string name="onscreenAudioText" msgid="1710087112800041743">"Geluid"</string>
     <string name="importSimEntry" msgid="6614358325359736031">"Importeren"</string>
     <string name="importAllSimEntries" msgid="1503181169636198673">"Alles importeren"</string>
     <string name="importingSimContacts" msgid="7374056215462575769">"SIM-contacten importeren"</string>
     <string name="importToFDNfromContacts" msgid="2130620207013368580">"Importeren uit contacten"</string>
     <string name="hac_mode_title" msgid="8740268574688743289">"Gehoorapparaten"</string>
     <string name="hac_mode_summary" msgid="6833851160514929341">"Compatibiliteit voor gehoorapparaat inschakelen"</string>
-  <string-array name="tty_mode_entries">
-    <item msgid="512950011423868021">"TTY uit"</item>
-    <item msgid="3971695875449640648">"TTY vol"</item>
-    <item msgid="1937509904407445684">"TTY HCO"</item>
-    <item msgid="5644925873488772224">"TTY VCO"</item>
-  </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI-tekst"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF-tonen"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF-tonen"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"De lengte van DTMF-tonen instellen"</string>
-  <string-array name="dtmf_tone_entries">
-    <item msgid="899650777817315681">"Normaal"</item>
-    <item msgid="2883365539347850535">"Lang"</item>
-  </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Netwerkbericht"</string>
+    <string name="network_message" msgid="4483886461245213802">"Netwerkbericht"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Uw telefoon activeren"</string>
-    <string name="ota_touch_activate" msgid="6553212803262586244">"U moet een speciale oproep uitvoeren om uw telefoonservice te activeren. "\n\n"Nadat u op \'Activeren\' heeft gedrukt, luistert u naar de instructies om uw telefoon te activeren."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Raak \'Activeren\' aan om een speciale oproep te plaatsen waarmee uw telefoon wordt geactiveerd op het mobiele netwerk van uw provider, zodat u kunt bellen en verbinding kunt maken met mobiele gegevensnetwerken."</string>
+    <string name="ota_touch_activate" msgid="6553212803262586244">"U moet een speciale oproep uitvoeren om uw telefoonservice te activeren. "\n\n"Nadat u op \'Activeren\u2019 heeft gedrukt, luistert u naar de instructies om uw telefoon te activeren."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Activering overslaan?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Als u de activering overslaat, kunt u niet bellen of verbinding maken met mobiele gegevensnetwerken (u kunt wel verbinding maken met Wi-Fi-netwerken). Tot u de telefoon activeert, wordt u gevraagd deze te activeren telkens wanneer u de telefoon inschakelt."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Overslaan"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Activeren"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Activeren"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"De telefoon is geactiveerd."</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"De telefoon is geactiveerd."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Probleem met activeren"</string>
     <string name="ota_listen" msgid="162923839877584937">"Volg de gesproken instructies tot u hoort dat de activering is voltooid."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Toetsenblok"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Luidspreker"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Wacht even totdat uw telefoon is geprogrammeerd."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programmeren mislukt"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Wacht een ogenblik totdat uw telefoon is geprogrammeerd."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programmeren mislukt"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Uw telefoon is nu geactiveerd. Het kan maximaal vijftien minuten duren voordat de service actief is."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Uw telefoon is niet geactiveerd. "\n"Zoek een plek waar u betere dekking heeft (in de buurt van een raam of buiten). "\n\n"Probeer het opnieuw of bel de klantenservice voor meer opties."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Uw telefoon is niet geactiveerd. "\n"Zoek een plek waar u betere dekking heeft (in de buurt van een raam of buiten). "\n\n"Probeer het opnieuw of bel de klantenservice voor meer opties."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"VEEL SPC-FOUTEN"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Terug"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Opnieuw proberen"</string>
     <string name="ota_next" msgid="3904945374358235910">"Volgende"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Terug"</string>
-    <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Modus voor noodoproepen ingeschakeld"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Modus voor noodoproepen"</string>
     <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Gegevensverbinding uitgeschakeld"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Er is al <xliff:g id="COUNT">%s</xliff:g> minuut geen dataverbinding"</item>
-    <item quantity="other" msgid="3122217344579273583">"Er is al <xliff:g id="COUNT">%s</xliff:g> minuten geen dataverbinding"</item>
-  </plurals>
-  <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"De telefoon staat <xliff:g id="COUNT">%s</xliff:g> minuut in de modus voor noodoproepen. In deze modus kunt u geen apps gebruiken waarvoor een dataverbinding nodig is. Wilt u de modus verlaten?"</item>
-    <item quantity="other" msgid="3231879566243957821">"De telefoon staat <xliff:g id="COUNT">%s</xliff:g> minuten in de modus voor noodoproepen. In deze modus kunt u geen apps gebruiken waarvoor een dataverbinding nodig is. Wilt u de modus verlaten?"</item>
-  </plurals>
-  <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"De geselecteerde actie is niet beschikbaar in de modus voor noodoproepen. De telefoon staat <xliff:g id="COUNT">%s</xliff:g> minuut in deze modus. Wilt u de modus verlaten?"</item>
-    <item quantity="other" msgid="3489076611710869904">"De geselecteerde actie is niet beschikbaar in de modus voor noodoproepen. De telefoon staat <xliff:g id="COUNT">%s</xliff:g> minuten in deze modus. Wilt u de modus verlaten?"</item>
-  </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"De geselecteerde actie is niet beschikbaar tijdens noodoproepen"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Modus voor noodoproepen verlaten"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"De geselecteerde actie is niet beschikbaar tijdens noodoproepen."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Modus voor noodoproepen verlaten"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Ja"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Nee"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Negeren"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Instellingen voor voicemail"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;niet ingesteld&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Service voor voicemail"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Instellingen voor <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Service"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Instelling"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"\u003CNiet ingesteld\u003E"</string>
     <string name="other_settings" msgid="3672912580359716394">"Andere instellingen voor bellen"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Bellen"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Bellen via ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Sleep naar rechts om op te nemen"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Sleep naar links om de belsoftware uit te schakelen"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Sleep naar links om te weigeren"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Sleep naar rechts om op te nemen en"\n"actieve oproep in de wacht te zetten"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Sleep naar rechts om op te nemen en"\n"actieve oproep te beëindigen"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Sleep naar rechts om op te nemen en"\n"oproep in de wacht te beëindigen"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Beantw."</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Weigeren"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Bellen via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"contactfoto"</string>
     <string name="goPrivate" msgid="865837794424530980">"privé"</string>
     <string name="selectContact" msgid="781975788478987237">"contact selecteren"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Instellingen voor bellen via internet"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Accounts voor internetoproepen (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Accounts"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Accounts en status voor internetoproepen (SIP) beheren"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Inkomende gesprekken ontvangen"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Verkort levensduur van accu"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Oproepopties configureren"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Internetoproepen gebruiken"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Internetoproepen gebruiken (alleen Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Voor alle oproepen indien gegevensnetwerk beschikbaar is"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Alleen voor internetoproepen"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Vragen bij elke oproep"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Voor alle oproepen"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Automatische registratie"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Uitgaande oproep via SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Bellen"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Account voor internetoproepen gebruiken:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Altijd gebruiken voor internetoproepen"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"U kunt \'Oproepinstellingen\' gebruiken om te wijzigen welk account u standaard voor internetoproepen wilt gebruiken door daar een ander account te selecteren."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Via het scherm \'Telefoon \u003E Instellingen \u003E Instellingen voor bellen via internet \u003E Accounts\u2019 kunt u het account wijzigen dat u standaard wilt gebruiken voor bellen via internet."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Oproep met mobiele telefoon"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Internetoproep"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Geen account voor internetoproepen"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"U heeft geen accounts voor internetoproepen op deze telefoon. Nu toevoegen?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Er zijn geen accounts voor bellen via internet ingesteld op deze telefoon. Wilt u nu een account toevoegen?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Toevoegen"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Account toevoegen"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Account verwijderen"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP-accounts"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Het account opslaan..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Het account verwijderen..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Het account opslaan\u2026"</string>
+    <string name="removing_account" msgid="7183999896088628100">"Het account verwijderen\u2026"</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Opslaan"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Annuleren"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Het profiel sluiten"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Sluiten"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Primair"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Dit instellen als mijn primaire account"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Gebruikt voor uitgaande oproepen"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Geavanceerde instellingen"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Primair account. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
-    <string name="registration_status_checking_status" msgid="3381868307694056727">"Status controleren..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Registreren..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Nog steeds bezig..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Oproepen worden niet ontvangen"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Accountregistratie gestopt omdat er geen internetverbinding is"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Accountregistratie gestopt omdat er geen Wi-Fi-verbinding is"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Accountregistratie mislukt"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Oproepen ontvangen"</string>
+    <string name="registration_status_checking_status" msgid="3381868307694056727">"Status controleren\u2026"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registreren\u2026"</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Nog steeds bezig\u2026"</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Oproepen worden niet ontvangen."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Accountregistratie gestopt omdat er geen internetverbinding is."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Accountregistratie gestopt omdat er geen Wi-Fi-verbinding is."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Accountregistratie mislukt."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Oproepen worden ontvangen."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Accountregistratie mislukt: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). We proberen het later opnieuw."</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Accountregistratie mislukt: gebruikersnaam of wachtwoord onjuist"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Accountregistratie mislukt: controleer de servernaam"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Dit account wordt momenteel gebruikt door de app <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Accountregistratie mislukt: gebruikersnaam of wachtwoord onjuist."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Accountregistratie mislukt: controleer de servernaam."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Dit account wordt momenteel gebruikt door de app <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIP-accountdetails"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP-accountdetails"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Server"</string>
@@ -660,25 +505,22 @@
     <string name="port_title" msgid="5952939408078626657">"Poortnummer"</string>
     <string name="transport_title" msgid="8253139511847746640">"Transporttype"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Keepalive verzenden"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"SIP-keepalive-berichten verzenden"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Automatische registratie"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Het profiel automatisch registreren"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Instellen als primair account"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Gebruikt voor uitgaande oproepen"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Optionele instellingen"</string>
     <string name="auth_username_title" msgid="851473016307947120">"Gebruikersnaam voor verificatie"</string>
     <string name="auth_username_summary" msgid="6782012405225938629">"Gebruikersnaam die voor de verificatie wordt gebruikt"</string>
-    <string name="default_preference_summary" msgid="868766740121667450">"&lt;Niet ingesteld&gt;"</string>
-    <string name="display_name_summary" msgid="8636377460518225523">"&lt;Gelijk aan gebruikersnaam&gt;"</string>
-    <string name="optional_summary" msgid="1464058793789832411">"&lt;Optioneel&gt;"</string>
-    <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Aanraken om alles weer te geven"</string>
-    <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Aanraken om alles te verbergen"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> is verplicht en mag niet worden leeggelaten"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Het poortnummer moet tussen 1000 en 65534 liggen"</string>
+    <string name="default_preference_summary" msgid="868766740121667450">"\u003CNiet ingesteld\u003E"</string>
+    <string name="display_name_summary" msgid="8636377460518225523">"\u003CGelijk aan gebruikersnaam\u003E"</string>
+    <string name="optional_summary" msgid="1464058793789832411">"\u003COptioneel\u003E"</string>
+    <string name="advanced_settings_show" msgid="4668880308290857597">"\u25B7 kiezen om alles te tonen"</string>
+    <string name="advanced_settings_hide" msgid="217398292824758079">"\u25BD kiezen om alles te verbergen"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> is verplicht en mag niet worden leeggelaten."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Het poortnummer moet tussen 1000 en 65534 liggen."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Geen internetverbinding"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Geen Wi-Fi-verbinding"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Controleer uw internetverbinding voordat u belt via internet"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Voor internetoproepen moet u verbinding hebben met een Wi-Fi-netwerk (gebruik \'Draadloze en netwerkinstellingen\')"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Controleer uw internetverbinding voordat u belt via internet."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Voor internetoproepen moet u verbinding hebben met een Wi-Fi-netwerk (gebruik de instellingen bij \'Draadloos \u0026 netwerken\u2019)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Bellen via internet niet ondersteund"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automatisch"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Altijd verzenden"</string>
@@ -687,7 +529,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Ik bel je zo terug."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Ik bel je later."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Kan nu niet opnemen. Bel me later."</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Aangepast bericht..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Aangepast bericht"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Snelle reacties"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Snelle reacties bewerken"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +547,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"ster"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"nul"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"hekje"</string>
-    <string name="description_search_button" msgid="239929880630534731">"zoeken"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"bellen"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Telefoonluidspreker is ingeschakeld."</string>
@@ -715,9 +556,55 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Weigeren"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Trillen"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Trillen"</string>
-  <string-array name="voicemail_notification_vibrate_when_entries">
-    <item msgid="468237575962916558">"Altijd"</item>
-    <item msgid="1595097872875714252">"Alleen indien stil"</item>
-    <item msgid="1458182414036878616">"Nooit"</item>
-  </string-array>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Beltoon"</string>
+    <string name="ringtone_title" msgid="6374978286202084684">"Beltoon telefoon"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Trillen bij bellen"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"DTMF-tonen kiestoetsen"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Beltoon"</string>
+
+    <!-- CYANOGENMOD EDITS -->
+    <string name="perm_change_mobile_network">Van netwerk veranderen (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Hiermee kunnen apps op elk moment wisselen tussen 2G en 3G. 3G is sneller, maar verbruikt meer stroom en kan duurder zijn.</string>
+
+    <!-- Mobile network settings screen, setting check box name -->
+    <string name="national_roaming">Nationale gegevensroaming</string>
+    <!-- Mobile network settings screen, setting summary text when check box is selected -->
+    <string name="national_roaming_enable">Verbinding maken met gegevensdiensten bij nationaal roamen</string>
+    <!-- Mobile network settings screen, setting summary text when check box is clear -->
+    <string name="national_roaming_disable">Verbinding verbreken met gegevensdiensten bij nationaal roamen</string>
+
+    <string name="phone_number_label">Mijn telefoonnummer</string>
+    <string name="phone_number_summary">Telefoonnummer van dit apparaat instellen</string>
+
+    <!-- Call settings screen, message wait indicator name -->
+    <string name="mwi_notification_title">Voicemailmeldingen</string>
+    <!-- Call settings screen, message wait indicator summary -->
+    <string name="mwi_notification_summary">Meldingen tonen voor nieuwe voicemailberichten</string>
+
+    <!-- Mobile network settings, summary for preferred network mode LTE / GSM[CHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_gsm_summary">Voorkeursnetwerkmodus: LTE/WCDMA/GSM</string>
+    <!-- Mobile network settings, summary for preferred network mode LTE / CDMA / EvDo[CHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_cdma_evdo_summary">Voorkeursnetwerkmodus: LTE/CDMA/EvDo</string>
+    <!-- Mobile network settings, summary for preferred network mode LTE / CMDA / EvDo / GSM/WCDMACHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">Voorkeursnetwerkmodus: LTE/CMDA/EvDo/GSM/WCDMA</string>
+
+    <!-- Dialer UI Settings -->
+    <string name="dialer_ui_settings_title">Toetsenblokinstellingen</string>
+    <string name="dialer_ui_settings_summary">Instellingen voor het numerieke toetsenblok</string>
+
+    <!-- Noise suppression -->
+    <string name="noise_suppression_title">Ruisonderdrukking</string>
+    <string name="noise_suppression_summary">Ruisonderdrukking inschakelen tijdens gesprekken</string>
+
+    <!-- Advanced Settings -->
+    <string name="advanced_setting">Geavanceerd</string>
+    <string name="keep_proximity_sensor_on">Nabijheidssensor actief houden</string>
+    <string name="keep_proximity_sensor_on_sum">Nabijheidssensor niet uitschakelen tijdens bellen met een headset</string>
+    <string name="lockscreen_if_call_ends_with_screenoff">Vergrendelen na einde gesprek</string>
+    <string name="lockscreen_if_call_ends_with_screenoff_sum">Automatisch vergrendelen als het gesprek beëindigd en het scherm uit is</string>
+    <string name="vibrate_outgoing">Trillen bij aannemen</string>
+    <string name="vibrate_45">Elke 45 seconden trillen</string>
+    <string name="vibrate_45_sum">Elke 45 seconden trillen bij uitgaande gesprekken</string>
+    <string name="vibrate_hangup">Trillen bij ophangen</string>
+    <string name="vibrate_call_waiting">Trillen bij wachten</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index e4fe6f694..b25b48447 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Numer prywatny"</string>
     <string name="payphone" msgid="1931775086311769314">"Płatny telefon"</string>
     <string name="onHold" msgid="9035493194749959955">"Oczekujące"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Bieżące połączenie"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Linia jest zajęta"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Sieć zajęta"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Brak odpowiedzi, przekroczono limit czasu"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Serwer nieosiągalny"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numer nieosiągalny"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nieprawidłowa nazwa użytkownika lub hasło"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Połączenie spoza sieci"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Połączenie spoza sieci"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Błąd serwera. Spróbuj ponownie później."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Brak sygnału"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Przekroczono limit ACM"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Sieci bezprzewodowe są wyłączone"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Brak lub błąd karty SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Brak lub błąd karty SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Obszar nieobsługiwany"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Połączenia są ograniczone do listy ustalonych numerów."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Nie można wykonywać połączeń wychodzących, gdy włączona jest blokada dzwonienia."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Nie można wykonywać połączeń wychodzących, gdy włączona jest blokada dzwonienia."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Wszystkie połączenia są zablokowane przez funkcję kontroli dostępu."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Połączenia alarmowe są zablokowane przez funkcję kontroli dostępu."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Zwykłe połączenia są zablokowane przez funkcję kontroli dostępu."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: telefon zablokowany do momentu ponownego uruchomienia."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: połączenie porzucone."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: połączenie przechwycone."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: zmiana kolejności."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: odrzucenie opcji usługi."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: kolejność ponawiania próby."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: dostęp zakończony niepowodzeniem."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: zajęte."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Możliwe jest wykonywanie tylko połączeń alarmowych."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Nieprawidłowy numer"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Nieprawidłowy numer"</string>
     <string name="confCall" msgid="1904840547188336828">"Poł. konferencyjne"</string>
     <string name="call_lost" msgid="317670617901479594">"Połączenie zostało zerwane."</string>
-    <string name="retry" msgid="8462986804300767852">"Ponów próbę"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Połączenie zostało zerwane"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Kod MMI został rozpoczęty"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Uruchomiony kod USSD..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Przewodowy zestaw słuch."</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Wysłać następujące dzwonki?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Wysyłanie sygnałów"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Wysyłanie sygnałów"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Wyślij"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Tak"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Nie"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Zastąp symbol wieloznaczny"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Zastąp symbol wieloznaczny"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Brakuje numeru poczty głosowej"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Na karcie SIM nie ma zapisanego numeru poczty głosowej."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Dodaj numer"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Ładowanie..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Wprowadź kod PIN, aby odblokować kartę SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"Karta SIM jest odblokowana"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Nowy kod PIN do karty SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Aby potwierdzić, wpisz ponownie nowy kod PIN do karty SIM"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Wprowadzone kody PIN do karty SIM nie są identyczne. Spróbuj ponownie."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Wprowadź kod PUK, aby odblokować kartę SIM"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Błędny kod PUK!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Dalej"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Karta SIM została odblokowana. Odblokowywanie telefonu..."</string>
     <string name="label_ndp" msgid="780479633159517250">"Kod PIN do karty SIM odblokowujący sieć"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Odblokuj"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Żądanie odblokowania sieci..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Żądanie odblokowania sieci zakończyło się niepowodzeniem."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Sieć została pomyślnie odblokowana."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"Numer MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Ustawienia połączenia GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Ustawienia połączenia CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Punkty dostępowe"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Dodatkowe ustawienia tylko połączenia CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Ustawienia usługi sieciowej"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"ID rozmówcy"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Wczytywanie ustawień…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Ukrycie numeru podczas rozmów wychodzących"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Numer wyświetlany w połączeniach wychodzących"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Użyj domyślnych ustawień operatora, aby wyświetlać mój numer w połączeniach wychodzących"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Numer, gdy zajęty"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Przekazywanie do <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Wyłączone"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Twój operator nie umożliwia wyłączenia przekazywania połączeń, gdy numer jest zajęty."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Twój operator nie umożliwia wyłączenia przekazywania połączeń, gdy numer jest zajęty."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Przekieruj, gdy nieodebrane"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Numer, gdy nieodebrane"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Przekazywanie do <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Wyłączone"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Twój operator nie umożliwia wyłączenia przekazywania połączeń, gdy numer nie odpowiada."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Twój operator nie umożliwia wyłączenia przekazywania połączeń, gdy numer nie odpowiada."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Przekieruj, gdy nieosiągalny"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Numer, gdy nieosiągalny."</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Przekazywanie do <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Wyłączone"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Twój operator nie umożliwia wyłączenia przekazywania połączeń, gdy numer jest nieosiągalny."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Twój operator nie umożliwia wyłączenia przekazywania połączeń, gdy numer jest nieosiągalny."</string>
     <string name="updating_title" msgid="6146755386174019046">"Ustawienia połączeń"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Błąd w ustawieniach połączenia"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Czytanie ustawień..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Cofanie ustawień…"</string>
     <string name="response_error" msgid="6674110501330139405">"Nieoczekiwana odpowiedź z sieci."</string>
     <string name="exception_error" msgid="7027667130619518211">"Błąd sieci lub karty SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Dozwolone są wyłącznie operacje na numerach ustalonych."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Przed wyświetleniem tych ustawień należy włączyć sieci bezprzewodowe."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"W aplikacji Telefon włączone jest ustawienie Numery ustalone. W rezultacie niektóre funkcje związane z połączeniami nie działają."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Przed wyświetleniem tych ustawień włącz radio."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Włącz"</string>
     <string name="disable" msgid="7274240979164762320">"Wyłącz"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Ukryj numer"</item>
     <item msgid="1108394741608734023">"Pokaż numer"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Zapisz numer poczty głosowej"</string>
     <string name="vm_changed" msgid="380744030726254139">"Numer poczty głosowej został zmieniony."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Zmiana numeru poczty głosowej nie powiodła się."\n"Jeśli problem będzie występował nadal, skontaktuj się z operatorem."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Zmiana numeru przekazywania nie powiodła się."\n"Jeśli problem będzie występował nadal, skontaktuj się z operatorem."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Nie można zmienić numeru poczty głosowej."\n"Jeśli problem będzie się powtarzał, skontaktuj się z operatorem."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Nie można zmienić numeru przekierowania."\n"Jeśli problem będzie się powtarzał, skontaktuj się z operatorem."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Nie można pobrać i zapisać bieżących ustawień numeru przekazywania."\n"Czy mimo to przełączyć na nowego dostawcę?"</string>
     <string name="no_change" msgid="3186040086622435212">"Nie dokonano żadnych zmian."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Wybierz usługę poczty głosowej"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Wyszukaj sieci"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Podczas wyszukiwania sieci wystąpił błąd."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Rejestrowanie w <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Karta SIM nie pozwala na połączenia z tą siecią."</string>
-    <string name="connect_later" msgid="500090982903469816">"Nie można nawiązać połączenia z tą siecią. Spróbuj ponownie później."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Karta SIM nie pozwala na połączenia z tą siecią."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Nie można teraz połączyć się z tą siecią. Spróbuj ponownie później."</string>
     <string name="registration_done" msgid="495135664535876612">"Zarejestrowano w sieci."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Wybierz operatora sieci"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Wybierz operatora sieci."</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Wyszukaj wszystkie dostępne sieci"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Wybierz automatycznie"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Automatycznie wybierz preferowaną sieć"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automatyczna rejestracja..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Wybierz automatycznie"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Automatycznie wybierz preferowaną sieć"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automatyczna rejestracja..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Tryb sieci"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Zmień tryb działania sieci"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Preferowany tryb sieci"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Preferowany tryb sieci: tylko EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Preferowany tryb sieci: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Tylko EvDo"</item>
     <item msgid="454610224530856274">"CDMA bez EvDo"</item>
-    <item msgid="8928247118825616081">"Automatyczny CDMA/EvDo"</item>
-    <item msgid="8595462903294812666">"Automatyczny GSM/WCDMA"</item>
+    <item msgid="648505122852496166">"Automatyczny CDMA/EvDo"</item>
+    <item msgid="7148247646407324800">"Automatyczny GSM/WCDMA"</item>
     <item msgid="5189164180446264504">"Tylko WCDMA"</item>
     <item msgid="5714714953966979187">"Tylko GSM"</item>
-    <item msgid="4775796025725908913">"Preferowany GSM/WCDMA"</item>
+    <item msgid="8508331239546115206">"Preferowany GSM/WCDMA"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Włącz przesył danych"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Dane w roamingu"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Połącz z usługami przesyłu danych podczas roamingu"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Połącz z usługami przesyłu danych podczas roamingu"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Utracono łączność danych, ponieważ pozostawiono wyłączony roaming danych w sieci macierzystej."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Połączenie transmisji danych zostało utracone, ponieważ opuszczono sieć macierzystą przy wyłączonej opcji danych w roamingu."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Czy pozwolić na przesył danych w roamingu? Operator może naliczać wysokie opłaty roamingowe!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Opcje GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Opcje CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Użycie danych"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Zasady operatora dot. danych"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Ilość użytych danych w bieżącym okresie"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Okres użycia danych"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Zasada prędkości przesyłu danych"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Minęło <xliff:g id="USED_0">%1$d</xliff:g>٪ cyklu"\n"Następny okres za: <xliff:g id="USED_1">%2$d</xliff:g> dni (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Zmniejsz transfer do <xliff:g id="USED">%1$d</xliff:g> Kb/s jeśli przekroczę limit użycia danych"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Więcej informacji na temat zasad dotyczących użycia danych w sieci komórkowej tego operatora"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Wiadomość SMS transmisji komórkowej"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Wiadomość SMS transmisji komórkowej"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Wiadomość SMS transmisji komórkowej"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Wiadomość SMS transmisji komórkowej włączona"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"koreański"</item>
     <item msgid="1933212028684529632">"chiński"</item>
     <item msgid="1908428006803639064">"hebrajski"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Języki"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Lokalna prognoza pogody"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Oferty pracy"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Oferty pracy włączone"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Oferty pracy wyłączone"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Placówki medyczne, zakłady opieki zdrowotnej i szpitale"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Placówki medyczne, zakłady opieki zdrowotnej i szpitale włączone"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Placówki medyczne, zakłady opieki zdrowotnej i szpitale wyłączone"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Placówki medyczne, zakłady opieki zdrowotnej i szpitale"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Placówki medyczne, zakłady opieki zdrowotnej i szpitale włączone"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Placówki medyczne, zakłady opieki zdrowotnej i szpitale wyłączone"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Wiadomości technologiczne"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Wiadomości technologiczne włączone"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Wiadomości technologiczne wyłączone"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"Tylko WCDMA"</item>
     <item msgid="8776934131146642662">"Tylko GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (preferowany WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Używaj tylko sieci 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Oszczędza baterię"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Wybór systemu"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Zmień tryb roamingu CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Zmień tryb roamingu CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Wybór systemu"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Tylko główne"</item>
     <item msgid="1205664026446156265">"Automatycznie"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Tryb roamingu CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Zmień tryb roamingu CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Tryb roamingu CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Tylko sieci domowe"</item>
-    <item msgid="8174642753290624634">"Sieci stowarzyszone"</item>
-    <item msgid="2241951431403168661">"Dowolna sieć"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Subskrypcja CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Ustawienia sieci CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Funkcja jeszcze niezaimplementowana."</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Ustawienia sieci CDMA"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"Tylko CDMA"</item>
     <item msgid="2683555124647197574">"Tylko EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Subskrypcja CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Zmiana między RUIM/SIM i NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"subskrypcja"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktywuj urządzenie"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Skonfiguruj plan danych"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Zarządzanie ustalonymi numerami"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Zmień kod PIN pozwalający na zarządzanie ustalonymi numerami"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Zarządzanie listą numerów telefonów"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Prywatność połączeń głosowych"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Prywatność połączeń głosowych"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Włącz rozszerzony tryb prywatności"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Tryb TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Włącz tryb TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Tryb TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Ustaw tryb TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Automatyczne ponawianie próby"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Włącz tryb automatycznego ponawiania próby"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Automatyczne ponawianie próby"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Włącz tryb automatycznego ponawiania próby"</string>
     <string name="menu_add" msgid="1882023737425114762">"Dodaj kontakt"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Edytuj kontakt"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Usuń kontakt"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Wprowadź PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Wpisz PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Nazwa"</string>
     <string name="number" msgid="7905950798349903858">"Numer"</string>
     <string name="save" msgid="4094274636321939086">"Zapisz"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Usuń ustalony numer"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Trwa usuwanie ustalonego numeru…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Usunięto ustalony numer."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Nie zaktualizowano usługi FDN: wprowadzono nieprawidłowy kod PIN."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"Nie zaktualizowano usługi FDN: numer nie może przekraczać 20 cyfr."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Nie zaktualizowano usługi FDN, ponieważ wpisano nieprawidłowy kod PIN."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Nie zaktualizowano usługi FDN, ponieważ numer nie może być dłuższy niż 20 cyfr."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Nie zaktualizowano FDN. PIN2 był niepoprawny lub numer telefonu został odrzucony."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Czytanie z karty SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Brak kontaktów na karcie SIM"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Wybierz kontakty do importowania"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Aby zaimportować kontakty z karty SIM, wyłącz tryb samolotowy."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Aby zaimportować kontakty z karty SIM, najpierw wyłącz tryb samolotowy."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Włącz/wyłącz kod PIN do karty SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Zmień PIN do karty SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"Kod PIN do karty SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Stary kod PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Nowy kod PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Potwierdź nowy kod PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Wprowadzony stary kod PIN jest nieprawidłowy. Spróbuj ponownie."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Wprowadzone kody PIN nie są identyczne. Spróbuj ponownie."</string>
+    <string name="badPin" msgid="8955102849303984935">"Wpisany stary kod PIN jest nieprawidłowy. Spróbuj ponownie."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Wpisane kody PIN nie są identyczne. Spróbuj ponownie."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Wpisz kod PIN o długości od 4 do 8 cyfr."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Wyłącz PIN do karty SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Włącz kod PIN do karty SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Proszę czekać..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"Kod PIN do karty SIM jest włączony"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN do karty SIM jest wyłączony"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Wprowadzony kod PIN był nieprawidłowy"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"Kod PIN do karty SIM został pomyślnie zmieniony"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"Kod PIN do karty SIM jest włączony."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN do karty SIM jest wyłączony."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Wpisany kod PIN był nieprawidłowy."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"Kod PIN do karty SIM został zmieniony."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Błędne hasło, karta SIM jest zablokowana! Wymagany kod PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Stary kod PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nowy PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Potwierdź nowy kod PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Wprowadzony kod PUK2 jest nieprawidłowy. Spróbuj ponownie."</string>
-    <string name="badPin2" msgid="515218795152422178">"Wprowadzony stary kod PIN2 jest niepoprawny. Spróbuj ponownie."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Wprowadzone kody PIN2 nie są identyczne. Spróbuj ponownie."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Wpisany kod PUK2 jest nieprawidłowy. Spróbuj ponownie."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Wpisany stary kod PIN2 jest nieprawidłowy. Spróbuj ponownie."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Wpisane kody PIN2 nie są identyczne. Spróbuj ponownie."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Wprowadź kod PIN2, który ma od 4 do 8 cyfr."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Wprowadź 8-cyfrowy kod PUK2."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"Kod PIN2 został pomyślnie zmieniony"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"Kod PIN2 został pomyślnie zmieniony."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Wprowadź kod PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Błędne hasło, zmień kod PIN2 i spróbuj ponownie!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Błędne hasło, karta SIM jest zablokowana! Wymagany kod PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Błędne hasło. Zmień kod PIN2 i spróbuj ponownie."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Błędne hasło, karta SIM jest zablokowana. Wymagany kod PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Gotowe"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Poł. konferencyjne <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Powrót do połączenia"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Kontynuuj bez karty SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Nie znaleziono karty SIM. Należy włożyć kartę SIM do telefonu."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Zamknij"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Odblokuj"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Uwierzytelnianie kodu PIN..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numer poczty głosowej"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Wybieranie"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Ponawianie próby"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Poł. konferencyjne"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Połączenie"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Oczekujące połączenie CDMA"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Połączenie zakończone"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Oczekujące"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Trwa rozłączanie"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Połączenia nieodebrane"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> nieodebranych połączeń"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Nieodebrane połączenie z <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Bieżące połączenie (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Trwa połączenie"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Oczekujące"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Połączenie przychodzące"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nowa poczta głosowa"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nieznany numer poczty głosowej"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Brak usługi"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Wybrana sieć (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) jest niedostępna"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Rozłącz"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Oddzwoń"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Wiadomość"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Aby rozpocząć połączenie, wyłącz najpierw tryb samolotowy"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Nie zarejestrowano w sieci"</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Sieć komórkowa jest niedostępna."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Połączenie niezrealizowane, nie wprowadzono poprawnego numeru."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Połączenie nie zostało zrealizowane."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Rozpoczynanie sekwencji MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Trwa rozpoczynanie sekwencji kodu funkcji…"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nieobsługiwana usługa."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Nie można przełączyć rozmów."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Nie można rozdzielić połączenia."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Połączenie alarmowe"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Trwa włączanie sieci bezprzewodowych..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Obszar nieobsługiwany, ponowna próba..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Połączenie niezrealizowane, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nie jest numerem alarmowym!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Połączenie niezrealizowane, należy wybrać numer alarmowy!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Połączenie niezrealizowane. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nie jest numerem alarmowym!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Połączenie niezrealizowane. Wybierz numer alarmowy!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Aby zadzwonić, użyj klawiatury."</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Dotknij klawiatury"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Wstrzymaj"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Wznów"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Zakończ"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Panel numeryczny"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Ukryj"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Głośnik"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Wycisz"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Dodaj połączenie"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Scal połączenia"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Przełącz"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Tekst ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Tony DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Tony DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Ustaw długość tonów DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normalne"</item>
     <item msgid="2883365539347850535">"Długie"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Komunikat sieciowy"</string>
+    <string name="network_message" msgid="4483886461245213802">"Komunikat sieciowy"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktywuj telefon"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Aby aktywować usługę telekomunikacyjną, należy wykonać połączenie specjalne. "\n\n"Po naciśnięciu przycisku „Aktywuj” posłuchaj dostępnych instrukcji, aby aktywować telefon."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Dotknij opcji „Aktywuj”, aby wykonać specjalne połączenie aktywujące telefon w sieci komórkowej operatora. To umożliwi wykonywanie połączeń i łączenie się z komórkowymi sieciami transmisji danych."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Pominąć aktywację?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Jeśli pominiesz aktywację, nie będzie można wykonywać połączeń ani łączyć się z komórkowymi sieciami transmisji danych (łączenie się z sieciami Wi-Fi będzie jednak możliwe). Do momentu dokonania aktywacji odpowiedni monit będzie wyświetlany po każdym włączeniu telefonu."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Pomiń"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktywuj"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktywuj"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Telefon został aktywowany."</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefon został aktywowany."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problem z aktywacją"</string>
     <string name="ota_listen" msgid="162923839877584937">"Postępuj zgodnie z instrukcjami głosowymi, aż usłyszysz informację, że aktywacja została ukończona."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Klawiatura"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Głośnik"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Czekaj, aż programowanie telefonu zostanie zakończone."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programowanie nie powiodło się"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Czekaj, aż programowanie telefonu zostanie zakończone."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programowanie nie powiodło się"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Telefon został aktywowany. Uruchomienie usługi może potrwać do 15 minut."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Telefon nie został aktywowany. "\n"Być może należy przejść do miejsca, w którym sygnał sieci jest silniejszy (w pobliżu okna lub na zewnątrz budynku). "\n\n"Spróbuj ponownie lub zadzwoń do działu obsługi klienta, aby uzyskać więcej informacji."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Telefon nie został aktywowany. "\n"Być może należy przejść do miejsca, w którym sygnał sieci jest silniejszy (w pobliżu okna lub na zewnątrz budynku). "\n\n"Spróbuj ponownie lub zadzwoń do działu obsługi klienta, aby uzyskać więcej informacji."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"NADMIERNA LICZBA NIEPOWODZEŃ SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Wstecz"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Spróbuj ponownie"</string>
     <string name="ota_next" msgid="3904945374358235910">"Dalej"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Wstecz"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Włączono tryb alarmowego połączenia zwrotnego"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Tryb alarmowego połączenia zwrotnego"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"Brak połączenia transmisji danych przez <xliff:g id="COUNT">%s</xliff:g> min"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Telefon będzie w trybie alarmowego połączenia zwrotnego przez <xliff:g id="COUNT">%s</xliff:g> min. W tym trybie nie można używać aplikacji korzystających z połączenia transmisji danych. Czy chcesz teraz zakończyć?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Telefon będzie w trybie alarmowego połączenia zwrotnego przez <xliff:g id="COUNT">%s</xliff:g> min. W tym trybie nie można używać aplikacji korzystających z połączenia transmisji danych. Czy chcesz teraz zakończyć?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Telefon będzie w trybie alarmowym połączenia zwrotnego przez <xliff:g id="COUNT">%s</xliff:g> minutę. W tym trybie nie można korzystać z aplikacji używających połączeń danych. Czy chcesz teraz wyjść?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Telefon będzie w trybie alarmowym połączenia zwrotnego przez <xliff:g id="COUNT">%s</xliff:g> min. W tym trybie nie można korzystać z aplikacji używających połączeń danych. Czy chcesz teraz wyjść?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Wybrana akcja jest niedostępna w trybie alarmowego połączenia zwrotnego. Telefon będzie w tym trybie przez <xliff:g id="COUNT">%s</xliff:g> min. Czy chcesz teraz zakończyć?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Wybrana akcja jest niedostępna w trybie alarmowego połączenia zwrotnego. Telefon będzie w tym trybie przez <xliff:g id="COUNT">%s</xliff:g> min. Czy chcesz teraz zakończyć?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Wybrana akcja nie jest dostępna w trybie alarmowym połączenia zwrotnego. Telefon będzie w tym trybie <xliff:g id="COUNT">%s</xliff:g> min. Czy chcesz teraz wyjść?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Wybrana akcja nie jest dostępna w trybie alarmowym połączenia zwrotnego. Telefon będzie w tym trybie <xliff:g id="COUNT">%s</xliff:g> min. Czy chcesz teraz wyjść?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Wybrana akcja jest niedostępna przy nawiązanym połączeniu alarmowym"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Kończenie trybu alarmowego połączenia zwrotnego"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Wybrana akcja jest niedostępna przy nawiązanym połączeniu alarmowym."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Kończenie trybu alarmowego połączenia zwrotnego"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Tak"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Nie"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Zamknij"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Ustawienia poczty głosowej"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;nie ustawiono&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Usługa poczty głosowej"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Ustawienia dla <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Usługa"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Konfiguracja"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nie ustawiono&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Inne ustawienia połączeń"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Wybierz numer"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Połączenie za pośrednictwem operatora ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Przeciągnij w prawo, aby odebrać"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Przeciągnij w lewo, aby wyciszyć dzwonek"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Przeciągnij w lewo, aby odrzucić"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Przeciągnij w prawo, aby odebrać"\n"i zawiesić aktywne połączenie"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Przeciągnij w prawo, aby odebrać"\n"i zakończyć aktywne połączenie"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Przeciągnij w prawo, aby odebrać"\n"i zakończyć zawieszone połączenie"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Odbierz"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Odrzuć"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Nawiązywanie połączenia przez <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"zdjęcie kontaktu"</string>
     <string name="goPrivate" msgid="865837794424530980">"przejdź do rozmowy prywatnej"</string>
     <string name="selectContact" msgid="781975788478987237">"wybierz kontakt"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Dzwonienie przez internet"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Konta do połączeń SIP"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Konta"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Zarządzaj kontami do połączeń przez internet (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Odbieraj przychodzące"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Powoduje skrócenie czasu pracy baterii"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Konfiguruj opcje połączenia"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Dzwoń przez internet"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Dzwoń przez internet (tylko Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Wszystkie połączenia, gdy transmisja danych jest dostępna"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Tylko internetowe"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Pytaj przy każdym połączeniu"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Wszystkie połączenia"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Automatyczna rejestracja"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Połączenie wychodzące przez SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Zadzwoń"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Użyj konta do dzwonienia przez internet:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Zawsze używaj do połączeń przez internet"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"W Ustawieniach połączeń możesz zmienić konto połączeń przez internet, które będzie domyślnie używane przy nawiązywaniu połączeń, wybierając inne konto w sekcji Ustawienia połączeń przez internet"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Możesz zmienić konto używane domyślnie do dzwonienia przez internet na ekranie Telefon &gt; Ustawienia &gt; Dzwonienie przez internet &gt; Konta."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Komórkowe połączenie telefoniczne"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Połączenie przez internet"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Brak konta do połączeń przez internet"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"W tym telefonie nie ma kont do połączeń przez internet. Czy dodać teraz takie konto?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Na tym telefonie nie ma jeszcze kont do dzwonienia przez internet. Czy chcesz dodać takie konto teraz?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Dodaj"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Dodaj konto"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Usuń konto"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Konta SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Trwa zapisywanie konta..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Trwa usuwanie konta..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Trwa zapisywanie konta..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Trwa usuwanie konta..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Zapisz"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Odrzuć"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Zamknij profil"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Zamknij"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Podstawowe"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Ustaw jako konto podstawowe"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Używane do połączeń wychodzących"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Ustawienia zaawansowane"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Konto podstawowe. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Sprawdzanie stanu..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Rejestrowanie..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Kontynuowanie prób..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Połączenia nie są odbierane"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Rejestracja konta została zatrzymana, ponieważ brak połączenia internetowego"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Rejestracja konta została zatrzymana, ponieważ brak jest połączenia Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Rejestracja konta zakończona niepowodzeniem"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Odbieranie połączeń"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Rejestrowanie..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Nadal próbuje..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Połączenia nie są odbierane."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Rejestracja konta została zatrzymana, ponieważ brak połączenia internetowego."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Rejestracja konta została zatrzymana, ponieważ brak jest połączenia Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Rejestracja konta zakończyła się niepowodzeniem."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Odbieranie połączeń."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Rejestracja konta zakończona niepowodzeniem: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); próba zostanie podjęta później"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Rejestracja konta zakończona niepowodzeniem: nieprawidłowa nazwa użytkownika lub hasło"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Rejestracja konta zakończona niepowodzeniem: sprawdź nazwę serwera"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"To konto jest obecnie używane przez aplikację <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Rejestracja konta zakończyła się niepowodzeniem: nieprawidłowa nazwa użytkownika lub hasło."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Rejestracja konta zakończyła się niepowodzeniem: sprawdź nazwę serwera."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"To konto jest obecnie używane przez aplikację <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Szczegóły konta SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Szczegóły konta SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Serwer"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Numer portu"</string>
     <string name="transport_title" msgid="8253139511847746640">"Typ transportu"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Utrzymuj połączenie"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Wysyłaj komunikaty o utrzymaniu połączeń SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Automatyczna rejestracja"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Zarejestruj profil automatycznie"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Konto podstawowe"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Używane do połączeń wychodzących"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Ustawienia opcjonalne"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Opcjonalnie&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Dotknij, aby wyświetlić wszystko"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Dotknij, aby ukryć wszystko"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"Pole <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> jest wymagane i nie może pozostać puste"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Numer portu powinien mieć wartość od 1000 do 65 534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Pole <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> jest wymagane i nie może pozostać puste."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Numer portu powinien mieć wartość od 1000 do 65 534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Brak połączenia internetowego"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Brak połączenia Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Aby nawiązać połączenie przez internet, sprawdź najpierw połączenie internetowe"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Połączenia przez internet wymagają nawiązania połączenia z siecią Wi-Fi (użyj ustawień sieci zwykłych i bezprzewodowych)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Aby zadzwonić przez internet, sprawdź najpierw połączenie internetowe."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"By dzwonić przez internet, musisz nawiązać połączenie z siecią Wi-Fi (użyj ustawień sieci zwykłych i bezprzewodowych)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Brak obsługi połączeń przez internet"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automatycznie"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Zawsze wysyłaj"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Za chwilę do Ciebie oddzwonię."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Zadzwonię do Ciebie później."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Nie mogę rozmawiać. Zadzwonisz później?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Wiadomość niestandardowa"</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Wiadomość niestandardowa"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Szybkie odpowiedzi"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Edytuj szybkie odpowiedzi"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"gwiazdka"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"znak funta"</string>
-    <string name="description_search_button" msgid="239929880630534731">"szukaj"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"wybierz numer"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"cofnij"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Głośnik włączony."</string>
@@ -715,9 +615,16 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Odrzuć"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Wibracje"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Wibracje"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Dzwonek"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Zawsze"</item>
     <item msgid="1595097872875714252">"Tylko po wyciszeniu"</item>
     <item msgid="1458182414036878616">"Nigdy"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Dzwonek telefonu"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Wibracje i dzwonek"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Dźwięki wybierania numeru"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Dzwonek"</string>
+    <string name="perm_change_mobile_network">Zmień sieć (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Aplikacja ma możliwość przełącania się między siecią 2G i 3G. 3G jest szybsze, ale zużywa szybciej baterię.</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e6613b46a..b6ca1d2be 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Número particular"</string>
     <string name="payphone" msgid="1931775086311769314">"Telefone público"</string>
     <string name="onHold" msgid="9035493194749959955">"Em espera"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Chamada actual"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Linha ocupada"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Rede ocupada"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Sem resposta, tempo limite excedido"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Servidor inacessível"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Número incontactável"</string>
-    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nome de utilizador ou palavra-passe incorretos"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Chamada efetuada de fora da rede"</string>
+    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nome de utilizador ou palavra-passe incorrectos"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Chamada efectuada de fora da rede"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Erro do servidor. Tente novamente mais tarde."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Sem sinal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Limite de ACM excedido"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Rádio desactivado"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Sem cartão SIM ou erro do cartão"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Sem cartão SIM ou erro do cartão"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Fora da área do serviço"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"As chamadas efectuadas são restringidas por FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Não é possível efectuar chamadas com o barramento de chamadas activado."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Não é possível efectuar chamadas com o barramento de chamadas activado."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Todas as chamadas são restringidas por controlo de acesso."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"As chamadas de emergência são restringidas por controlo de acesso."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"As chamadas normais são restringidas por controlo de acesso."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: telefone bloqueado até ao ciclo de energia."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: a chamada caiu."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: chamada interceptada."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: reordenar."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Rejeitar Opção de Serviço."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: pedido de nova tentativa."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Acesso sem êxito."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: impedido."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Apenas podem ser efectuadas chamadas de Emergência"</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Número inválido"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Número inválido"</string>
     <string name="confCall" msgid="1904840547188336828">"Chamada de conferência"</string>
     <string name="call_lost" msgid="317670617901479594">"A chamada perdeu-se."</string>
-    <string name="retry" msgid="8462986804300767852">"Tentar novamente"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Chamada perdida"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Código de MMI iniciado"</string>
     <string name="ussdRunning" msgid="485588686340541690">"A executar código USSD..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Auscultadores com fios"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Enviar os seguintes tons?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"A enviar tons"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"A enviar tons"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Enviar"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Sim"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Não"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Substituir o carácter universal por"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Substituir o carácter universal por"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Número do correio de voz em falta"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Não existe um número de correio de voz armazenado no cartão SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Adicionar número"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"A carregar..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Introduza o código PIN para desbloquear o cartão SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM desbloqueado"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Novo código PIN do cartão SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Introduza o novo código PIN do cartão SIM novamente para confirmar"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Os PINs do cartão SIM introduzidos não coincidem. Tente novamente."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Introduza o código PUK para desbloquear o cartão SIM"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Código PUK incorrecto!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Continuar"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"O cartão SIM foi desbloqueado. O telefone está a ser desbloqueado..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN para desbloqueio de rede do cartão SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Desbloquear"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"A pedir desbloqueio de rede..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"O pedido de desbloqueio de rede falhou."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Desbloqueio de rede bem sucedido."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Definições de chamadas GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Definições de chamada CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Nomes dos pontos de acesso"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Definições adicionais de chamadas apenas CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Definições do serviço de rede"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"ID do autor da chamada"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"A carregar as definições..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Ocultar o número em chamadas efectuadas"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Número apresentado em chamadas efectuadas"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Utilizar as predefinições do operador para apresentar o meu número nas chamadas efectuadas"</string>
@@ -122,22 +100,22 @@
     <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"A reencaminhar todas as chamadas"</string>
     <string name="sum_cfu_enabled" msgid="2450052502198827927">"A encaminhar todas as chamadas para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"O número está indisponível"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Desativado"</string>
+    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Desactivado"</string>
     <string name="labelCFB" msgid="218938523102207587">"Reencaminhar quando ocupado"</string>
     <string name="messageCFB" msgid="3711089705936187129">"Número no caso de estar ocupado"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"A encaminhar para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
-    <string name="sum_cfb_disabled" msgid="227440009979537651">"Desativado"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"O seu operador não suporta a desactivação do reencaminhamento de chamadas quando o telefone está ocupado."</string>
+    <string name="sum_cfb_disabled" msgid="227440009979537651">"Desactivado"</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"O seu operador não suporta a desactivação do reencaminhamento de chamadas quando o telemóvel está ocupado."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Reencaminhar quando não atende"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Número no caso de não atender"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"A encaminhar para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
-    <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Desativado"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"O seu operador não suporta a desactivação do reencaminhamento de chamadas quando o telefone não atende."</string>
+    <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Desactivado"</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"O operador não suporta a desactivação do reencaminhamento de chamadas quando o telemóvel não atende."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Reencaminhar quando está inacessível"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Número no caso de estar inacessível"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"A encaminhar para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
-    <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Desativado"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"O seu operador não suporta a desactivação do reencaminhamento de chamadas quando o telefone não está acessível."</string>
+    <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Desactivado"</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"O seu operador não suporta a desactivação do reencaminhamento de chamadas quando o telemóvel não está acessível."</string>
     <string name="updating_title" msgid="6146755386174019046">"Definições de chamadas"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Erro nas definições de chamada"</string>
     <string name="reading_settings" msgid="1920291699287055284">"A ler as definições..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"A reverter as definições…"</string>
     <string name="response_error" msgid="6674110501330139405">"Resposta inesperada da rede."</string>
     <string name="exception_error" msgid="7027667130619518211">"Erro do cartão SIM ou da rede."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Apenas são autorizadas operações para números fixos autorizados"</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Active o rádio antes de visualizar estas definições."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"A definição Números Autorizados da aplicação do seu Telemóvel está activada. Por conseguinte, algumas funcionalidades relacionadas com chamadas não estão a funcionar."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Active o rádio antes de visualizar estas definições."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Activar"</string>
     <string name="disable" msgid="7274240979164762320">"Desactivar"</string>
@@ -156,11 +134,10 @@
     <item msgid="7876195870037833661">"Ocultar número"</item>
     <item msgid="1108394741608734023">"Mostrar número"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Guardar o número do correio de voz"</string>
     <string name="vm_changed" msgid="380744030726254139">"O número do correio de voz foi alterado."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"A alteração do número de correio de voz falhou."\n"Contacte o seu operador se este problema persistir."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"A alteração do número de reencaminhamento falhou."\n"Contacte o seu operador se este problema persistir."</string>
-    <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Não foi possível obter nem guardar as definições do número de encaminhamento atual."\n"Mudar para o novo fornecedor mesmo assim?"</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Não foi possível alterar o número de correio de voz. "\n" Contacte o seu operador se este problema persistir."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Não foi possível alterar o número de encaminhamento. "\n" Contacte o seu operador se este problema persistir."</string>
+    <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Não foi possível obter nem guardar as definições do número de encaminhamento actual."\n"Mudar para o novo fornecedor mesmo assim?"</string>
     <string name="no_change" msgid="3186040086622435212">"Não foram efectuadas alterações."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Escolha o serviço de correio de voz"</string>
     <string name="voicemail_default" msgid="5902099213882352338">"O meu operador"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Procurar redes"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Erro ao procurar redes."</string>
     <string name="register_on_network" msgid="9055203954040805084">"A registar em <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"O cartão SIM não permite uma ligação a esta rede."</string>
-    <string name="connect_later" msgid="500090982903469816">"Não foi possível ligar a esta rede neste momento. Tente novamente mais tarde."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"O cartão SIM não permite uma ligação a esta rede."</string>
+    <string name="connect_later" msgid="2308119155752343975">"De momento, não é possível estabelecer ligação com esta rede. Tente novamente mais tarde."</string>
     <string name="registration_done" msgid="495135664535876612">"Registado na rede."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Seleccione um operador de rede"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Escolher um operador de rede"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Procurar todas as redes disponíveis"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Seleccionar automaticamente"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Seleccionar rede preferida automaticamente"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Registo automático..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Seleccionar automaticamente"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Seleccionar rede preferida automaticamente"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Registo automático..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Modo de rede"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Alterar o modo de funcionamento em rede"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Modo de rede preferido"</string>
@@ -192,30 +169,29 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Modo de rede preferido: apenas EvDO"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modo de rede preferido: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Apenas EvDo"</item>
     <item msgid="454610224530856274">"CDMA sem EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo automático"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA automático"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo automático"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA automático"</item>
     <item msgid="5189164180446264504">"Apenas WCDMA"</item>
     <item msgid="5714714953966979187">"Apenas GSM"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA preferido"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA preferido"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Dados activados"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Activar acesso a dados através de rede móvel"</string>
+    <string name="data_enable_summary" msgid="5022018967714633874">"Activar acesso a dados através da rede móvel"</string>
     <string name="roaming" msgid="8871412572928323707">"Roaming de dados"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Ligar a serviços de dados em roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Ligar a serviços de dados em roaming"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"A ligação de dados foi perdida porque saiu do alcance da sua rede e o roaming de dados estava desactivado."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"A conectividade de dados foi perdida porque saiu do alcance da sua rede e o roaming de dados estava desactivado."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Permitir roaming de dados? Os encargos de roaming podem ser significativos!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Opções GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Opções CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Utilização de dados"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Política de dados do operador"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Dados utilizados no período actual"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Período de utilização de dados"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Política de classificação de dados"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ do ciclo decorrido"\n"O período seguinte tem início dentro de <xliff:g id="USED_1">%2$d</xliff:g> dias (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Velocidade de transmissão de dados reduzida para <xliff:g id="USED">%1$d</xliff:g> Kb/s se o limite de utilização de dados for excedido"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Mais informações sobre a política de utilização de dados da rede móvel do seu operador."</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Transmissão Celular SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Transmissão Celular SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Transmissão Celular SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Definições da Transmissão Celular SMS activada"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Coreano"</item>
     <item msgid="1933212028684529632">"Chinês"</item>
     <item msgid="1908428006803639064">"Hebraico"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Idiomas"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Informação Meteorológica Local"</string>
@@ -300,14 +266,14 @@
     <string name="advertisements_enable" msgid="2050305021264683786">"Anúncios activados"</string>
     <string name="advertisements_disable" msgid="8350985908788707935">"Anúncios desactivados"</string>
     <string name="enable_disable_stock_quotes" msgid="6397810445293533603">"Cotações de Acções"</string>
-    <string name="stock_quotes_enable" msgid="4384802470887170543">"Cotações de acções activadas"</string>
+    <string name="stock_quotes_enable" msgid="4384802470887170543">"Cotações de Acções activadas"</string>
     <string name="stock_quotes_disable" msgid="4781450084565594998">"Cotações de Acções desactivadas"</string>
     <string name="enable_disable_eo" msgid="4863043263443942494">"Oportunidades de Emprego"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Oportunidades de Emprego activadas"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Oportunidades de Emprego desactivadas"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Clínica, Saúde e Hospital"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Clínica, Saúde e Hospital activado"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Clínica, Saúde e Hospital desactivado"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Clínica, Saúde e Hospital"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Clínica, Saúde e Hospital activado"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Clínica, Saúde e Hospital desactivado"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Notícias de Tecnologia"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Notícias de Tecnologia activadas"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Notícias de Tecnologia desactivadas"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"Apenas WCDMA"</item>
     <item msgid="8776934131146642662">"Apenas GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA preferido)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Usar apenas redes 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Economiza bateria"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Seleccionar sistema"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Alterar o modo de roaming cdma"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Alterar o modo de roaming CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Seleccionar sistema"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Apenas redes domésticas"</item>
     <item msgid="1205664026446156265">"Automático"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Modo de Roaming CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Alterar o modo de roaming cdma"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Modo de roaming CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Apenas Redes Domésticas"</item>
-    <item msgid="8174642753290624634">"Redes Associadas"</item>
-    <item msgid="2241951431403168661">"Qualquer Rede"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Subscrição CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Preferência de Rede CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Ainda não implementado!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Preferências de rede CDMA"</string>
@@ -359,23 +307,13 @@
     <item msgid="6143696847467859795">"Apenas CDMA"</item>
     <item msgid="2683555124647197574">"Apenas EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Subscrição CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Alternar entre RUIM/SIM e NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"subscrição"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
   </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
-  </string-array>
-    <string name="cdma_activate_device" msgid="3793805892364814518">"Activar dispositivo"</string>
+     <string name="cdma_activate_device" msgid="3793805892364814518">"Activar dispositivo"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurar serviço de dados"</string>
     <string name="fdn" msgid="7878832555095183202">"Números de marcação fixa (FDN)"</string>
     <string name="manage_fdn_list" msgid="8777755791892122369">"Lista de números de marcação fixa (FDN)"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Gerir os números de marcação fixa"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Alterar o PIN de acesso aos números de marcação fixa"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Gerir a lista telefónica"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Privacidade de Voz"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Privacidade de voz"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Activar modo de privacidade optimizado"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Modo TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Activar modo TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Modo TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Definir modo TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Nova tentativa automática"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Activar modo de Nova tentativa Automática"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Nova tentativa automática"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Activar modo Nova tentativa automática"</string>
     <string name="menu_add" msgid="1882023737425114762">"Adicionar contacto"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Editar contacto"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Eliminar contacto"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Introduza o PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Introduzir PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Nome"</string>
     <string name="number" msgid="7905950798349903858">"Número"</string>
     <string name="save" msgid="4094274636321939086">"Guardar"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Eliminar números autorizados"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"A eliminar números autorizados..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Números autorizados eliminados."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Números autorizados não actualizados: o PIN introduzido está incorrecto."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"Números autorizados não actualizados: o número não pode ultrapassar os 20 dígitos."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Os números autorizados não foram actualizados porque introduziu um PIN incorrecto."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Os números autorizados não foram actualizados porque o número não pode exceder 20 dígitos."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Não foram actualizados os números autorizados. O PIN2 estava errado ou o número de telefone foi rejeitado."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"A ler a partir do cartão SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Sem contactos no cartão SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Seleccione os contactos a importar"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Para importar contactos do cartão SIM, desative o modo de avião."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Para importar contactos do cartão SIM, primeiro desactive o Modo de Avião."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Activar/desactivar o PIN do cartão SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Alterar o PIN do cartão SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN do SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"PIN antigo"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Novo PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Confirme o novo PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"O PIN antigo introduzido não está correcto. Tente novamente."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Os PINs introduzidos não coincidem. Tente novamente."</string>
+    <string name="badPin" msgid="8955102849303984935">"O PIN antigo introduzido não está correcto. Tente novamente."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Os PINs introduzidos não correspondem. Tente novamente."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Introduza um PIN com 4 a 8 números."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Desactivar o PIN do SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Activar o PIN do cartão SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Queira aguardar..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"PIN do cartão SIM activado"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN do cartão SIM desactivado"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"O PIN introduzido não estava correcto"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"PIN do cartão SIM alterado com sucesso"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN do SIM activado"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN do SIM desactivado"</string>
+    <string name="pin_failed" msgid="2298841192582192277">"O PIN introduzido não estava correcto."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"PIN do SIM alterado com sucesso"</string>
     <string name="puk_requested" msgid="3898394204193202803">"Palavra-passe incorrecta, o cartão SIM está bloqueado! É necessário o PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 antigo"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Novo PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Confirme o novo PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"O PUK2 introduzido não está correcto. Tente novamente."</string>
-    <string name="badPin2" msgid="515218795152422178">"O PIN2 antigo introduzido não está correcto. Tente novamente."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"O PIN2 introduzido não coincide. Tente novamente."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"O PUK2 introduzido não está correcto. Tente novamente."</string>
+    <string name="badPin2" msgid="1041576234483629991">"O PIN2 antigo introduzido não está correcto. Tente novamente."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Os PIN2 introduzidos não correspondem. Tente novamente."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Introduza um PIN2 com 4 a 8 números."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Introduza um PUK2 com 8 números."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 alterado com sucesso"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 alterado com sucesso."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Introduza o código PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Palavra-passe incorrecta. Altere o PIN2 e tente novamente!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Palavra-passe incorrecta, o SIM está bloqueado! É necessário o PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Palavra-passe incorreta. Altere o PIN2 e tente novamente!"</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Palavra-passe incorreta, o SIM está bloqueado! É necessário o PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Concluído"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Chamada de conferência <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Voltar à chamada"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Continuar sem o cartão SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Cartão SIM não encontrado. Insira um cartão SIM no telefone."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Ignorar"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Desbloquear"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"A autenticar o PIN..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número do correio de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"A marcar"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Tentar novamente"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Chamada de conferência"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Chamada recebida"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Chamada Cdma em espera"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Chamada terminada"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Em espera"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"A desligar"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chamadas não atendidas"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> chamadas não atendidas"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Chamada não atendida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Chamada actual (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Chamada em curso"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Em espera"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Chamada recebida"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Novo correio de voz"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número do correio de voz desconhecido"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Nenhum serviço"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Rede selecionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) indisponível"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Desligar"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Ligar de volta"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensagem"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Para efectuar uma chamada, desactive primeiro o modo para Avião."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Sem registo na rede."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Rede móvel não disponível."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"A chamada não foi efetuada. Não foi introduzido um número válido."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Chamada não efetuada."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"A iniciar sequência de MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"A iniciar a sequência do código da funcionalidade"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Serviço não suportado"</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Não é possível alternar entre chamadas"</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Não foi possível separar a chamada."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Chamada de emergência"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"A ligar o rádio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Fora da área do serviço, a tentar novamente..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"A chamada não foi efetuada, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> não é um número de emergência!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Chamada não efetuada. Marque um número de emergência!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"A chamada não foi efetuada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> não é um número de emergência!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Chamada não efetuada. Marque um número de emergência!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilizar o teclado para marcar"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Teclado numérico por tons"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Suspender"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Retomar"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Terminar"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Teclado de marcação"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Ocultar"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Altifalante"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Desactivar som"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Adicionar chamada"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Intercalar chamadas"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Trocar"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Texto ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Tons DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Tons DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Definir o tamanho dos toques DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Longo"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Mensagem de Rede"</string>
+    <string name="network_message" msgid="4483886461245213802">"Mensagem de rede"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activar o seu telefone"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"É necessário efectuar uma chamada especial para activar o seu serviço telefónico. "\n\n"Depois de premir “Activar”, ouça as instruções fornecidas para activar o telefone."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Toque em \"Activar\" para fazer uma chamada especial que activa o seu telefone na rede móvel da sua operadora, para que possa fazer chamadas e estabelecer ligação a redes móveis de dados."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Ignorar activação?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Se ignorar a activação, não poderá fazer chamadas nem estabelecer ligação a redes móveis de dados (apesar de poder estabelecer ligação a redes Wi-Fi). Enquanto não activar o telefone, ser-lhe-á solicitada activação sempre que ligar o telefone."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Ignorar"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Activar"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Activar"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"O telefone está activado!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"O telemóvel está activado!"</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problema com a activação"</string>
     <string name="ota_listen" msgid="162923839877584937">"Siga as instruções de voz até ser informado de que a activação está concluída."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Teclado"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Altifalante"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Aguarde enquanto o seu telefone está a ser programado."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programação sem sucesso"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Aguarde enquanto o telemóvel está a ser programado."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programação sem sucesso"</string>
     <string name="ota_successful" msgid="1880780692887077407">"O seu telefone já está activado. O início do serviço pode demorar até 15 minutos."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"O seu telefone não foi activado. "\n"Pode ser necessário procurar uma zona com melhor cobertura (junto a uma janela ou no exterior). "\n\n"Tente novamente ou ligue para o serviço de apoio ao cliente para obter mais opções."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"O seu telemóvel não foi activado. "\n"Pode ser necessário procurar uma zona com melhor cobertura (junto a uma janela ou no exterior). "\n\n"Tente novamente ou ligue para o serviço de apoio ao cliente para obter mais opções."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"FALHAS NO EXCESS SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Anterior"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Tente novamente"</string>
     <string name="ota_next" msgid="3904945374358235910">"Seguinte"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Anterior"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Entrou em Modo de Chamada de Retorno de Emergência"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Modo de Chamada de Retorno de Emergência"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"Sem ligação de dados durante <xliff:g id="COUNT">%s</xliff:g> minutos"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"O telefone ficará no modo de chamada de retorno de emergência durante <xliff:g id="COUNT">%s</xliff:g> minuto. Enquanto estiver neste modo, não é possível utilizar aplicações que utilizem uma ligação de dados. Pretende sair agora?"</item>
-    <item quantity="other" msgid="3231879566243957821">"O telefone ficará no modo de chamada de retorno de emergência durante <xliff:g id="COUNT">%s</xliff:g> minutos. Enquanto estiver neste modo, não é possível utilizar aplicações que utilizem uma ligação de dados. Pretende sair agora?"</item>
+    <item quantity="one" msgid="8060210887681426682">"O telemóvel ficará no modo de Chamada de Retorno de Emergência durante <xliff:g id="COUNT">%s</xliff:g> minuto. Enquanto estiver neste modo, não é possível utilizar aplicações que utilizem uma ligação de dados. Pretende sair agora?"</item>
+    <item quantity="other" msgid="8617116564023933114">"O telemóvel ficará no modo de Chamada de Retorno de Emergência durante <xliff:g id="COUNT">%s</xliff:g> minutos. Enquanto estiver neste modo, não é possível utilizar aplicações que utilizem uma ligação de dados. Pretende sair agora?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"A acção selecionada não está disponível no modo de chamada de retorno de emergência. O telefone permanecerá neste modo durante <xliff:g id="COUNT">%s</xliff:g> minuto. Pretende sair agora?"</item>
-    <item quantity="other" msgid="3489076611710869904">"A acção selecionada não está disponível no modo de chamada de retorno de emergência. O telefone permanecerá neste modo durante <xliff:g id="COUNT">%s</xliff:g> minutos. Pretende sair agora?"</item>
+    <item quantity="one" msgid="2585506997024726599">"A acção selecionada não está disponível no modo de Chamada de Retorno de Emergência. O telemóvel ficará neste modo durante <xliff:g id="COUNT">%s</xliff:g> minutos. Pretende sair agora?"</item>
+    <item quantity="other" msgid="6115622137771382224">"A acção selecionada não está disponível no modo de Chamada de Retorno de Emergência. O telemóvel ficará neste modo durante <xliff:g id="COUNT">%s</xliff:g> minutos. Pretende sair agora?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"A acção selecionada não está disponível durante uma chamada de emergência"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Sair do Modo de Chamada de Retorno de Emergência"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"A acção selecionada não está disponível durante uma chamada de emergência."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"A sair do modo de chamada de retorno de emergência"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Sim"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Não"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Ignorar"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Definições de correio de voz"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;não definido&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Serviço de correio de voz"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Definições para <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Serviço"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Configuração"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Não definido&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Outras definições de chamada"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Marcar"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"A ligar através de ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Arraste para a direita para atender"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Arraste para a esquerda para silenciar a campainha"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Arraste para a esquerda para recusar"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Arraste para a direita para atender e"\n"colocar a chamada activa em espera"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Arraste para a direita para atender e"\n"terminar a chamada activa"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Arraste para a direita para atender e"\n"terminar a chamada em espera"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Atender"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Recusar"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"A chamar através de <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"fotografia do contacto"</string>
     <string name="goPrivate" msgid="865837794424530980">"tornar privado"</string>
     <string name="selectContact" msgid="781975788478987237">"seleccionar contacto"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Definições de chamadas por internet"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Contas de chamadas por internet (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Contas"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Gerir contas e estado das chamadas por internet (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Obter chamadas recebidas"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Reduz a vida útil da bateria"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Configurar opções de chamadas"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Utilizar chamadas por internet"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Utilizar chamadas pela internet (apenas Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Para todas as chamadas quando a rede de dados estiver disponível"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Apenas para chamadas pela internet"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Perguntar em cada chamada"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Para todas as chamadas"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Registo automático"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Chamada efetuada via SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Fazer chamada"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Utilizar conta de chamadas pela internet:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Utilizar sempre para fazer chamadas pela internet"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Pode usar as Definições de chamadas para alterar a conta de chamadas por internet a utilizar por predefinição ao fazer chamadas, seleccionando uma conta diferente em Definições de chamadas por internet"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Pode alterar a conta de chamadas por internet a utilizar por predefinição a partir do ecrã Telemóvel &gt; Definições &gt; Definições de chamadas por internet &gt; Contas."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Chamada por telemóvel"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Chamada por internet"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Sem conta de chamadas pela internet"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Não há contas de chamadas por internet neste telemóvel. Adicionar uma agora?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Não há contas de chamadas por internet neste telemóvel. Pretende adicionar uma agora?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Adicionar"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Adicionar conta"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Remover conta"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Contas SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"A guardar conta..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"A remover conta..."</string>
+    <string name="saving_account" msgid="52903398217017954">"A guardar conta..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"A remover conta..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Guardar"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Rejeitar"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Feche o perfil"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Fechar"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Principal"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Fazer desta a minha conta principal"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Utilizado para chamadas enviadas"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Definições avançadas"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Conta principal: <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"A verificar o estado..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"A registar..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Continuamos a tentar..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Não está a receber chamadas"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"O registo da conta parou porque não existe ligação à internet"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"O registo da conta parou porque não existe ligação Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"O registo da conta não teve êxito"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"A receber chamadas"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"A registar..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Ainda a tentar..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Não está a receber chamadas."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"O registo da conta parou porque não existe ligação à internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"O registo da conta parou porque não existe ligação Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"O registo da conta não teve êxito."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"A receber chamadas."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"O registo da conta não teve êxito (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); tentaremos mas tarde"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"O registo da conta não teve êxito: palavra-passe ou nome de utilizador incorreto"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"O registo da conta não teve êxito: verifique o nome do servidor"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Esta conta está actualmente a ser utilizada pela aplicação <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"O registo da conta não teve êxito: palavra-passe ou nome de utilizador incorrecto"</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"O registo da conta não teve êxito: verifique o nome do servidor"</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Esta conta está actualmente a ser utilizada pela aplicação <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Detalhes da conta SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Detalhes da conta SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Servidor"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Número da porta"</string>
     <string name="transport_title" msgid="8253139511847746640">"Tipo de transporte"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Enviar mensagem keep-alive"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Enviar mensagens keep-alive SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Registo automático"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Registar o perfil automaticamente"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Definir como conta principal"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Utilizado para chamadas enviadas"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Definições opcionais"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Opcional&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Toque para mostrar tudo"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Toque para ocultar tudo"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> é obrigatório e tem de ser preenchido"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"O número da porta deve estar entre 1000 e 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> é obrigatório e tem de ser preenchido."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"O número da porta devia estar entre 1000 e 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Sem ligação à internet"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Sem ligação Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Para fazer uma chamada por internet, verifique primeiro a ligação à internet"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Para fazer chamadas por internet é preciso estar ligado a uma rede Wi-Fi (use as definições de redes sem fios)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Para fazer uma chamada por internet, verifique primeiro a ligação à internet."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Para fazer chamadas por internet, é preciso estar ligado a uma rede Wi-Fi (use as definições de Redes sem fios e outras redes)"</string>
     <string name="no_voip" msgid="8901474054537199865">"As cham. por internet não são suportadas"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automático"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Enviar sempre"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Telefono-lhe já a seguir."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Telefono-lhe mais tarde."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Pode telefonar-me mais tarde?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Mensagem personalizada..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Mensagem personalizada"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respostas rápidas"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editar respostas rápidas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,19 +606,66 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"estrela"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"cardinal"</string>
-    <string name="description_search_button" msgid="239929880630534731">"pesquisar"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"marcar"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"retrocesso"</string>
-    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Alta voz ativada."</string>
+    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Alta voz activada."</string>
     <string name="accessibility_call_muted" msgid="2776111226185342220">"Chamada sem som."</string>
     <string name="description_target_answer" msgid="7205604197797472471">"Atender"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Enviar SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Recusar"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Toque"</string>
+
+    <!-- Advanced Settings -->
+    <string name="advanced_setting">Ajustes Avançados</string>
+    <string name="vibrate_outgoing">Vibrar ao atender</string>
+    <string name="vibrate_outgoing_sum">Vibra quando a ligação for atendida</string>
+    <string name="vibrate_45">Vibrar a cada 45 segundos</string>
+    <string name="vibrate_45_sum">Vibrar aos 45 segundos de cada minuto durante chamada efectuada</string>
+    <string name="vibrate_hangup">Vibrar ao desligar</string>
+    <string name="vibrate_hangup_sum">Vibra quando encerra a ligação</string>
+    <string name="vibrate_call_waiting">Vibrar c/ chamada em espera</string>
+    <string name="vibrate_call_waiting_sum">Vibra com ligação em espera</string>
+   <!-- End Advanced Settings -->
+    
+    <!-- Voice quality filter -->
+    <string name="voice_quality_preferences_title">Qualidade de voz</string>
+    <string name="voice_quality_summary">Ajuste um perfil para melhorar a qualidade da ligação</string>
+    <!-- Do not remove those, they're used from overlays -->
+    <string name="voice_quality_entry_normal">Normal</string>
+    <string name="voice_quality_entry_clear">Limpa</string>
+    <string name="voice_quality_entry_crisp">Nítida</string>
+    <string name="voice_quality_entry_bright">Brilhante</string>
+
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Sempre"</item>
     <item msgid="1595097872875714252">"Apenas quando está em silêncio"</item>
     <item msgid="1458182414036878616">"Nunca"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Toque do telemóvel"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar ao tocar"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Sons dos toques no teclado de marcar"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Toque"</string>
+    <string name="perm_change_mobile_network">Alternar rede de dados (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">A aplicação está com permissões e pode a qualquer momento alternar entre dados 2G and 3G. 3G é mais rápido, consome mais bateria, e também pode gastar mais dinheiro.</string>
+    <string name="preferred_network_mode_lte_gsm_summary">Modo de rede preferencial: LTE / GSM/WCDMA</string>
+    <string name="dialer_ui_settings_title">Teclado</string>
+    <string name="dialer_ui_settings_summary">Configurações do teclado</string>
+    <string name="noise_suppression_title">Supressão do ruído</string>
+    <string name="noise_suppression_summary">Activar supressão de ruído em ligações</string>
+    <string name="mwi_notification_title">Indicador de Mensagem em Espera</string>
+    <string name="mwi_notification_summary">Exibir mensagem para indicador de notificações de mensagens de voz</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary">Modo de rede preferencial: LTE / CDMA / EvDo</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">Modo de rede preferencial: LTE / CDMA / EvDo / GSM / WCDMA</string>
+    <string name="phone_number_label">Meu número de telefone</string>
+    <string name="phone_number_summary">Definir o número de telefone para este dispositivo</string>
+    <string name="advanced_setting">Configuração avançada</string>
+    <string name="keep_proximity_sensor_on">Manter sensor de proximidade ligado</string>
+    <string name="keep_proximity_sensor_on_sum">Não desligar o sensor de proximidade durante as ligações utilizando um headset.</string>
+    <string name="lockscreen_if_call_ends_with_screenoff">Bloquear ao terminar chamada</string>
+    <string name="lockscreen_if_call_ends_with_screenoff_sum">Bloqueia automaticamente quando uma chamada termina e o ecrã está desligado</string>
+    <string name="national_roaming">Roaming de dados nacional</string>
+    <string name="national_roaming_enable">Conectar aos serviços de dados quando estiver em roaming nacional</string>
+    <string name="national_roaming_disable">Não conectar aos serviços de dados quando estiver em roaming nacional</string> 
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
old mode 100644
new mode 100755
index b833537ef..220d42eed
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Número privado"</string>
     <string name="payphone" msgid="1931775086311769314">"Orelhão"</string>
     <string name="onHold" msgid="9035493194749959955">"Em espera"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Chamada atual"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Linha ocupada"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Rede ocupada"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Nenhuma resposta, tempo limite expirou"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Servidor não acessível"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Número não acessível"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nome de usuário ou senha incorretos"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Chamou de fora da rede"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Chamou de fora da rede"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Erro no servidor. Tente mais tarde."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Sem sinal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Limite de ACM excedido"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Rádio desativado"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Sem SIM, ou erro de SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Sem SIM ou erro de SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Área fora de serviço"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"As chamadas enviadas são restringidas pelo FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Você não pode fazer chamadas enquanto o bloqueio de chamadas estiver ativado."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Você não pode fazer chamadas enquanto o bloqueio de chamadas estiver ativado."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Todas as chamada são restringidas pelo controle de acesso."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"As chamadas de emergência são restringidas pelo controle de acesso."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"As chamadas normais são restringidas pelo controle de acesso."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Telefone bloqueado até a conclusão do ciclo de energia."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Caiu a chamada."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Chamada interceptada."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: reordenar."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Rejeição de opção de serviço."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: ordem de repetição."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: falha no acesso."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Ocupado."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Somente as chamadas de emergência são permitidas."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Número inválido"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Número inválido"</string>
     <string name="confCall" msgid="1904840547188336828">"Conferência telefônica"</string>
     <string name="call_lost" msgid="317670617901479594">"A chamada foi perdida."</string>
-    <string name="retry" msgid="8462986804300767852">"Tentar novamente"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Chamada perdida"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Código MMI iniciado"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Código USSD em execução…"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Fone de ouvido com fio"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Enviar os toques a seguir?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Enviando tons"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Enviando tons"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Enviar"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Sim"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Não"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Substitua o caractere curinga por"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Substituir caractere curinga por"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Número correio de voz ausente"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Não há um número correio de voz armazenado no cartão SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Adicionar número"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Carregando..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Digite o código PIN para desbloquear o cartão SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM desbloqueado"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Novo código PIN do SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Digite novamente o novo código PIN do SIM para confirmar"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Os PINs do SIM digitados não correspondem. Tente novamente."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Digite o código PUK para desbloquear o cartão SIM."</string>
-    <string name="badPuk" msgid="3213017898690275965">"Código PUK incorreto!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Continuar"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"O seu cartão SIM foi desbloqueado. O seu telefone está desbloqueando…"</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN de desbloqueio da rede SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Desbloquear"</string>
@@ -93,11 +72,9 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Solicitando o desbloqueio de rede…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Falha na solicitação de desbloqueio de rede."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Desbloqueio de rede bem-sucedido."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Configurações de chamada GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Configurações de chamada CDMA"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Nomes ponto de acesso"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"Nomes dos pontos de acesso"</string>
     <string name="settings_label" msgid="3876743539816984008">"Configurações de rede"</string>
     <string name="voicemail" msgid="8693759337917898954">"Correio de voz"</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Configurações adicionais somente de chamada CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Configurações do serviço de rede"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"ID da chamada"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Carregando configurações…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Número oculto nas chamadas enviadas"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Número exibido nas chamadas enviadas"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Usar configurações padrão da operadora para exibir meu número em chamadas efetuadas"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Número quando ocupado"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Encaminhando para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Desativado"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"A sua operadora não suporta a desativação do encaminhamento de chamada quando o seu telefone estiver ocupado."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Sua operadora não suporta a desativação do encaminhamento de chamada quando seu telefone está ocupado."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Enc. se não atendido"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Número quando não atendido"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Encaminhando para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Desativado"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"A sua operadora não suporta a desativação do encaminhamento de chamada quando o seu telefone não responder."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Sua operadora não suporta a desativação do encaminhamento de chamada quando seu telefone não responde."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Enc. se não acessível"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Número quando não acessível"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Encaminhando para <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Desativado"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"A sua operadora não suporta a desativação do encaminhamento de chamada quando o seu telefone não estiver acessível."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Sua operadora não suporta a desativação do encaminhamento de chamada quando seu telefone não está acessível."</string>
     <string name="updating_title" msgid="6146755386174019046">"Configurações de chamadas"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Erro de configuração da chamada"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Lendo as configurações…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Revertendo configurações…"</string>
     <string name="response_error" msgid="6674110501330139405">"Resposta inesperada da rede."</string>
     <string name="exception_error" msgid="7027667130619518211">"Erro de rede ou do cartão SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"As operações são permitidas somente em números de chamadas fixas."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Ative o rádio antes de ver essas configurações."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"A configuração \"Números de chamada fixos\" do aplicativo de seu telefone está ativada. Por isso, alguns recursos relacionados a chamadas não funcionam."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Ligue o rádio antes de ver essas configurações."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Ativar"</string>
     <string name="disable" msgid="7274240979164762320">"Desativar"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Ocultar número"</item>
     <item msgid="1108394741608734023">"Mostrar número"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Salvar número correio de voz"</string>
     <string name="vm_changed" msgid="380744030726254139">"Número correio de voz alterado."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Falha na alteração do número correio de voz."\n"Entre em contato com a sua operadora se este problema continuar."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Falha na alteração do número de encaminhamento."\n"Entre em contato com a sua operadora se este problema continuar."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Não foi possível alterar o número do correio de voz."\n"Entre em contato com sua operadora se o problema persistir."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Não foi possível alterar o número de encaminhamento."\n"Entre em contato com sua operadora se o problema persistir."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Não foi possível recuperar e salvar as configurações de número atual de encaminhamento."\n"Mudar para o novo provedor?"</string>
     <string name="no_change" msgid="3186040086622435212">"Nenhuma alteração foi feita."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Escolha o serviço de correio de voz"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Pesquisar redes"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Erro ao pesquisar redes."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrando na <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"O seu cartão SIM não permite uma conexão com esta rede."</string>
-    <string name="connect_later" msgid="500090982903469816">"Não é possível conectar a esta rede no momento. Tente novamente mais tarde."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Seu cartão SIM não permite uma conexão com esta rede."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Não é possível se conectar a esta rede agora. Tente novamente mais tarde."</string>
     <string name="registration_done" msgid="495135664535876612">"Registrado na rede."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Selecione um operador de rede"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Selecione um operador de rede"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Pesquisar todas as redes disponíveis"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Selecionar automaticamente"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Selecionar automaticamente a rede preferida"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Registro automático..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Escolher automaticamente"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Escolher automaticamente a rede preferencial"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Registro automático..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Modo de rede"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Alterar o modo de operação de rede"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Modo de rede de preferência"</string>
@@ -192,30 +169,36 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Modo de rede preferencial: somente EvDO"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modo de rede preferencial: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"Somente EvDo"</item>
-    <item msgid="454610224530856274">"CDMA sem EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA/EvDo automático"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA automático"</item>
-    <item msgid="5189164180446264504">"Somente WCDMA"</item>
-    <item msgid="5714714953966979187">"Somente GSM"</item>
-    <item msgid="4775796025725908913">"GSM/WCDMA de preferência"</item>
+    <item>Global</item>
+    <item>Somente EvDo</item>
+    <item>CDMA sem EvDo</item>
+    <item>CDMA/EvDo automático</item>
+    <item>GSM/WCDMA automático</item>
+    <item>Somente WCDMA</item>
+    <item>Somente GSM</item>
+    <item>GSM/WCDMA de preferência</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
+    <item>Somente LTE</item>
+    <item>LTE/CMDA/EvDo/GSM/WCDMA</item>
+    <item>LTE/CDMA/EvDo</item>
+    <item>LTE/CDMA</item>
+    <item>CDMA/EvDo automático</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_lte_gsm">
+    <item>LTE/GSM/WCDMA</item>
+    <item>GSM/WCDMA de preferência</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Dados ativados"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"Ativar acesso a dados pela rede móvel"</string>
     <string name="roaming" msgid="8871412572928323707">"Roaming de dados"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Conectar aos serviços de dados quando estiver em roaming"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"Conectar aos serviços de dados quando estiver em roaming"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Você perdeu a conectividade de dados porque deixou o roaming de dados da sua rede doméstica desativado."</string>
+    <string name="roaming_disable">"Não conectar aos serviços de dados quando estiver em roaming"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Você perdeu a conectividade de dados porque deixou o roaming de dados de sua rede doméstica desativado."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Permitir roaming de dados? Isso pode causar cobranças significativas de roaming!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Opções GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Opções CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Uso de dados"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Política de dados da operadora"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Uso de dados no período atual"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Período de uso de dados"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Política de taxa de dados"</string>
@@ -226,7 +209,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ do ciclo expirou"\n"O próximo período começa em <xliff:g id="USED_1">%2$d</xliff:g> dias (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Taxa de dados reduzida para <xliff:g id="USED">%1$d</xliff:g> Kb/s se o limite de uso de dados for excedido"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Mais informações sobre a política de uso de dados da rede móvel da sua operadora"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS de difusão celular"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS de difusão celular"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS de difusão celular"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS de difusão celular ativado"</string>
@@ -267,15 +249,6 @@
     <item msgid="1858401628368130638">"Coreano"</item>
     <item msgid="1933212028684529632">"Chinês"</item>
     <item msgid="1908428006803639064">"Hebraico"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Idiomas"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Clima local"</string>
@@ -305,9 +278,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Oportunidades de emprego"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Oportunidades de emprego ativadas"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Oportunidades de emprego desativadas"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Serviços médicos, de saúde e hospitalares"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Serviços médicos, de saúde e hospitalares ativados"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Serviços médicos, de saúde e hospitalares desativados"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Serviços médicos, de saúde e hospitalares"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Serviços médicos, de saúde e hospitalares ativados"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Serviços médicos, de saúde e hospitalares desativados"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Notícias de tecnologia"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Notícias de tecnologia ativadas"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Notícias de tecnologia desativadas"</string>
@@ -322,35 +295,17 @@
     <item msgid="8912042051809329533">"Somente WCDMA"</item>
     <item msgid="8776934131146642662">"Somente GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA de preferência)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Usar apenas redes 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Economiza bateria"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Seleção de sistema"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Alterar o modo de roaming CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Alterar o modo de roaming CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selecionar sistema"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Somente doméstica"</item>
     <item msgid="1205664026446156265">"Automático"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Modo de roaming CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Alterar o modo de roaming CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Modo de roaming CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Somente redes domésticas"</item>
-    <item msgid="8174642753290624634">"Redes afiliadas"</item>
-    <item msgid="2241951431403168661">"Qualquer rede"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Inscrição CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Preferências de rede CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Ainda não implementado."</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Preferências de rede CDMA"</string>
@@ -359,21 +314,11 @@
     <item msgid="6143696847467859795">"Somente CDMA"</item>
     <item msgid="2683555124647197574">"Somente EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Inscrições CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Alterar entre RUIM/SIM e NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"inscrição"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Ativar aparelho"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configurar serviço de dados"</string>
@@ -390,18 +335,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Gerenciar números de chamadas fixas"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Alterar PIN para acesso FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Gerenciar lista de números telefônicos"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Privacidade de voz"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Privacidade de voz"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Ativar modo de privacidade aprimorado"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Modo TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Ativar modo TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Modo TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Definir modo TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Repetir automaticamente"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Ativar modo Repetir automaticamente"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Repetir automaticamente"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Ativar modo Repetir automaticamente"</string>
     <string name="menu_add" msgid="1882023737425114762">"Adicionar contato"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Editar contato"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Excluir contato"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Inserir PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Digitar PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Nome"</string>
     <string name="number" msgid="7905950798349903858">"Número"</string>
     <string name="save" msgid="4094274636321939086">"Salvar"</string>
@@ -414,56 +357,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Excluir número de chamadas fixas"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Excluindo número de chamadas fixas…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Número de chamadas fixas excluído."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN não atualizado: você digitou um PIN incorreto."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN não atualizado: o número não pode exceder 20 dígitos."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"O FDN não foi atualizado porque você digitou um PIN incorreto."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"O FDN não foi atualizado porque o número não pode exceder 20 dígitos."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"O FDN não foi atualizado. O PIN2 estava incorreto, ou o número de telefone foi rejeitado."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Lendo a partir do cartão SIM…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Não há contatos no seu cartão SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Selecione os contatos a serem importados"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Para importar contatos do cartão SIM, desative o modo para avião."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Para importar os contatos do cartão SIM, primeiro desligue o modo para avião."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Ativar/desativar PIN do SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Alterar PIN do SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN do SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"PIN antigo"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Novo PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Confirmar novo PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"O PIN antigo digitado não está correto. Tente novamente."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Os PINs digitados não correspondem. Tente novamente."</string>
+    <string name="badPin" msgid="8955102849303984935">"O PIN antigo digitado não está correto. Tente novamente."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Os PINs digitados não correspondem. Tente novamente."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Digite um PIN com 4 a 8 números."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Desativar PIN do SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Ativar PIN do SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Aguarde..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"PIN do SIM ativado"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN do SIM desativado"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"O PIN digitado estava incorreto"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"PIN do SIM alterado com êxito"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN do SIM ativado."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN do SIM desativado."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"O PIN digitado estava incorreto."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"PIN do SIM alterado."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Senha incorreta. SIM bloqueado! PUK2 solicitado."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 antigo"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Novo PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Confirmar novo PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"O PUK2 digitado não está correto. Tente novamente."</string>
-    <string name="badPin2" msgid="515218795152422178">"O PIN2 antigo digitado não está correto. Tente novamente."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Os PIN2s digitados não correspondem. Tente novamente."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"O PUK2 digitado não está correto. Tente novamente."</string>
+    <string name="badPin2" msgid="1041576234483629991">"O PIN2 antigo digitado não está correto. Tente novamente."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Os PIN2s digitados não correspondem. Tente novamente."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Digite um PIN2 com 4 a 8 números."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Digite um PUK2 com 8 números."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 alterado com êxito"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 alterado."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Digitar o código PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Senha incorreta. Altere o PIN2 e tente novamente!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Senha incorreta. SIM bloqueado! PUK2 solicitado."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Senha incorreta. Altere o PIN2 e tente novamente."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Senha incorreta. SIM bloqueado. PUK2 solicitado."</string>
     <string name="doneButton" msgid="2859593360997984240">"Concluído"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Conferência telefônica <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Voltar à chamada"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Continuar sem o cartão SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Nenhum cartão SIM encontrado. Insira um cartão SIM no telefone."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Dispensar"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Desbloquear"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Autenticando o PIN…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Número correio de voz"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Discando"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Tentando novamente"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conferência telefônica"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Recebendo chamada"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Aguardando chamada CDMA"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Chamada encerrada"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Em espera"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Desligando"</string>
@@ -473,7 +410,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Chamadas perdidas"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> chamadas perdidas"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Chamada perdida de <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Chamada atual (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Chamada em andamento"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Em espera"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Recebendo chamada"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Novo correio de voz"</string>
@@ -482,13 +419,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Número correio de voz desconhecido"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Sem serviço"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"A rede selecionada (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) não está disponível"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Desligar"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Retornar chamada"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mensagem"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Para fazer uma chamada, primeiro desative o modo avião."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Não registrado na rede."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Rede móvel não disponível."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Chamada não completada, o número inserido é inválido."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Chamada não completada."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iniciando sequência MMI…"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Iniciando sequência do código de recursos..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Serviço não suportado."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Não é possível alternar chamadas."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Não é possível separar a chamada."</string>
@@ -500,18 +439,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Chamada de emergência"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ativando o rádio…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Área fora de serviço, tentando novamente..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Chamada não completada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> não é um número de emergência."</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Chamada não completada. Disque um número de emergência."</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Chamada não enviada. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> não é um número de emergência!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Chamada não enviada. Disque um número de emergência!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Use o teclado para discar"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Teclado multifrequencial"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Em espera"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Desativar modo de espera"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Finalizar"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Teclado"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Ocultar"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Alto-falante"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Desativar som"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Adicionar chamada"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Mesclar chamadas"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Trocar"</string>
@@ -530,36 +464,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Texto ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Tons DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Tons DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Definir duração dos tons DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Longo"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Mensagem de rede"</string>
+    <string name="network_message" msgid="4483886461245213802">"Mensagem de rede"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Ativar o seu telefone"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Uma chamada especial precisa ser feita para ativar o serviço do seu telefone. "\n\n"Depois de pressionar “Ativar”, ouça as instruções fornecidas para ativar o seu telefone."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Toque em “Ativar” para fazer uma chamada especial que ativa o seu telefone na rede celular da sua operadora, para que você possa fazer chamadas e se conectar a redes móveis de dados."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Ignorar ativação?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Se você ignorar a ativação, não poderá fazer chamadas ou se conectar a redes móveis de dados (embora possa se conectar a redes Wi-Fi). Até que o seu telefone seja ativado, você receberá solicitações de ativação sempre que o ligar."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Ignorar"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Ativar"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Ativar"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"O telefone está ativado!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"O telefone está ativado."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problema com a ativação"</string>
     <string name="ota_listen" msgid="162923839877584937">"Siga as instruções faladas até ouvir que a ativação está concluída."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Teclado"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Alto-falante"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Aguarde enquanto o seu telefone está sendo programado."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Falha de programação"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Aguarde enquanto seu telefone é programado."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Falha de programação"</string>
     <string name="ota_successful" msgid="1880780692887077407">"O seu telefone está ativado. Pode demorar até 15 minutos para o serviço ser iniciado."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"O seu telefone não foi ativado. "\n"Talvez seja necessário encontrar uma área com uma cobertura melhor (próximo de uma janela ou no lado de fora). "\n\n"Tente novamente ou ligue para o serviço de atendimento ao cliente para obter mais opções."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Seu telefone não foi ativado. "\n"Talvez seja necessário encontrar uma área com uma cobertura melhor (próximo de uma janela ou no lado de fora). "\n\n"Tente novamente ou ligue para o serviço de atendimento ao cliente para obter mais opções."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"FALHAS EM EXCESSO DE SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Voltar"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Tentar novamente"</string>
     <string name="ota_next" msgid="3904945374358235910">"Próxima"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Voltar"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Modo de retorno de chamada de emergência acessado"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Modo de retorno de chamada de emergência"</string>
@@ -569,87 +498,69 @@
     <item quantity="other" msgid="3122217344579273583">"Nenhuma conexão de dados durante <xliff:g id="COUNT">%s</xliff:g> minutos"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"O telefone ficará no modo de retorno de chamada de emergência durante <xliff:g id="COUNT">%s</xliff:g> minuto. Enquanto estiver nesse modo, nenhum aplicativo que use uma conexão de dados poderá ser usado. Deseja sair?"</item>
-    <item quantity="other" msgid="3231879566243957821">"O telefone ficará no modo de retorno de chamada de emergência durante <xliff:g id="COUNT">%s</xliff:g> minutos. Enquanto estiver nesse modo, nenhum aplicativo que use uma conexão de dados poderá ser usado. Deseja sair?"</item>
+    <item quantity="one" msgid="8060210887681426682">"O telefone estará no modo de retorno de chamada de emergência por <xliff:g id="COUNT">%s</xliff:g> minuto. Nesse modo, nenhum aplicativo que utiliza uma conexão de dados pode ser usado. Você deseja sair agora?"</item>
+    <item quantity="other" msgid="8617116564023933114">"O telefone estará no modo de retorno de chamada de emergência por <xliff:g id="COUNT">%s</xliff:g> minutos. Nesse modo, nenhum aplicativo que utiliza uma conexão de dados pode ser usado. Você deseja sair agora?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"A ação selecionada não está disponível no modo de retorno de chamada de emergência. O telefone ficará nesse modo durante <xliff:g id="COUNT">%s</xliff:g> minuto. Deseja sair?"</item>
-    <item quantity="other" msgid="3489076611710869904">"A ação selecionada não está disponível no modo de retorno de chamada de emergência. O telefone ficará nesse modo durante <xliff:g id="COUNT">%s</xliff:g> minutos. Deseja sair?"</item>
+    <item quantity="one" msgid="2585506997024726599">"A ação selecionada não está disponível no modo de retorno de chamada de emergência. O telefone estará nesse modo por <xliff:g id="COUNT">%s</xliff:g> minuto. Você deseja sair agora?"</item>
+    <item quantity="other" msgid="6115622137771382224">"A ação selecionada não está disponível no modo de retorno de chamada de emergência. O telefone estará nesse modo por <xliff:g id="COUNT">%s</xliff:g> minutos. Você deseja sair agora?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"A ação selecionada não está disponível durante uma chamada de emergência"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Saindo do modo de retorno de chamada de emergência"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"A ação selecionada não está disponível durante uma chamada de emergência."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Saindo do modo de retorno de chamada de emergência"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Sim"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Não"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Descartar"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Conf. do correio de voz"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;não definido&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Serviço de correio de voz"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Configurações para <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Serviço"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Configuração"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Não definido&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Outras configurações de chamada"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Discar"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Chamando por meio de ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Arraste para a direita para atender"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Arraste para a esquerda para silenciar a campainha"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Arraste para a esquerda para recusar"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Arraste para a direita para atender e"\n"colocar a chamada ativa em espera"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Arraste para a direita para atender e"\n"finalizar a chamada ativa"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Arraste para a direita para atender e"\n"encerrar a chamada em espera"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Atender"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Recusar"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Chamando via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"foto do contato"</string>
     <string name="goPrivate" msgid="865837794424530980">"conversar em particular"</string>
     <string name="selectContact" msgid="781975788478987237">"selecionar contato"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Configurações de chamada pela internet"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Contas para chamada pela internet (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Contas"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Gerenciar contas e status para chamada pela internet (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Receber chamadas"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Reduz a vida útil da bateria"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Configurar opções de chamada"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Usar cham. pela Internet"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Usar chamada pela internet (somente Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Para todas as chamadas, quando a rede de dados estiver disponível"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Apenas para cham. pela internet"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Perguntar toda chamada"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Para todas as chamadas"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Registro automático"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Chamada efetuada via SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Chamar"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Usar a conta para chamada pela internet:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Sempre usar para realizar chamadas pela internet"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Você pode usar as Configurações de chamada para alterar a conta para chamada pela internet a ser usada por padrão ao realizar chamadas. Para isso, selecione uma conta diferente em \"Configurações de chamada pela internet\""</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Você pode alterar qual conta de chamada pela Internet será usada por padrão na tela Telefone &gt; Configurações &gt; Configurações de chamada pela Internet &gt; Contas."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Chamada para celular"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Chamada pela internet"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Não há conta para chamada pela internet"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Não há contas para chamada pela internet neste telefone. Deseja adicionar uma agora?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Não há contas de chamada pela Internet neste telefone. Você deseja adicionar uma conta agora?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Adicionar"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Adicionar conta"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Remover conta"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Contas SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Salvando a conta..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Removendo a conta..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Salvando a conta..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Removendo a conta..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Salvar"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Descartar"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Fechar o perfil"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Fechar"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Principal"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Tornar esta conta minha conta principal"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Utilizado para chamadas efetuadas"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Configurações avançadas"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Conta principal. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Verificando status..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Registrando..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Ainda tentando..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Sem chamadas recebidas"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Registro da conta interrompido porque não há conexão à internet"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Registro da conta interrompido porque não há conexão Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Falha no registro da conta"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Chamadas recebidas"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registrando..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Ainda tentando..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Sem chamadas recebidas."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Registro da conta interrompido porque não há conexão à internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Registro da conta interrompido porque não há conexão Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Falha no registro da conta."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Chamadas recebidas."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Falha no registro da conta: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Nova tentativa mais tarde"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Falha no registro da conta: nome de usuário ou senha incorretos"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Falha no registro da conta: verifique o nome do servidor"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Esta conta está sendo usada pelo aplicativo <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Falha no registro da conta: nome de usuário ou senha incorretos."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Falha no registro da conta: verifique o nome do servidor."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"No momento, esta conta é usada pelo aplicativo <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Detalhes da conta SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Detalhes da conta SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Servidor"</string>
@@ -660,9 +571,6 @@
     <string name="port_title" msgid="5952939408078626657">"Número da porta"</string>
     <string name="transport_title" msgid="8253139511847746640">"Tipo de transporte"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Enviar sinal de atividade"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Enviar mensagens de atividade do SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Registro automático"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Registrar o perfil automaticamente"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Def. como conta principal"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Utilizado para chamadas de saída"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Configurações opcionais"</string>
@@ -673,12 +581,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Opcional&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Toque para mostrar todos"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Toque para ocultar todos"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> é campo obrigatório e não pode ser deixado em branco"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"O número da porta deve estar entre 1000 e 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> é campo obrigatório e não pode ser deixado em branco."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"O número da porta deve estar entre 1000 e 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Nenhuma conexão à internet"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Nenhuma conexão Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Antes de fazer uma chamada pela internet, verifique a conexão à internet"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Você deve estar conectado a uma rede Wi-Fi para realizar chamadas pela internet (use as Configurações de redes sem fio e outras)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Antes de fazer uma chamada pela Internet, primeiro verifique a conexão com a Internet."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Você precisa estar conectado a uma rede Wi-Fi para realizar chamadas pela Internet (use as Configurações de redes sem fio e outras)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Chamada pela internet não suportada"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automático"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Sempre enviar"</string>
@@ -687,7 +595,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Já te ligo de volta."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Eu te ligo mais tarde."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Não posso falar agora. Me liga depois, por favor?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Mensagem personalizada..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Personalizar mensagem"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Respostas rápidas"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editar respostas rápidas"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +613,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"marcar com uma estrela"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
-    <string name="description_search_button" msgid="239929880630534731">"pesquisar"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"discar"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Viva-voz ativado."</string>
@@ -715,9 +622,47 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Recusar"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrar"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrar"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Toque"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Sempre"</item>
     <item msgid="1595097872875714252">"Apenas quando estiver no silencioso"</item>
     <item msgid="1458182414036878616">"Nunca"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Toque do telefone"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrar quando estiver tocando"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tons de toque do teclado numérico"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Toque"</string>
+    <string name="perm_change_mobile_network">Alternar rede de dados (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Aplicação com está permissão pode a qualquer momento, alterar entre dados 2G and 3G. 3G é mais rápido, consome mais bateria, e também pode gastar mais seu dinheiro.</string>
+    <string name="preferred_network_mode_lte_gsm_summary">Modo de rede preferencial: LTE / GSM/WCDMA</string>
+    <string name="dialer_ui_settings_title">Teclado</string>
+    <string name="dialer_ui_settings_summary">Configurações do teclado</string>
+    <string name="noise_suppression_title">Supressão de ruído</string>
+    <string name="noise_suppression_summary">Ativar supressão de ruído em ligações</string>
+    <string name="mwi_notification_title">Indicador de Mensagem em Espera</string>
+    <string name="mwi_notification_summary">Exibir mensagem para indicador de notificações de mensagens de voz</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_summary">Modo de rede preferencial: LTE / CDMA / EvDo</string>
+    <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">Modo de rede preferencial: LTE / CDMA / EvDo / GSM / WCDMA</string>
+    <string name="phone_number_label">Meu número de telefone</string>
+    <string name="phone_number_summary">Definir o número de telefone para este dispositivo</string>
+    <string name="advanced_setting">Configuração avançada</string>
+    <string name="keep_proximity_sensor_on">Manter sensor de proximidade ligado</string>
+    <string name="keep_proximity_sensor_on_sum">Não desligar o sensor de proximidade durante ligações utilizando um headset.</string>
+    <string name="lockscreen_if_call_ends_with_screenoff">Bloquear ao terminar chamada</string>
+    <string name="lockscreen_if_call_ends_with_screenoff_sum">Bloqueia automaticamente quando uma chamada termina e a tela está desligada</string>
+    <string name="vibrate_outgoing">Vibrar ao atender</string>
+    <string name="vibrate_hangup">Vibrar ao desligar</string>
+    <string name="vibrate_call_waiting">Vibrar c/ chamada em espera</string>
+    <string name="vibrate_call_waiting_sum">Vibra quando existem chamadas em espera</string>
+    <string name="voice_quality_preferences_title">Qualidade de voz</string>
+    <string name="voice_quality_summary">Ajuste um perfil para melhorar a qualidade da ligação</string>
+    <string name="voice_quality_entry_normal">Normal</string>
+    <string name="voice_quality_entry_clear">Limpa</string>
+    <string name="voice_quality_entry_crisp">Nítida</string>
+    <string name="voice_quality_entry_bright">Brilhante</string>
+    <string name="vibrate_45">Vibrar a cada 45 segundos</string>
+    <string name="vibrate_45_sum">Vibrar aos 45 segundos de cada minuto durante chamada efetuada</string>
+    <string name="national_roaming">Roaming de dados nacional</string>
+    <string name="national_roaming_enable">Conectar aos serviços de dados quando estiver em roaming nacional</string>
+    <string name="national_roaming_disable">Não conectar aos serviços de dados quando estiver em roaming nacional</string>
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
deleted file mode 100644
index d70cbf356..000000000
--- a/res/values-rm/strings.xml
+++ /dev/null
@@ -1,838 +0,0 @@
-<?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">
-    <!-- no translation found for phoneAppLabel (8576272342240415145) -->
-    <skip />
-    <!-- no translation found for phoneAppLabel (906161039445636857) -->
-    <skip />
-    <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Cloms d\'urgenza"</string>
-    <string name="phoneIconLabel" msgid="2331230813161304895">"Telefon"</string>
-    <string name="fdnListLabel" msgid="8630418672279521003">"Glista da numers autorisads"</string>
-    <string name="unknown" msgid="6878797917991465859">"Nunenconuschent"</string>
-    <string name="private_num" msgid="6713286113000232309">"Numer privat"</string>
-    <string name="payphone" msgid="1931775086311769314">"Cabina da telefon"</string>
-    <string name="onHold" msgid="9035493194749959955">"Spetgant"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Clom actual"</string>
-    <string name="callFailed_userBusy" msgid="8851106999809294904">"Lingia occupada"</string>
-    <string name="callFailed_congestion" msgid="8737761615702718375">"Rait occupada"</string>
-    <!-- no translation found for callFailed_timedOut (7590961703135543346) -->
-    <skip />
-    <!-- no translation found for callFailed_server_unreachable (2133506577423869729) -->
-    <skip />
-    <!-- no translation found for callFailed_number_unreachable (7632566442515734778) -->
-    <skip />
-    <!-- no translation found for callFailed_invalid_credentials (8226835346196775378) -->
-    <skip />
-    <!-- no translation found for callFailed_out_of_network (6485167392133436262) -->
-    <skip />
-    <!-- no translation found for callFailed_server_error (5717915213586193217) -->
-    <skip />
-    <string name="callFailed_noSignal" msgid="1889803273616031933">"Nagin signal"</string>
-    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Surpassà la limita ACM"</string>
-    <string name="callFailed_powerOff" msgid="2766035859391549713">"Signal radio deactivà"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Nagina carta SIM u errur da la carta SIM"</string>
-    <string name="callFailed_outOfService" msgid="4825791466557236225">"Territori senza rait"</string>
-    <string name="callFailed_fdn_only" msgid="2850204579765430641">"Ils cloms sortints èn limitads pervia da la limitaziun da cloms (FDN)."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Vus na pudais betg telefonar sche la bloccada da cloms è activa."</string>
-    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Tut ils cloms èn limitads entras ina controlla d\'access."</string>
-    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Ils cloms d\'urgenza èn limitads d\'ina controlla d\'access."</string>
-    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Ils cloms normals èn limitads entras la controlla d\'access."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: il telefonin è bloccà enfin ch\'el vegn reavià."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: clom interrut."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: clom interrut"</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: ordinar danovamain."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: refusa da l\'opziun da servetsch"</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: nova emprova da zavrar."</string>
-    <!-- no translation found for callFailed_cdma_accessFailure (715977130417624962) -->
-    <skip />
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: anticipà."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Mo cloms d\'urgenza èn pussibels."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Numer nuncorrect"</string>
-    <string name="confCall" msgid="1904840547188336828">"Conferenza da telefon"</string>
-    <string name="call_lost" msgid="317670617901479594">"Il clom è ì a perder."</string>
-    <string name="retry" msgid="8462986804300767852">"Empruvar danovamain"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Clom pers"</string>
-    <string name="ok" msgid="3811371167865772377">"OK"</string>
-    <string name="mmiStarted" msgid="6347869857061147003">"Il code IHM è vegnì lantschà."</string>
-    <string name="ussdRunning" msgid="485588686340541690">"Execuziun dal code USSD..."</string>
-    <string name="mmiCancelled" msgid="2771923949751842276">"Annullà Code IHM"</string>
-    <string name="cancel" msgid="5044513931633602634">"Interrumper"</string>
-    <!-- no translation found for manageConferenceLabel (4691922394301969053) -->
-    <skip />
-    <!-- no translation found for audio_mode_speaker (27649582100085266) -->
-    <skip />
-    <!-- no translation found for audio_mode_earpiece (4156527186373869107) -->
-    <skip />
-    <!-- no translation found for audio_mode_wired_headset (1465350758489175975) -->
-    <skip />
-    <!-- no translation found for audio_mode_bluetooth (3047641300848211128) -->
-    <skip />
-    <string name="wait_prompt_str" msgid="7601815427707856238">"Trametter ils tuns suandants?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Trametter tuns"\n</string>
-    <string name="send_button" msgid="4106860097497818751">"Trametter"</string>
-    <string name="pause_prompt_yes" msgid="3564467212025151797">"Gea"</string>
-    <string name="pause_prompt_no" msgid="6686238803236884877">"Na"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Remplazzar la variabla cun"</string>
-    <string name="no_vm_number" msgid="4164780423805688336">"Numer da mailbox mancant"</string>
-    <string name="no_vm_number_msg" msgid="1300729501030053828">"Sin la carta SIM n\'è nagin numer da mailbox memorisà."</string>
-    <string name="add_vm_number_str" msgid="4676479471644687453">"Agiuntar in numer"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Chargiar…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Endatai in code PIN per debloccar la carta SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM debloccada"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Nov code PIN da la carta SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Endatai anc ina gida il nov code PIN per la carta SIM per al confermar"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Ils codes PIN da la carta SIM endatads na correspundan betg. Empruvai anc ina giada."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Endatai la clav PUK per debloccar la carta SIM"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Il code PUK è nuncorrect!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Vinavant"</string>
-    <string name="puk_unlocked" msgid="2284912838477558454">"Vossa carta SIM è vegnida debloccada. Voss telefonin vegn debloccà..."</string>
-    <string name="label_ndp" msgid="780479633159517250">"Code PIN da debloccaziun da la rait SIM"</string>
-    <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Debloccar"</string>
-    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"Serrar"</string>
-    <string name="requesting_unlock" msgid="6412629401033249351">"Dumandar la debloccaziun da la rait..."</string>
-    <string name="unlock_failed" msgid="6490531697031504225">"Betg reussì da dumandar la debloccaziun da la rait."</string>
-    <string name="unlock_success" msgid="6770085622238180152">"Reussì da debloccar la rait."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
-    <string name="labelGSMMore" msgid="5930842194056092106">"Parameters da clom GSM"</string>
-    <string name="labelCDMAMore" msgid="1630676740428229339">"Parameters da clom CDMA"</string>
-    <string name="apn_settings" msgid="9043423184895642077">"Nums da puncts d\'access"</string>
-    <string name="settings_label" msgid="3876743539816984008">"Parameters da la rait"</string>
-    <string name="voicemail" msgid="8693759337917898954">"Mailbox"</string>
-    <string name="voicemail_abbreviated" msgid="2215592488517217448">"MV:"</string>
-    <string name="networks" msgid="8873030692174541976">"Gestiunari da la rait"</string>
-    <string name="call_settings" msgid="6112441768261754562">"Parameters da clom"</string>
-    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"Auters parameters"</string>
-    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"Auters parameters da clom mo GSM"</string>
-    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"Auters parameters da clom CDMA"</string>
-    <string name="sum_cdma_call_settings" msgid="284753265979035549">"Auters parameters da clom mo CDMA"</string>
-    <string name="labelNwService" msgid="4699970172021870983">"Parameters dal servetsch da rait"</string>
-    <string name="labelCallerId" msgid="3888899447379069198">"ID dal clamader"</string>
-    <string name="sum_hide_caller_id" msgid="1071407020290873782">"Numer zuppentà per ils cloms sortints"</string>
-    <string name="sum_show_caller_id" msgid="6768534125447290401">"Numer mussà per ils cloms sortints"</string>
-    <string name="sum_default_caller_id" msgid="1954518825510901365">"Utilisar ils parameters da standard dal gestiunari per mussar mes numer cun cloms sortints"</string>
-    <string name="labelCW" msgid="6120513814915920200">"Avis da clom"</string>
-    <string name="sum_cw_enabled" msgid="8083061901633671397">"M\'avisar en cas da cloms entrants durant che jau telefonesch"</string>
-    <string name="sum_cw_disabled" msgid="3648693907300104575">"M\'avisar en cas da cloms entrants durant che jau telefonesch"</string>
-    <string name="call_forwarding_settings" msgid="3378927671091537173">"Parameters da renviament da clom"</string>
-    <string name="labelCF" msgid="2574386948026924737">"Renviament da clom"</string>
-    <string name="labelCFU" msgid="8147177368148660600">"Adina renviar"</string>
-    <string name="messageCFU" msgid="3560082430662923687">"Adina utilisar quest numer"</string>
-    <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"Renviar tut ils cloms"</string>
-    <!-- no translation found for sum_cfu_enabled (2450052502198827927) -->
-    <skip />
-    <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"Numer betg disponibel"</string>
-    <string name="sum_cfu_disabled" msgid="3698472522160364904">"Deactivà"</string>
-    <string name="labelCFB" msgid="218938523102207587">"Renviar sche occupà"</string>
-    <string name="messageCFB" msgid="3711089705936187129">"Numer da renviament sche la lingia è occupada"</string>
-    <!-- no translation found for sum_cfb_enabled (5984198104833116690) -->
-    <skip />
-    <string name="sum_cfb_disabled" msgid="227440009979537651">"Deactivà"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Voss gestiunari da la rait na sustegna betg la deactivaziun dal renviament da cloms sche Voss telefonin è occupà."</string>
-    <string name="labelCFNRy" msgid="3646316323834351390">"Renviar sche betg respundì"</string>
-    <string name="messageCFNRy" msgid="672317899884380374">"Numer da renviament sche Vus na respundais betg"</string>
-    <!-- no translation found for sum_cfnry_enabled (6955775691317662910) -->
-    <skip />
-    <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Deactivà"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Voss gestiunari da la rait na sustegna betg la deactivaziun dal renviament da cloms sche Voss telefonin na respunda betg."</string>
-    <!-- no translation found for labelCFNRc (47183615370850000) -->
-    <skip />
-    <string name="messageCFNRc" msgid="6380695421020295119">"Numer da renviament sche betg accessibel"</string>
-    <!-- no translation found for sum_cfnrc_enabled (7010898346095497421) -->
-    <skip />
-    <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Deactivà"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Voss gestiunari da la rait na sustegna betg la deactivaziun dal renviament da cloms sche Voss telefonin è inaccessibel."</string>
-    <string name="updating_title" msgid="6146755386174019046">"Parameters da clom"</string>
-    <string name="error_updating_title" msgid="7970259216988931777">"Errur dals parameters da clom"</string>
-    <string name="reading_settings" msgid="1920291699287055284">"Leger ils parameters..."</string>
-    <string name="updating_settings" msgid="8171225533884883252">"Actualisar ils parameters..."</string>
-    <string name="reverting_settings" msgid="4752151682666912828">"Reinizialisar ils parameters..."</string>
-    <string name="response_error" msgid="6674110501330139405">"Resposta nunspetgada da la rait"</string>
-    <string name="exception_error" msgid="7027667130619518211">"Errur da rait u da la carta SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Operaziuns reservadas per ils numers autorisads"</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Activai il signal da radio avant che laschar mussar quests parameters."</string>
-    <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
-    <string name="enable" msgid="1059008390636773574">"Activar"</string>
-    <string name="disable" msgid="7274240979164762320">"Deactivar"</string>
-    <string name="change_num" msgid="239476305819844391">"Actualisaziun"</string>
-  <string-array name="clir_display_values">
-    <item msgid="5560134294467334594">"Rait predefinida"</item>
-    <item msgid="7876195870037833661">"Zuppentar il numer"</item>
-    <item msgid="1108394741608734023">"Mussar il numer"</item>
-  </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Memorisar il numer da mailbox"</string>
-    <string name="vm_changed" msgid="380744030726254139">"Midà il numer da la mailbox."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Betg reussì da midar il numer da la mailbox."\n"Contactai per plaschair il gestiunari da la rait sch\'il problem cumpara vinavant."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Betg reussì da midar il numer da renviament."\n"Contactai per plaschair il gestiunari da la rait sch\'il problem cumpara vinavant."</string>
-    <!-- no translation found for fw_get_in_vm_failed (8862896836093833973) -->
-    <skip />
-    <string name="no_change" msgid="3186040086622435212">"Naginas modificaziuns n\'èn vegnidas fatgas."</string>
-    <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Tscherner in servetsch da mailbox"</string>
-    <string name="voicemail_default" msgid="5902099213882352338">"Mes gestiunari da la rait"</string>
-    <string name="mobile_networks" msgid="5540397602919106177">"Parameters da la rait mobila"</string>
-    <string name="label_available" msgid="1181658289009300430">"Raits disponiblas"</string>
-    <string name="load_networks_progress" msgid="5230707536168902952">"Tschertga en process…"</string>
-    <string name="empty_networks_list" msgid="4249426905018815316">"Chattà nagina rait."</string>
-    <string name="search_networks" msgid="1601136049300882441">"Tschertgar las raits"</string>
-    <string name="network_query_error" msgid="6828516148953325006">"Errur cun tschertgar raits."</string>
-    <string name="register_on_network" msgid="9055203954040805084">"Registrar en <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Voss carta SIM na permetta betg ina connexiun a questa rait."</string>
-    <string name="connect_later" msgid="500090982903469816">"Actualmain impussibel da connectar a la rait. Empruvai pli tard anc ina giada."</string>
-    <string name="registration_done" msgid="495135664535876612">"Registrà en la rait."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Tscherner in gestiunari da la rait"</string>
-    <string name="sum_search_networks" msgid="2921092249873272715">"Tschertgar tut las raits disponiblas"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Tscherner automaticamain"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Tscherner automaticamain la rait preferida"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Registraziun automatica..."</string>
-    <string name="preferred_network_mode_title" msgid="8873246565334559308">"Modus da rait"</string>
-    <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Midar il modus da funcziunament da la rait"</string>
-    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Modus da rait preferida"</string>
-    <!-- no translation found for preferred_network_mode_wcdma_perf_summary (8521677230113533809) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_gsm_only_summary (3352445413437453511) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_wcdma_only_summary (2836897236221063413) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_gsm_wcdma_summary (3161255745326408587) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_cdma_summary (3175690187294334241) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_cdma_evdo_summary (8332063064712726618) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_cdma_only_summary (1309770926198634150) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_evdo_only_summary (8472220691721269155) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_lte_cdma_summary (3722647806454528426) -->
-    <skip />
-    <!-- no translation found for preferred_network_mode_choices:0 (5886604709726177211) -->
-    <!-- no translation found for preferred_network_mode_choices_lte:0 (7345284701413565429) -->
-    <!-- no translation found for preferred_network_mode_choices_lte:1 (5541716989029928208) -->
-    <string name="data_enabled" msgid="5972538663568715366">"Datas activadas"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"Activar l\'access a las datas sur la rait mobila"</string>
-    <string name="roaming" msgid="8871412572928323707">"Roaming da datas"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"Connectar als servetschs da datas en cas da roaming"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"Connectar als servetschs da datas cun roaming"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"La connexiun è interrutta perquai che Vus essas sortids da la rait domestica ed il roaming da datas n\'è betg activà."</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"Permetter il roaming da datas? Las tariffas da roaming pon esser considerablas!"</string>
-    <string name="gsm_umts_options" msgid="6538311689850981686">"Opziuns GSM/UMTS"</string>
-    <string name="cdma_options" msgid="4016822858172249884">"Opziuns CDMA"</string>
-    <string name="throttle_data_usage" msgid="3715677828160555808">"Utilisaziun da datas"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Reglas dal gestiunari areguard las datas"</string>
-    <string name="throttle_current_usage" msgid="8762280193043815361">"Datas utilisadas en la perioda actuala"</string>
-    <string name="throttle_time_frame" msgid="1915198770363734685">"Perioda d\'utilisaziun da datas"</string>
-    <string name="throttle_rate" msgid="4710388992676803508">"Reglas davart la sveltezza da transmissiun da datas"</string>
-    <string name="throttle_help" msgid="243651091785169900">"Ulteriuras infurmaziuns"</string>
-    <string name="throttle_status_subtext" msgid="1657318943142085170">"<xliff:g id="USED_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>٪) da l\'interval maximal da <xliff:g id="USED_2">%3$s</xliff:g>."\n"Il proxim interval cumenza en <xliff:g id="USED_3">%4$d</xliff:g> dis (<xliff:g id="USED_4">%5$s</xliff:g>)."</string>
-    <string name="throttle_data_usage_subtext" msgid="6029276011123694701">"<xliff:g id="USED_0">%1$s</xliff:g> da <xliff:g id="USED_2">%3$s</xliff:g> - (<xliff:g id="USED_1">%2$d</xliff:g> ٪) dal maximum per perioda"</string>
-    <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"Surpassà il maximum da <xliff:g id="USED_0">%1$s</xliff:g>"\n"La sveltezza da transmissiun da datas è vegnida reducida a <xliff:g id="USED_1">%2$d</xliff:g> kbit/s"</string>
-    <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ dal ciclus èn passads."\n"La proxima perioda cumenza en <xliff:g id="USED_1">%2$d</xliff:g> dis (<xliff:g id="USED_2">%3$s</xliff:g>)."</string>
-    <string name="throttle_rate_subtext" msgid="2149102656120726855">"Reducì la sveltezza da transfer da datas a <xliff:g id="USED">%1$d</xliff:g> kbit/s sche la limita d\'utilisaziun da datas è surpassada."</string>
-    <string name="throttle_help_subtext" msgid="5217706521499010816">"Ulteriuras infurmaziuns davart las reglas da Voss gestiunari da la rait mobila concernent l\'utilisaziun da datas en sia rait."</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Cell Broadcast SMS"</string>
-    <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS Cell Broadcast"</string>
-    <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS Cell Broadcast"</string>
-    <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS Cell Broadcast activà"</string>
-    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"SMS Cell Broadcast deactivà"</string>
-    <string name="cb_sms_settings" msgid="651715019785107312">"Parameters da SMS Cell Broadcast"</string>
-    <string name="enable_disable_emergency_broadcast" msgid="2157014609041245335">"Broadcast d\'urgenza"</string>
-    <string name="emergency_broadcast_enable" msgid="2645980025414010211">"Broadcast d\'urgenza activà"</string>
-    <string name="emergency_broadcast_disable" msgid="3665199821267569426">"Broadcast d\'urgenza deactivà"</string>
-    <string name="enable_disable_administrative" msgid="6501582322182059412">"Administraziun"</string>
-    <string name="administrative_enable" msgid="1750086122962032235">"Administraziun activada"</string>
-    <string name="administrative_disable" msgid="8433273857248698539">"Administraziun deactivada"</string>
-    <string name="enable_disable_maintenance" msgid="1819693083025106678">"Mantegniment"</string>
-    <string name="maintenance_enable" msgid="8566636458770971189">"Mantegniment activà"</string>
-    <string name="maintenance_disable" msgid="7340189100885066077">"Mantegniment deactivà"</string>
-    <string name="general_news_settings" msgid="4968779723948432978">"Novitads generalas"</string>
-    <string name="bf_news_settings" msgid="3935593091894685267">"Economia e finanzas"</string>
-    <string name="sports_news_settings" msgid="7649399631270052835">"Novitads da sport"</string>
-    <string name="entertainment_news_settings" msgid="5051153952959405035">"Cultura e divertiment"</string>
-    <string name="enable_disable_local" msgid="7890281063123416120">"Local"</string>
-    <string name="local_enable" msgid="6370463247609136359">"Novitads localas activadas"</string>
-    <string name="local_disable" msgid="4405691986943795798">"Novitads localas deactivadas"</string>
-    <string name="enable_disable_regional" msgid="4905652414535565872">"Regiunals"</string>
-    <string name="regional_enable" msgid="4434680415437834759">"Novitads regiunalas activadas"</string>
-    <string name="regional_disable" msgid="5359325527213850077">"Novitads regiunalas deactivadas"</string>
-    <string name="enable_disable_national" msgid="236278090206880734">"Naziunal"</string>
-    <string name="national_enable" msgid="1172443648912246952">"Novitads naziunalas activadas"</string>
-    <string name="national_disable" msgid="326018148178601166">"Novitads naziunalas deactivadas"</string>
-    <string name="enable_disable_international" msgid="7535348799604565592">"Internaziunal"</string>
-    <string name="international_enable" msgid="5855356769925044927">"Novitads internaziunalas activadas"</string>
-    <string name="international_disable" msgid="2850648591041088931">"Novitads internaziunalas deactivadas"</string>
-    <string name="list_language_title" msgid="2841683501919760043">"Lingua"</string>
-    <string name="list_language_summary" msgid="8109546531071241601">"Tscherni la lingua da novitads"</string>
-  <string-array name="list_language_entries">
-    <item msgid="6137851079727305485">"Englais"</item>
-    <item msgid="1151988412809572526">"Franzos"</item>
-    <item msgid="577840534704312665">"Spagnol"</item>
-    <item msgid="8385712091143148180">"Giapunais"</item>
-    <item msgid="1858401628368130638">"Corean"</item>
-    <item msgid="1933212028684529632">"Chinais"</item>
-    <item msgid="1908428006803639064">"Ebraic"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
-  </string-array>
-    <string name="list_language_dtitle" msgid="5442908726538951934">"Linguas"</string>
-    <string name="enable_disable_local_weather" msgid="986967454867219114">"Meteo local"</string>
-    <string name="local_weather_enable" msgid="6199315114382448922">"Meteo local activà"</string>
-    <string name="local_weather_disable" msgid="2510158089142626480">"Meteo local deactivà"</string>
-    <string name="enable_disable_atr" msgid="8339572391278872343">"Infurmaziuns davart il traffic local"</string>
-    <string name="atr_enable" msgid="5541757457789181799">"Infurmaziuns davart il traffic local activadas"</string>
-    <string name="atr_disable" msgid="7085558154727596455">"Infurmaziuns davart il traffic local deactivadas"</string>
-    <string name="enable_disable_lafs" msgid="668189073721277199">"Uraris da sgols dad eroports locals"</string>
-    <string name="lafs_enable" msgid="2791978667205137052">"Uraris da sgols dad eroports locals activads"</string>
-    <string name="lafs_disable" msgid="2391212397725495350">"Uraris da sgols dad eroports locals deactivads"</string>
-    <string name="enable_disable_restaurants" msgid="6240381945336814024">"Ustarias"</string>
-    <string name="restaurants_enable" msgid="5137657479469118847">"Ustarias activadas"</string>
-    <string name="restaurants_disable" msgid="3678480270938424092">"Ustarias deactivadas"</string>
-    <string name="enable_disable_lodgings" msgid="1822029172658551202">"Alloschis"</string>
-    <string name="lodgings_enable" msgid="3230042508992850322">"Alloschis activads"</string>
-    <string name="lodgings_disable" msgid="3387879742320682391">"Alloschis deactivads"</string>
-    <string name="enable_disable_retail_directory" msgid="1357809784475660303">"Register da las firmas"</string>
-    <string name="retail_directory_enable" msgid="3280626290436111496">"Register da las firmas activà"</string>
-    <string name="retail_directory_disable" msgid="6479739816662879027">"Register da las firmas deactivà"</string>
-    <string name="enable_disable_advertisements" msgid="5999495926176182128">"Reclamas"</string>
-    <string name="advertisements_enable" msgid="2050305021264683786">"Reclama activada"</string>
-    <string name="advertisements_disable" msgid="8350985908788707935">"Reclamas deactivadas"</string>
-    <string name="enable_disable_stock_quotes" msgid="6397810445293533603">"Curs da la bursa"</string>
-    <string name="stock_quotes_enable" msgid="4384802470887170543">"Curs da la bursa activads"</string>
-    <string name="stock_quotes_disable" msgid="4781450084565594998">"Curs da la bursa activads"</string>
-    <string name="enable_disable_eo" msgid="4863043263443942494">"Offertas da plazzas da lavur libras"</string>
-    <string name="eo_enable" msgid="8623559062015685813">"Offertas da plazzas da lavur libras activadas"</string>
-    <string name="eo_disable" msgid="3863812478090907609">"Offertas da plazzas da lavur libras deactivadas"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Medischina, sanadad ed ospitals"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Medischina, sanadad ed ospitals activads"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Medischina, sanadad ed ospitals deactivads"</string>
-    <string name="enable_disable_technology_news" msgid="3517184627114999149">"Tecnologias"</string>
-    <string name="technology_news_enable" msgid="7995209394210455181">"Novitads da tecnologia activadas"</string>
-    <string name="technology_news_disable" msgid="5483490380561851946">"Novitads da tecnologia deactivadas"</string>
-    <string name="enable_disable_multi_category" msgid="626771003122899280">"Multicategorias"</string>
-    <string name="multi_category_enable" msgid="1179299804641721768">"Multicategorias activadas"</string>
-    <string name="multi_category_disable" msgid="880104702904139505">"Multicategorias deactivadas"</string>
-    <string name="gsm_umts_network_preferences_title" msgid="4834419333547382436">"Preferenzas da rait GSM/UMTS"</string>
-    <string name="gsm_umts_network_preferneces_summary" msgid="1905018644156819521">"Anc betg implementà"</string>
-    <string name="gsm_umts_network_preferences_dialogtitle" msgid="6356332580813229898">"Preferenzas da rait GSM/UMTS"</string>
-  <string-array name="gsm_umts_network_preferences_choices">
-    <item msgid="935612021902787683">"GSM/WCDMA (modus automatic)"</item>
-    <item msgid="8912042051809329533">"Mo WCDMA"</item>
-    <item msgid="8776934131146642662">"Mo GSM"</item>
-    <item msgid="4684679567848300935">"GSM/WCDA (WCDMA preferì)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
-  </string-array>
-    <string name="prefer_2g" msgid="8442550937280449639">"Mo utilisar las raits 2G"</string>
-    <string name="prefer_2g_summary" msgid="1976491403210690759">"Spargna l\'accu"</string>
-    <string name="cdma_system_select_title" msgid="5757657769327732833">"Tscherner il sistem"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Midar il modus da roaming CDMA"</string>
-    <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Tscherna da sistem"</string>
-  <string-array name="cdma_system_select_choices">
-    <item msgid="176474317493999285">"Mo raits domesticas"</item>
-    <item msgid="1205664026446156265">"Automaticamain"</item>
-  </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Modus da roaming CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Midar il modus da roaming CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Modus da roaming CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Mo raits privatas"</item>
-    <item msgid="8174642753290624634">"Raits affiliadas"</item>
-    <item msgid="2241951431403168661">"Inqual rait"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
-    <string name="cdma_network_preferences_title" msgid="41193174429510391">"Preferenzas da rait CDMA"</string>
-    <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Anc betg implementà"</string>
-    <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Preferenzas rait CDMA"</string>
-  <string-array name="cdma_network_preferences_choices">
-    <item msgid="3711054371631487248">"CDMA/EvDo"</item>
-    <item msgid="6143696847467859795">"Mo CDMA"</item>
-    <item msgid="2683555124647197574">"Mo EvDo"</item>
-  </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Abunament CDMA"</string>
-    <string name="cdma_subscription_summary" msgid="2530890766115781140">"Midar tranter las cartas RUIM/SIM e NV"</string>
-    <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"abunament"</string>
-  <string-array name="cdma_subscription_choices">
-    <item msgid="2258014151300708431">"RUIM/SIM"</item>
-    <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
-  </string-array>
-    <!-- no translation found for cdma_activate_device (3793805892364814518) -->
-    <skip />
-    <!-- no translation found for cdma_lte_data_service (4255018217292548962) -->
-    <skip />
-    <string name="fdn" msgid="7878832555095183202">"Numers autorisads"</string>
-    <string name="manage_fdn_list" msgid="8777755791892122369">"Glista da numers autorisads"</string>
-    <string name="fdn_activation" msgid="2156479741307463576">"Activaziun da numers autorisads"</string>
-    <string name="fdn_enabled" msgid="5238109009915521240">"La limitaziun da cloms è activada."</string>
-    <string name="fdn_disabled" msgid="4700049736675368279">"La limitaziun da cloms è deactivada"</string>
-    <string name="enable_fdn" msgid="3740191529180493851">"Activar limitaziun da cloms (FDN)"</string>
-    <string name="disable_fdn" msgid="7944020890722540616">"Deactivar numers autorisads"</string>
-    <string name="change_pin2" msgid="2153563695382176676">"Midar il code PIN2"</string>
-    <string name="enable_fdn_ok" msgid="7215588870329688132">"Deactivar numers autorisads"</string>
-    <string name="disable_fdn_ok" msgid="5727046928930740173">"Activar"</string>
-    <string name="sum_fdn" msgid="1959399454900272878">"Administrar la glista dals numers autorisads"</string>
-    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Modifitgar il code PIN per l\'access a numers autorisads"</string>
-    <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Administrar la glista da numers da telefon"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Protecziun da datas vusch"</string>
-    <string name="voice_privacy_summary" msgid="3159383389833516214">"Activar il modus da protecziun da datas optimada"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Modus TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Activar il modus TTY"</string>
-    <string name="tty_mode_option_title" msgid="9033098925144434669">"Modus TTY"</string>
-    <string name="tty_mode_option_summary" msgid="1073835131534808732">"Definir il modus TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Reempruvar automaticamain"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Activar il modus Reempruvar automaticamain"</string>
-    <string name="menu_add" msgid="1882023737425114762">"Agiuntar in contact"</string>
-    <string name="menu_edit" msgid="7143003705504672374">"Modifitgar il contact"</string>
-    <string name="menu_delete" msgid="3977150783449642851">"Stizzar il contact"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Endatar il code PIN2"</string>
-    <string name="name" msgid="7329028332786872378">"Num"</string>
-    <string name="number" msgid="7905950798349903858">"Numer"</string>
-    <string name="save" msgid="4094274636321939086">"Memorisar"</string>
-    <string name="add_fdn_contact" msgid="2481915899633353976">"Agiuntar in numer autorisà"</string>
-    <string name="adding_fdn_contact" msgid="7627379633721940991">"Agiuntar in numer autorisà..."</string>
-    <string name="fdn_contact_added" msgid="7458335758501736665">"Agiuntà in numer autorisà."</string>
-    <string name="edit_fdn_contact" msgid="7976936035587081480">"Modifitgar il numer autorisà"</string>
-    <string name="updating_fdn_contact" msgid="8370929876849803600">"Actualisaziun dal numer autorisà..."</string>
-    <string name="fdn_contact_updated" msgid="5497828782609005017">"Actualisà il numer autorisà"</string>
-    <string name="delete_fdn_contact" msgid="6668958073074151717">"Stizzar in numer autorisà"</string>
-    <string name="deleting_fdn_contact" msgid="5669163206349319969">"Stizzar il numer autorisà..."</string>
-    <string name="fdn_contact_deleted" msgid="7154162327112259569">"Stizzà il numer autorisà."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Impussibel dad actualisar il numer autorisà: il code PIN che Vus avais endatà è nuncorrect."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"Impussibel dad actualisar il numer autorisà: quest tip da numer na po betg cuntegnair dapli che 20 cifras."</string>
-    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Leger da la carta SIM..."</string>
-    <string name="simContacts_empty" msgid="5270660846489561932">"Nagins contacts sin Vossa carta SIM."</string>
-    <string name="simContacts_title" msgid="1861472842524839921">"Selecziunar contacts per importar"</string>
-    <!-- no translation found for simContacts_airplaneMode (8221701142387137660) -->
-    <skip />
-    <string name="enable_pin" msgid="5422767284133234860">"Activar/deactivar il code PIN da la carta SIM"</string>
-    <string name="change_pin" msgid="9174186126330785343">"Midar il PIN da la carta SIM"</string>
-    <string name="enter_pin_text" msgid="8532615714751931951">"Code PIN da la carta SIM:"</string>
-    <string name="oldPinLabel" msgid="5287773661246368314">"PIN vegl"</string>
-    <string name="newPinLabel" msgid="207488227285336897">"Nov code PIN"</string>
-    <string name="confirmPinLabel" msgid="257597715098070206">"Confermar il nov code PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Il vegl PIN endatà è nuncorrect. Empruvai per plaschair anc ina giada."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Ils codes PIN endatads na correspundan betg. Empruvai anc ina giada."</string>
-    <string name="invalidPin" msgid="5981171102258684792">"Endatai in code PIN che consista da 4 fin a 8 cifras."</string>
-    <string name="disable_sim_pin" msgid="3992926931620188855">"Deactivar il code PIN da la carta SIM"</string>
-    <string name="enable_sim_pin" msgid="5803702443844458831">"Activar il code PIN da la carta SIM"</string>
-    <string name="enable_in_progress" msgid="3695303775100109650">"Spetgar..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"Il code PIN da la carta SIM è activà."</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"Code PIN da la carta SIM deactivà"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Il code PIN endatà n\'era betg correct."</string>
-    <string name="pin_changed" msgid="9000716792724195093">"Il code PIN da la carta SIM è vegnì midà."</string>
-    <string name="puk_requested" msgid="3898394204193202803">"Il pled-clav è nuncorrect, la carta SIM è bloccada! Il PUK2 è necessari."</string>
-    <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
-    <string name="oldPin2Label" msgid="8559146795026261502">"Vegl PIN2"</string>
-    <string name="newPin2Label" msgid="4573956902204349054">"Nov code PIN2"</string>
-    <string name="confirmPin2Label" msgid="8100319484454787708">"Confermar il nov code PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Il code PIN2 endatà è nuncorrect. Empruvai per plaschair anc ina giada."</string>
-    <string name="badPin2" msgid="515218795152422178">"Il code PIN2 vegl endatà è nuncorrect. Empruvai per plaschair anc ina giada."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Ils codes PIN2 endatads na correspundan betg. Empruvai per plaschair anc ina giada."</string>
-    <string name="invalidPin2" msgid="8237110107480395938">"Endatai in code PIN2 che cuntegna 4 fin 8 cifras."</string>
-    <string name="invalidPuk2" msgid="1290977391033057871">"Endatai ina clav PUK2 dad 8 cifras."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"Midà cun success il PIN2"</string>
-    <string name="label_puk2_code" msgid="302845876240219560">"Endatai il code PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Il pled-clav è nuncorrect. Modifitgai il code PIN2 ed empruvai anc ina giada."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Il pled-clav è nuncorrect, la carta SIM è bloccada! Il PUK2 è necessari."</string>
-    <string name="doneButton" msgid="2859593360997984240">"Finì"</string>
-    <string name="caller_manage_header" msgid="3231519674734638786">"Conferenza da telefon <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Enavos al clom"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Cuntinuar senza carta SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Betg chattà ina carta SIM. Inseri ina carta SIM en il telefonin."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Serrar"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Debloccar"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Autentificaziun dal PIN..."</string>
-    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numer da la mailbox"</string>
-    <string name="card_title_dialing" msgid="5769417478498348054">"Telefonar..."</string>
-    <string name="card_title_redialing" msgid="4831412164303596395">"Nova emprova"</string>
-    <string name="card_title_conf_call" msgid="1162980346189744501">"Conferenza da telefon"</string>
-    <string name="card_title_incoming_call" msgid="7364539451234646909">"Clom entrant"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Clom CDMA spetgant"</string>
-    <string name="card_title_call_ended" msgid="5544730338889702298">"Finì il telefon"</string>
-    <string name="card_title_on_hold" msgid="821463117892339942">"Clom spetgant"</string>
-    <string name="card_title_hanging_up" msgid="3999101620995182450">"Pender si"</string>
-    <string name="card_title_in_call" msgid="6346543933068225205">"Clom"</string>
-    <!-- no translation found for card_title_my_phone_number (112428362494434191) -->
-    <skip />
-    <string name="notification_missedCallTitle" msgid="7554385905572364535">"Clom manchentà"</string>
-    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Cloms manchentads"</string>
-    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> cloms manchentads"</string>
-    <string name="notification_missedCallTicker" msgid="504686252427747209">"Clom manchentà da <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Clom actual (<xliff:g id="DURATION">%s</xliff:g>)"</string>
-    <string name="notification_on_hold" msgid="3480694969511790465">"Spetgant"</string>
-    <string name="notification_incoming_call" msgid="2820429205043529642">"Clom entrant"</string>
-    <string name="notification_voicemail_title" msgid="8933468752045550523">"Nov messadi vocal"</string>
-    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"Novs messadis vocals (<xliff:g id="COUNT">%d</xliff:g>)"</string>
-    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"Cumponer <xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g>"</string>
-    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Numer da mailbox nunenconuschent"</string>
-    <string name="notification_network_selection_title" msgid="4224455487793492772">"nagin servetsch"</string>
-    <string name="notification_network_selection_text" msgid="2607085729661923269">"La rait tschernida (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) n\'è betg disponibla"</string>
-    <string name="incall_error_power_off" msgid="6550191216405193368">"Deactivai l\'emprim il modus d\'aviun per pudair telefonar."</string>
-    <string name="incall_error_emergency_only" msgid="4678640422710818317">"Betg registrà en la rait."</string>
-    <string name="incall_error_out_of_service" msgid="8587993036435080418">"Rait mobila betg disponibla."</string>
-    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Betg telefonà. Il numer cumponì n\'è betg valid."</string>
-    <string name="incall_error_call_failed" msgid="4313552620858880999">"Il clom n\'è betg vegnì exequì."</string>
-    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iniziar la sequenza MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Lantschar la sequenza da codes da funcziun..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Quest servetsch na vegn betg sustegnì."</string>
-    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Impussibel da midar tranter cloms."</string>
-    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Impussibel da separar il clom."</string>
-    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Impussibel da renviar il clom."</string>
-    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"Impussibel da lantschar ina conferenza da telefon."</string>
-    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"Impussibel da refusar il clom."</string>
-    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"Impussibel da render disponibel il(s) clom(s)."</string>
-    <!-- no translation found for incall_call_type_label_sip (2310958283037924371) -->
-    <skip />
-    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Clom d\'urgenza"</string>
-    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Activaziun dal signal radio..."</string>
-    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Territori senza rait, empruvar anc ina giada..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Betg exequì il clom. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> n\'è betg in numer d\'urgenza!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Betg telefonà. Cumponi in numer d\'urgenza!"</string>
-    <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilisai la tastatura per cumponer il numer"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Tastas sonoras"</string>
-    <string name="onscreenHoldText" msgid="2285258239691145872">"Far spetgar"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Reprender"</string>
-    <string name="onscreenEndCallText" msgid="4403855834875398585">"Serrar"</string>
-    <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Tastatura"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Zuppentar"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Autpledader"</string>
-    <string name="onscreenMuteText" msgid="5011369181754261374">"Nagin tun"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
-    <string name="onscreenAddCallText" msgid="5140385634712287403">"Agiuntar in clom"</string>
-    <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Fusiunar ils cloms"</string>
-    <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Stgamiar"</string>
-    <string name="onscreenManageCallsText" msgid="5473231160123254154">"Administrar ils cloms"</string>
-    <!-- no translation found for onscreenManageConferenceText (6485935856534311346) -->
-    <skip />
-    <!-- no translation found for onscreenAudioText (1710087112800041743) -->
-    <skip />
-    <string name="importSimEntry" msgid="6614358325359736031">"Importar"</string>
-    <string name="importAllSimEntries" msgid="1503181169636198673">"Importar tuts"</string>
-    <string name="importingSimContacts" msgid="7374056215462575769">"Importar contacts SIM"</string>
-    <string name="importToFDNfromContacts" msgid="2130620207013368580">"Importar ord contacts"</string>
-    <string name="hac_mode_title" msgid="8740268574688743289">"Agids auditivs"</string>
-    <string name="hac_mode_summary" msgid="6833851160514929341">"Activar la cumpatibilitad dal servetsch d\'agid auditiv"</string>
-  <string-array name="tty_mode_entries">
-    <item msgid="512950011423868021">"Modus TTY deactivà"</item>
-    <item msgid="3971695875449640648">"TTY cumplet"</item>
-    <item msgid="1937509904407445684">"TTY HCO"</item>
-    <item msgid="5644925873488772224">"TTY VCO"</item>
-  </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Text ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Tuns DTMF"</string>
-    <string name="dtmf_tones_summary" msgid="3351820372864020331">"Definir la durada dals tuns DTMF"</string>
-  <string-array name="dtmf_tone_entries">
-    <item msgid="899650777817315681">"Normal"</item>
-    <item msgid="2883365539347850535">"Lungs"</item>
-  </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Messadi da rait"</string>
-    <string name="ota_title_activate" msgid="8616918561356194398">"Activar Voss telefonin"</string>
-    <string name="ota_touch_activate" msgid="6553212803262586244">"Vus stuais far in clom spezial per activar il servetsch da telefon. "\n\n"Smatgai sin «Activar» e tadlai las instrucziuns che As permettan dad activar Voss telefonin."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Smatgai sin Activar per exequir in clom spezial che vegn ad activar Voss telefon sin la rait mobila da Voss gestiunari da la rait. Silsuenter pudais Vus telefonar ed As connectar a raits da datas mobilas."</string>
-    <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Sursiglir l\'activaziun?"</string>
-    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Sche Vus cuntinuais senza activar Voss telefonin na pudais Vus ni telefonar, ni As connectar ad ina rait da datas mobilas. La connexiun ad ina rait WLAN resta dentant pussaivla. Vus vegnis dumandads dad activar il telefonin mintga giada cura che Vus al mettais en funcziun."</string>
-    <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Sursiglir"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Activar"</string>
-    <string name="ota_activate" msgid="1368528132525626264">"Activar"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Voss telefonin è activa!"</string>
-    <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problem cun l\'activaziun"</string>
-    <string name="ota_listen" msgid="162923839877584937">"Suandai las instrucziuns a bucca enfin che Vus udis che l\'activaziun è cumpletta."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Tastatura"</string>
-    <string name="ota_speaker" msgid="6904589278542719647">"Autpledader"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Spetgai per plaschair durant la programmaziun da Voss telefonin."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programmaziun betg reussida"</string>
-    <string name="ota_successful" msgid="1880780692887077407">"Voss telefonin è ussa activà. Il servetsch vegn activà entaifer las proximas 15 minutas."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Voss telefonin n\'ha betg pudì vegnir activà. "\n"Vus stuais forsa ir en in lieu cun meglra connexiun a la rait (datiers dad ina fanestra u en il liber). "\n\n" Reempruvai u telefonai al servetsch da clientella per vegnir a savair dapli davart autras opziuns."</string>
-    <string name="ota_spc_failure" msgid="3909983542575030796">"MEMIA BLERAS ERRURS SPC"</string>
-    <string name="ota_call_end" msgid="4537279738134612388">"Enavos"</string>
-    <string name="ota_try_again" msgid="7685477206465902290">"Reempruvar"</string>
-    <string name="ota_next" msgid="3904945374358235910">"Vinavant"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Enavos"</string>
-    <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
-    <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Modus da clom enavos d\'urgenza è activà"</string>
-    <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Modus da clom enavos d\'urgenza"</string>
-    <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"Connexiun da datas deactivada"</string>
-  <plurals name="phone_in_ecm_notification_time">
-    <item quantity="one" msgid="4866221796252472622">"Nagina connexiun da datas durant <xliff:g id="COUNT">%s</xliff:g> minuta"</item>
-    <item quantity="other" msgid="3122217344579273583">"Nagina connexiun da datas durant <xliff:g id="COUNT">%s</xliff:g> minutas"</item>
-  </plurals>
-  <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Il telefonin vegn ad esser en il modus da clom enavos d\'urgenza durant <xliff:g id="COUNT">%s</xliff:g> minuta. En quest modus na po nagina applicaziun che dovra ina connexiun da datas vegnir utilisada. Vulais Vus ussa bandunar quest modus?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Il telefonin vegn ad esser en il modus da clom enavos d\'urgenza durant <xliff:g id="COUNT">%s</xliff:g> minutas. En quest modus na po nagina applicaziun che dovra ina connexiun da datas vegnir utilisada. Vulais Vus ussa bandunar quest modus?"</item>
-  </plurals>
-  <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"L\'acziun tschernida n\'è betg disponibla en il modus da clom enavos d\'urgenza. Quest modus è anc activà durant <xliff:g id="COUNT">%s</xliff:g> minuta. Al vulais Vus ussa bandunar?"</item>
-    <item quantity="other" msgid="3489076611710869904">"L\'acziun tschernida n\'è betg disponibla sch\'il telefonin è en il modus d\'urgenza.Quest modus è anc activà durant <xliff:g id="COUNT">%s</xliff:g> minutas. Al vulais Vus ussa bandunar?"</item>
-  </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"L\'acziun tschernida n\'è betg disponibla durant in clom d\'urgenza."</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Bandunar il modus da clom enavos d\'urgenza"</string>
-    <string name="alert_dialog_yes" msgid="6674268047820703974">"Gea"</string>
-    <string name="alert_dialog_no" msgid="1476091437797628703">"Na"</string>
-    <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Serrar"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Parameters da mailbox"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;betg definì&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Servetsch da mailbox"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Parameters per <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
-    <string name="other_settings" msgid="3672912580359716394">"Auters parameters da clom"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Cumponer"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Telefonar cun ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Spustar a dretga per respunder"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Spustar a sanestra per deactivar il tun da scalin"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Spustar a sanestra per refusar"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Spustar a dretga per respunder e"\n"far spetgar il clom actual."</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Spustar a dretga per respunder ed"\n"interrumper il clom actual"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Spustar a dretga per respunder ed"\n"interrumper il clom spetgant"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Resposta"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Refusar"</string>
-    <string name="contactPhoto" msgid="4713193418046639466">"foto dal contact"</string>
-    <string name="goPrivate" msgid="865837794424530980">"modus privat"</string>
-    <string name="selectContact" msgid="781975788478987237">"tscherner in contact"</string>
-    <string name="sip_settings" msgid="6699045718560859691">"Parameters da clom internet"</string>
-    <!-- no translation found for sip_accounts (2097054001288457163) -->
-    <skip />
-    <!-- no translation found for sip_accounts_title (1212889069281054570) -->
-    <skip />
-    <!-- no translation found for sip_accounts_summary (6812629993146552527) -->
-    <skip />
-    <string name="sip_receive_calls" msgid="5635685570889971559">"Retschaiver cloms entrants"</string>
-    <!-- no translation found for sip_receive_calls_summary (8403613238633679184) -->
-    <skip />
-    <string name="sip_call_options" msgid="7128315120104066133">"Configurar las opziuns da clom"</string>
-    <!-- no translation found for sip_call_options_title (27433718808839672) -->
-    <skip />
-    <!-- no translation found for sip_call_options_wifi_only_title (145572394529090811) -->
-    <skip />
-    <!-- no translation found for sip_call_options_entry_1 (6556668894178520760) -->
-    <skip />
-    <!-- no translation found for sip_call_options_entry_2 (6789764029719494361) -->
-    <skip />
-    <!-- no translation found for sip_call_options_entry_3 (7474809001402649185) -->
-    <skip />
-    <!-- no translation found for sip_call_options_wifi_only_entry_1 (7423523864471650069) -->
-    <skip />
-    <!-- no translation found for auto_reg (8150163311655081599) -->
-    <skip />
-    <!-- no translation found for call_priority (8374917577270504387) -->
-    <skip />
-    <!-- no translation found for pick_outgoing_call_phone_type (5622916534828338675) -->
-    <skip />
-    <!-- no translation found for pick_outgoing_sip_phone (7012322118236208875) -->
-    <skip />
-    <!-- no translation found for remember_my_choice (7058059586169290705) -->
-    <skip />
-    <!-- no translation found for reset_my_choice_hint (8522825056755061594) -->
-    <skip />
-    <!-- no translation found for pstn_phone (8782554491484326429) -->
-    <skip />
-    <!-- no translation found for internet_phone (1147922660195095810) -->
-    <skip />
-    <!-- no translation found for no_sip_account_found_title (6266249392379373628) -->
-    <skip />
-    <!-- no translation found for no_sip_account_found (8777818244108212791) -->
-    <skip />
-    <!-- no translation found for sip_menu_add (8757508498518881500) -->
-    <skip />
-    <!-- no translation found for add_sip_account (5904858426290097611) -->
-    <skip />
-    <!-- no translation found for remove_sip_account (7645900420385682570) -->
-    <skip />
-    <string name="sip_account_list" msgid="5480058210652194306">"Contos SIP"</string>
-    <!-- no translation found for saving_account (7468818916695729968) -->
-    <skip />
-    <!-- no translation found for removing_account (5569334415898924904) -->
-    <skip />
-    <string name="sip_menu_save" msgid="5842531129356014943">"Memorisar"</string>
-    <string name="sip_menu_discard" msgid="524075892158789701">"Annullar"</string>
-    <!-- no translation found for alert_dialog_close (7759635137627626235) -->
-    <skip />
-    <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
-    <!-- no translation found for close_profile (6886968271423155284) -->
-    <skip />
-    <string name="primary_account" msgid="2229538308291934245">"Primar"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Definir quest conto sco mes conto primar"</string>
-    <!-- no translation found for primary_account_summary (7339564526372623187) -->
-    <skip />
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Parameters avanzads"</string>
-    <!-- no translation found for primary_account_summary_with (1633960536212343187) -->
-    <skip />
-    <!-- no translation found for registration_status_checking_status (3381868307694056727) -->
-    <skip />
-    <!-- no translation found for registration_status_registering (7115694971025999516) -->
-    <skip />
-    <!-- no translation found for registration_status_still_trying (1471733478935862864) -->
-    <skip />
-    <!-- no translation found for registration_status_not_receiving (5011399017106466965) -->
-    <skip />
-    <!-- no translation found for registration_status_no_data (8279587001454092132) -->
-    <skip />
-    <!-- no translation found for registration_status_no_wifi_data (6698550648571450078) -->
-    <skip />
-    <!-- no translation found for registration_status_not_running (3826034902272084289) -->
-    <skip />
-    <!-- no translation found for registration_status_done (6434927607037752239) -->
-    <skip />
-    <!-- no translation found for registration_status_failed_try_later (5214474354451220581) -->
-    <skip />
-    <!-- no translation found for registration_status_invalid_credentials (85887803757211092) -->
-    <skip />
-    <!-- no translation found for registration_status_server_unreachable (9138794150602726009) -->
-    <skip />
-    <!-- no translation found for third_party_account_summary (1069915789382987226) -->
-    <skip />
-    <!-- no translation found for sip_edit_title (489288416435014385) -->
-    <skip />
-    <!-- no translation found for sip_edit_new_title (3659149255856520385) -->
-    <skip />
-    <!-- no translation found for domain_address_title (9071787581316160480) -->
-    <skip />
-    <string name="username_title" msgid="2479375923477682328">"Num d\'utilisader"</string>
-    <string name="password_title" msgid="3323555249068171531">"Pled-clav"</string>
-    <string name="display_name_title" msgid="2459768196312249937">"Num mussà"</string>
-    <!-- no translation found for proxy_address_title (4828301345351614273) -->
-    <skip />
-    <!-- no translation found for port_title (5952939408078626657) -->
-    <skip />
-    <!-- no translation found for transport_title (8253139511847746640) -->
-    <skip />
-    <string name="send_keepalive_title" msgid="7533342573918645113">"Trametter keep-alive"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Trametter messadis SIP keep-alive"</string>
-    <!-- no translation found for auto_registration_title (3586777375420122154) -->
-    <skip />
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Registrar automaticamain il profil"</string>
-    <!-- no translation found for set_primary_title (5351892327447571451) -->
-    <skip />
-    <!-- no translation found for set_primary_summary (2219064654523258577) -->
-    <skip />
-    <!-- no translation found for advanced_settings (8350631795335495338) -->
-    <skip />
-    <!-- no translation found for auth_username_title (851473016307947120) -->
-    <skip />
-    <!-- no translation found for auth_username_summary (6782012405225938629) -->
-    <skip />
-    <!-- no translation found for default_preference_summary (868766740121667450) -->
-    <skip />
-    <!-- no translation found for display_name_summary (8636377460518225523) -->
-    <skip />
-    <!-- no translation found for optional_summary (1464058793789832411) -->
-    <skip />
-    <!-- no translation found for advanced_settings_show (4668880308290857597) -->
-    <skip />
-    <!-- no translation found for advanced_settings_hide (217398292824758079) -->
-    <skip />
-    <!-- no translation found for empty_alert (8177828109581557940) -->
-    <skip />
-    <!-- no translation found for not_a_valid_port (5750410768271782606) -->
-    <skip />
-    <!-- no translation found for no_internet_available_title (3327109242858406165) -->
-    <skip />
-    <!-- no translation found for no_wifi_available_title (747881033089378758) -->
-    <skip />
-    <!-- no translation found for no_internet_available (1100564991026313234) -->
-    <skip />
-    <!-- no translation found for no_wifi_available (3389743006886634541) -->
-    <skip />
-    <!-- no translation found for no_voip (8901474054537199865) -->
-    <skip />
-    <!-- no translation found for sip_system_decide (368030746310423471) -->
-    <skip />
-    <!-- no translation found for sip_always_send_keepalive (8192080724632877132) -->
-    <skip />
-    <!-- no translation found for not_voice_capable (2739898841461577811) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_canned_response_1 (2461606462788380215) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_canned_response_2 (4074450431532859214) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_canned_response_3 (3496079065723960450) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_canned_response_4 (1698989243040062190) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_custom_message (4911568567889429624) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_setting_title (3754000371039709383) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_setting_title_2 (6104662227299493906) -->
-    <skip />
-    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
-    <!-- no translation found for respond_via_sms_edittext_dialog_title (20379890418289778) -->
-    <skip />
-    <!-- no translation found for respond_via_sms_confirmation_format (7229149977515784269) -->
-    <skip />
-    <!-- no translation found for description_image_button_one (5502718871331943463) -->
-    <skip />
-    <!-- no translation found for description_image_button_two (4903738528222924522) -->
-    <skip />
-    <!-- no translation found for description_image_button_three (5570985408463782329) -->
-    <skip />
-    <!-- no translation found for description_image_button_four (1697520001239289074) -->
-    <skip />
-    <!-- no translation found for description_image_button_five (3450276493026943454) -->
-    <skip />
-    <!-- no translation found for description_image_button_six (2070376172268675300) -->
-    <skip />
-    <!-- no translation found for description_image_button_seven (1757351311199993371) -->
-    <skip />
-    <!-- no translation found for description_image_button_eight (4734693919020613227) -->
-    <skip />
-    <!-- no translation found for description_image_button_nine (5568534122590597040) -->
-    <skip />
-    <!-- no translation found for description_image_button_star (1976280813017254462) -->
-    <skip />
-    <!-- no translation found for description_image_button_zero (4211255756866893605) -->
-    <skip />
-    <!-- no translation found for description_image_button_pound (1716041284529917866) -->
-    <skip />
-    <!-- no translation found for description_search_button (239929880630534731) -->
-    <skip />
-    <!-- no translation found for description_dial_button (7459705245418435351) -->
-    <skip />
-    <!-- no translation found for description_delete_button (4015842181592283903) -->
-    <skip />
-    <!-- no translation found for accessibility_speakerphone_enabled (1988512040421036359) -->
-    <skip />
-    <!-- no translation found for accessibility_call_muted (2776111226185342220) -->
-    <skip />
-    <!-- no translation found for description_target_answer (7205604197797472471) -->
-    <skip />
-    <!-- no translation found for description_target_send_sms (2098326025587950144) -->
-    <skip />
-    <!-- no translation found for description_target_decline (4789834364389731957) -->
-    <skip />
-</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 094c1d135..4e5debc48 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Număr privat"</string>
     <string name="payphone" msgid="1931775086311769314">"Telefon public"</string>
     <string name="onHold" msgid="9035493194749959955">"În aşteptare"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Apel curent"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Linie ocupată"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Reţea ocupată"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Fără răspuns, durata a expirat"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server neaccesibil"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numărul nu poate fi contactat"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nume de utilizator sau parolă incorecte"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Apelat din afara reţelei"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Apelat din afara reţelei"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Eroare de server. Încercaţi din nou mai târziu."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Niciun semnal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Limită ACM depăşită"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio oprit"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Niciun card SIM sau eroare de SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Nu există SIM sau eroare de SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"În afara ariei de acoperire"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Apelurile trimise sunt restricţionate de FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Nu puteţi efectua apeluri de ieşire în timp ce restricţionarea de apel este activă."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Nu puteţi efectua apeluri de ieşire în timp ce blocarea apelurilor este activă."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Toate apelurile sunt restricţionate de controlul de acces."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Apelurile de urgenţă sunt restricţionate de controlul de acces."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Apelurile normale sunt restricţionate de controlul de acces."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: telefon blocat până la următoarea repornire."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: apel abandonat."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: apel interceptat."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: reordonaţi."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: opţiune serviciu respinsă."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: încercaţi din nou comanda."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: acces eşuat."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: anticipat."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Sunt posibile doar apelurile de urgenţă."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Număr nevalid"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Număr nevalid"</string>
     <string name="confCall" msgid="1904840547188336828">"Teleconferinţă"</string>
     <string name="call_lost" msgid="317670617901479594">"Apelul s-a pierdut."</string>
-    <string name="retry" msgid="8462986804300767852">"Încercaţi din nou"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Apel pierdut"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Cod MMI pornit"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Se rulează codul USSD..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Cască cu fir"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Trimiteţi următoarele tonuri?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Se trimit tonuri"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Se trimit tonuri"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Trimiteţi"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Da"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Nu"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Înlocuiţi metacaracterul cu"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Înlocuiţi metacaracterul cu"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Lipseşte numărul mesageriei vocale"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Niciun număr de mesagerie vocală nu este stocat pe cardul SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Adăugaţi numărul"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Se încarcă..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Tastaţi codul PIN pentru a debloca cardul SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"Card SIM deblocat"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Codul PIN nou pentru cardul SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Introduceţi din nou codul PIN al cardului SIM pentru confirmare"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Codul PIN tastat pentru cardul SIM nu se potriveşte. Încercaţi din nou."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Tastaţi codul PUK pentru a debloca cardul SIM"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Cod PUK incorect!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Continuaţi"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Cardul dvs. SIM a fost deblocat. Telefonul dvs. se deblochează..."</string>
     <string name="label_ndp" msgid="780479633159517250">"Codul PIN de deblocare a reţelei SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Deblocaţi"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Se solicită deblocarea reţelei..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Cererea de deblocare a reţelei a eşuat."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Reţeaua a fost deblocată."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Setările apelului GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Setările apelului CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Numele punctelor de acces"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Setări suplimentare numai pentru apelurile CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Setările serviciului de reţea"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"ID apelant"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Se încarcă setările…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Număr ascuns în apelurile de ieşire"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Numărul afişat în apelurile de ieşire"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Utilizaţi setările prestabilite ale operatorului, pentru a vă afişa numărul în apelurile de ieşire"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Număr pentru redirecţionare dacă este ocupat"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Se efectuează redirecţionarea la <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Dezactivat"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Operatorul dvs. nu acceptă ca redirecţionarea apelurilor să fie dezactivată atunci când telefonul dvs. este ocupat."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operatorul dvs. nu acceptă ca redirecţionarea apelurilor să fie dezactivată atunci când telefonul dvs. este ocupat."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Redirecţionaţi când nu se răspunde"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Număr pentru redirecţionare dacă nu se răspunde"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Se efectuează redirecţionarea la <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Dezactivat"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Operatorul dvs. nu acceptă ca redirecţionarea apelurilor să fie dezactivată atunci când telefonul dvs. nu răspunde."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operatorul dvs. nu acceptă ca redirecţionarea apelurilor să fie dezactivată atunci când telefonul dvs. nu răspunde."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Redirecţionaţi dacă telefonul nu este accesibil"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Număr de redirecţionare dacă telefonul nu este accesibil"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Se efectuează redirecţionarea la <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Dezactivat"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Operatorul dvs. nu acceptă ca redirecţionarea apelurilor să fie dezactivată atunci când telefonul nu este accesibil."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Operatorul dvs. nu acceptă ca redirecţionarea apelurilor să fie dezactivată atunci când telefonul nu este accesibil."</string>
     <string name="updating_title" msgid="6146755386174019046">"Setări apel"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Eroare în setările de apel"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Se citesc setările..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Se revine la setări..."</string>
     <string name="response_error" msgid="6674110501330139405">"Răspuns neaşteptat de la reţea."</string>
     <string name="exception_error" msgid="7027667130619518211">"Eroare de reţea sau de card SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Operaţiile sunt permise numai cu numerele pentru apelări restricţionate."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Vă recomandăm să activaţi semnalul radio, înainte de a vizualiza aceste setări."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Setarea Numere cu apelări restricţionate din aplicaţia Telefon este activată. Ca rezultat, unele funcţii legate de apelare nu pot fi utilizate."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Activaţi semnalul radio, înainte de a vizualiza aceste setări."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Activaţi"</string>
     <string name="disable" msgid="7274240979164762320">"Dezactivaţi"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Ascundeţi numărul"</item>
     <item msgid="1108394741608734023">"Afişaţi numărul"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Salvaţi"</string>
     <string name="vm_changed" msgid="380744030726254139">"Număr mesagerie vocală modificat."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Schimbarea numărului mesageriei vocale a eşuat."\n"Contactaţi operatorul dvs. în caz că această problemă persistă."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Schimbarea numărului de redirecţionare a eşuat."\n"Contactaţi-vă operatorul dacă această problemă persistă."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Nu s-a putut schimba numărul de mesagerie vocală."\n"Contactaţi operatorul în cazul în care această problemă persistă."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Nu s-a putut schimba numărul de redirecţionare."\n"Contactaţi operatorul dvs. în cazul în care această problemă persistă."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Nu s-au putut prelua şi salva setările actuale ale numărului de redirecţionare."\n"Doriţi să comutaţi oricum către un nou furnizor de servicii?"</string>
     <string name="no_change" msgid="3186040086622435212">"Nicio schimbare efectuată."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Alegeţi serviciul de mesagerie vocală"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Căutaţi reţele"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Eroare la căutarea reţelelor."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Se înregistrează pe <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Cardul dvs. SIM nu permite conexiunea la această reţea."</string>
-    <string name="connect_later" msgid="500090982903469816">"Nu se poate conecta la această reţea, în acest moment. Încercaţi din nou mai târziu."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Cardul dvs. SIM nu permite conexiunea la această reţea."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Nu se poate efectua conectarea la această reţea chiar acum. Încercaţi din nou mai târziu."</string>
     <string name="registration_done" msgid="495135664535876612">"Înregistrat în reţea."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Selectaţi un operator de reţea"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Alegeţi un operator de reţea"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Căutaţi toate reţelele disponibile"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Selectaţi automat"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Selectaţi automat reţeaua preferată"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Înregistrare automată..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Selectaţi în mod automat"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Selectaţi în mod automat reţeaua preferată"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Înregistrare automată..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Mod reţea"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Schimbaţi modul de operare a reţelei"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Mod de reţea preferat"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Mod de reţea preferat: numai EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Mod de reţea preferat: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Numai EvDo"</item>
     <item msgid="454610224530856274">"CDMA fără EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA/EvDo automat"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA automat"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo automat"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA automat"</item>
     <item msgid="5189164180446264504">"Numai WCDMA"</item>
     <item msgid="5714714953966979187">"Doar GSM"</item>
-    <item msgid="4775796025725908913">"GSM/WCDMA preferată"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA preferată"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Date activate"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Roaming de date"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Conectaţi-vă la serviciile de date în roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Conectaţi-vă la serviciile de date în roaming"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Aţi pierdut conectivitatea la date deoarece aţi părăsit reţeaua de domiciliu neavând activat roamingul."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Aţi pierdut conectivitatea la date, deoarece aţi părăsit reţeaua de domiciliu neavând activat roamingul de date."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Permiteţi roamingul de date? Puteţi acumula taxe considerabile pentru roaming!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Opţiuni GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Opţiuni CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Rata de utilizare a datelor"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Politica operatorului de date"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Datele utilizate în perioada curentă"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Perioada de utilizare a datelor"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Politica ratei de transfer a datelor"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ din ciclul trecut"\n"Perioada următoare începe în <xliff:g id="USED_1">%2$d</xliff:g> (de) zile (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Rata de transfer a datelor se reduce la <xliff:g id="USED">%1$d</xliff:g> Kb/s, dacă limita de utilizare este depăşită."</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Mai multe informaţii despre politica de utilizare a datelor aplicată de operatorul dvs. de telefonie mobilă"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Transmisie celulară a mesajelor SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Transmisie celulară a mesajelor SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Transmisie celulară a mesajelor SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Transmisie celulară a mesajelor SMS activată"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Coreeană"</item>
     <item msgid="1933212028684529632">"Chineză"</item>
     <item msgid="1908428006803639064">"Ebraică"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Limbi"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Previziuni meteo locale"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Oportunităţi de angajare"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Oportunităţi de angajare activate"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Oportunităţi de angajare dezactivate"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Medicină, sănătate şi spitale"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Medicină, sănătate şi spitale activate"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Medicină, sănătate şi spitale dezactivate"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Medicină, sănătate şi spitale"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Medicină, sănătate şi spitale activate"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Medicină, sănătate şi spitale dezactivate"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Ştiri din tehnologie"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Ştiri din tehnologie activate"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Ştiri din tehnologie dezactivate"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"Numai WCDMA"</item>
     <item msgid="8776934131146642662">"Doar GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA recomandat)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Utilizaţi doar reţele 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Economisiţi bateria"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Selectaţi sistemul"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Schimbaţi modul de roaming CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Schimbaţi modul de roaming CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Selectaţi sistemul"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Doar domiciliu"</item>
     <item msgid="1205664026446156265">"Automat"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Mod roaming CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Schimbaţi modul de roaming CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Mod roaming CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Numai reţele de domiciliu"</item>
-    <item msgid="8174642753290624634">"Reţele afiliate"</item>
-    <item msgid="2241951431403168661">"Orice reţea"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Abonament CMDA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Preferinţe reţea CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Neimplementat încă!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Preferinţele reţelei CDMA"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"Doar CDMA"</item>
     <item msgid="2683555124647197574">"Numai EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Abonament CMDA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Comutaţi între RUIM/SIM şi NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"abonament"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Activaţi dispozitivul"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Configuraţi serviciul de date"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Gestionaţi numerele cu apelări restricţionate"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Schimbaţi codul PIN pentru accesul FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Gestionaţi lista numerelor de telefon"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Confidenţialitate voce"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Confidenţialitate voce"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Activaţi modul avansat de confidenţialitate"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Mod TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Activaţi modul TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Mod TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Setaţi modul TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Reîncercare automată"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Activaţi modul Reîncercare automată"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Reîncercare automată"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Activaţi modul Reîncercare automată"</string>
     <string name="menu_add" msgid="1882023737425114762">"Adăugaţi o persoană în agendă"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Modificaţi informaţiile despre persoana din agendă"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Ştergeţi persoana din agendă"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Introduceţi codul PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Introduceţi codul PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Nume"</string>
     <string name="number" msgid="7905950798349903858">"Număr"</string>
     <string name="save" msgid="4094274636321939086">"Salvaţi"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Ştergeţi numărul cu apelări restricţionate"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Se şterge numărul cu apelări restricţionate..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Numărul cu apelări restricţionate a fost şters."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN nu s-a actualizat: codul PIN introdus este incorect."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN nu s-a actualizat: numărul nu poate depăşi 20 de cifre."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN nu a fost actualizat, deoarece aţi introdus un cod PIN incorect."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN nu a fost actualizat, deoarece numărul nu poate depăşi 20 de cifre."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Numărul FDN nu a fost actualizat. Codul PIN2 a fost incorect sau numărul de telefon a fost respins."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Se citeşte de pe cardul SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Nicio persoană în agenda de pe cardul dvs. SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Selectaţi persoanele din agendă care se importă"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Pentru a importa contactele de pe cartela SIM, vă rugăm să dezactivaţi modul Avion."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Pentru a importa agenda de pe cardul SIM, dezactivaţi mai întâi modul Avion."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Activaţi/dezactivaţi codul PIN al cardului SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Schimbaţi codul PIN pentru SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"Codul PIN pentru cardul SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Codul PIN vechi"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Cod PIN nou"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Confirmaţi noul cod PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Codul PIN vechi pe care l-aţi tastat nu este corect. Încercaţi din nou."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Codurile PIN introduse nu se potrivesc. Încercaţi din nou."</string>
+    <string name="badPin" msgid="8955102849303984935">"Codul PIN vechi pe care l-aţi introdus nu este corect. Încercaţi din nou."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Codurile PIN introduse nu se potrivesc. Încercaţi din nou."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Introduceţi un cod PIN alcătuit din 4 până la 8 cifre."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Dezactivaţi codul PIN al cardului SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Activaţi codul PIN al cardului SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Aşteptaţi..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"Cod PIN activat pentru cardul SIM"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"Codul PIN al cardului SIM este dezactivat"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Codul PIN introdus a fost incorect"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"Codul PIN pentru SIM a fost modificat"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"Cod PIN activat pentru cardul SIM."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"Codul PIN al cardului SIM este dezactivat."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Codul PIN introdus a fost incorect."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"Codul PIN pentru SIM a fost modificat."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Parolă incorectă, SIM blocat! Se solicită PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Codul PIN2 vechi"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Cod PIN2 nou"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Confirmaţi noul cod PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Codul PUK2 introdus nu este corect. Încercaţi din nou."</string>
-    <string name="badPin2" msgid="515218795152422178">"Vechiul cod PIN2 introdus nu este corect. Încercaţi din nou."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Codurile PIN2 introduse nu se potrivesc. Încercaţi din nou."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Codul PUK2 introdus nu este corect. Încercaţi din nou."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Vechiul cod PIN2 introdus nu este corect. Încercaţi din nou."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Codurile PIN2 introduse nu se potrivesc. Încercaţi din nou."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Introduceţi un cod PIN2 format din 4-8 cifre."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Introduceţi un cod PUK2 format din 8 cifre."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"Codul PIN2 a fost schimbat"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"Codul PIN2 a fost schimbat."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Introduceţi codul PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Parolă incorectă, schimbaţi codul PIN2 şi încercaţi din nou!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Parolă incorectă, SIM blocat! Se solicită PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Parolă incorectă. Schimbaţi codul PIN2 şi încercaţi din nou."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Parolă incorectă, SIM blocat. Se solicită codul PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Terminat"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Teleconferinţă <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Înapoi la apel"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Continuaţi fără cardul SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Niciun card SIM găsit în telefonul dvs. Introduceţi unul!"</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Renunţaţi"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Deblocaţi"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Se autentifică codul PIN..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Număr mesagerie vocală"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Apelează"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Se încearcă din nou"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Teleconferinţă"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Apel de intrare"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Apel CDMA în aşteptare"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Apel încheiat"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"În aşteptare"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Se închide telefonul"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Apeluri nepreluate"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> (de) apeluri nepreluate"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Apel nepreluat de la <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Apel curent (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Apel în desfăşurare"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"În aşteptare"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Apel de intrare"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Mesaj vocal nou"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Număr mesagerie vocală necunoscut"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Fără serviciu"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Reţeaua selectată (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nu este disponibilă"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Încheiaţi apelul"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Sunaţi înapoi"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mesaj"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Pentru a efectua un apel, mai întâi dezactivaţi modul Avion."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Neînregistrat în reţea."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Reţeaua mobilă nu este disponibilă."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Apelul nu s-a trimis; niciun număr valid introdus."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Apelul nu a fost trimis."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Se porneşte secvenţa MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Se porneşte secvenţa de cod a funcţiei..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Serviciu neacceptat."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Apelurile nu pot fi comutate."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Apelul nu poate fi separat."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Apel de urgenţă"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Se activează semnalul radio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"În afara ariei de serviciu. Se încearcă din nou..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Apelul nu s-a trimis. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nu este un număr de urgenţă!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Apelul nu s-a trimis. Apelaţi un număr de urgenţă!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Apelul nu s-a trimis. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nu este un număr de urgenţă!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Apelul nu s-a trimis. Apelaţi un număr de urgenţă!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Utilizaţi tastatura pentru a forma"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Tastatură tactilă cu tonuri sonore"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Reţineţi"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Reluaţi"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Terminat"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Tastatură numerică"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Ascundeţi"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Difuzor"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Dezactivaţi sunetul"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Adăugaţi un apel"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Îmbinaţi apelurile"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Schimbaţi"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Text ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Tonuri DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Tonuri DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Setaţi lungimea tonurilor DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normală"</item>
     <item msgid="2883365539347850535">"Lung"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Mesaj de reţea"</string>
+    <string name="network_message" msgid="4483886461245213802">"Mesaj de reţea"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Activaţi-vă telefonul"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Pentru a vă activa serviciul de telefonie, trebuie să efectuaţi un apel special. "\n\n"După ce apăsaţi „Activaţi”, ascultaţi instrucţiunile furnizate pentru a vă activa telefonul."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Atingeţi „Activaţi” pentru a plasa un apel special care vă activează telefonul în reţeaua mobilă a operatorului dvs. Astfel, puteţi plasa apeluri şi vă puteţi conecta la reţele de date mobile."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Omiteţi activarea?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Dacă omiteţi activarea, nu puteţi efectua apeluri şi nici nu vă puteţi conecta la o reţea de date mobilă (deşi vă puteţi conecta la reţele Wi-Fi). Până veţi activa telefonul, vi se va solicita să-l activaţi de fiecare dată când îl porniţi."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Omiteţi"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Activaţi"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Activaţi"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Telefonul este activat!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefonul este activat."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problemă de activare"</string>
     <string name="ota_listen" msgid="162923839877584937">"Urmăriţi instrucţiunile rostite până când veţi auzi că activarea este finalizată."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Tastatură"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Difuzor"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Aşteptaţi, telefonul dvs. se programează..."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programarea nu a reuşit"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Aşteptaţi, telefonul dvs. se programează."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programarea nu a reuşit"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Telefonul dvs. este acum activat. Poate să dureze până la 15 minute până la pornirea serviciului."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Telefonul dvs. nu s-a activat. "\n"Trebuie să găsiţi o arie cu acoperire mai bună (lângă fereastră sau afară). "\n\n"Încercaţi din nou sau apelaţi serviciul de clienţi pentru mai multe opţiuni."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Telefonul dvs. nu s-a activat. "\n"Vă recomandăm să găsiţi o zonă cu acoperire mai bună (lângă fereastră sau afară). "\n\n"Pentru mai multe opţiuni, încercaţi din nou sau apelaţi serviciul pentru clienţi."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ERORI DE DEPĂŞIRE SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Înapoi"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Încercaţi din nou"</string>
     <string name="ota_next" msgid="3904945374358235910">"Înainte"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Înapoi"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"S-a activat modul de apelare inversă de urgenţă"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Mod de apelare inversă de urgenţă"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"Nicio conexiune de date pentru <xliff:g id="COUNT">%s</xliff:g> (de) minute"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Telefonul va fi în mod de apelare inversă de urgenţă pentru <xliff:g id="COUNT">%s</xliff:g> (de) minute. În acest timp nu poate fi utilizată nicio aplicaţie care necesită o conexiune de date. Doriţi să ieşiţi acum?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Acest telefon va fi în modul de apelare inversă de urgenţă pentru <xliff:g id="COUNT">%s</xliff:g> (de) minute. În acest timp nu poate fi utilizată nicio aplicaţie care necesită o conexiune de date. Doriţi să ieşiţi acum?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Telefonul va fi în modul Apelare inversă de urgenţă pentru <xliff:g id="COUNT">%s</xliff:g> minut. Cât timp se află în acest mod nu puteţi folosi aplicaţiile care utilizează o conexiune de date. Doriţi să ieşiţi acum?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Telefonul va fi în modul Apelare inversă de urgenţă pentru <xliff:g id="COUNT">%s</xliff:g> (de) minute. Cât timp se află în acest mod nu puteţi folosi aplicaţiile care utilizează o conexiune de date. Doriţi să ieşiţi acum?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Acţiunea selectată nu este disponibilă în modul de apelare inversă de urgenţă. Telefonul va fi în acest mod pentru <xliff:g id="COUNT">%s</xliff:g> (de) minute. Doriţi să ieşiţi acum?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Acţiunea selectată nu este disponibilă în modul de apelare inversă de urgenţă. Telefonul va fi în acest mod pentru <xliff:g id="COUNT">%s</xliff:g> (de) minute. Doriţi să ieşiţi acum?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Acţiunea selectată nu este disponibilă în modul Apelare inversă de urgenţă. Telefonul va rămâne în acest mod pentru <xliff:g id="COUNT">%s</xliff:g> minut. Doriţi să ieşiţi acum?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Acţiunea selectată nu este disponibilă în modul Apelare inversă de urgenţă. Telefonul va rămâne în acest mod pentru <xliff:g id="COUNT">%s</xliff:g> (de) minute. Doriţi să ieşiţi acum?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Acţiunea selectată nu este disponibilă în timpul efectuării unui apel de urgenţă"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Se iese din modul de apelare inversă de urgenţă"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Acţiunea selectată nu este disponibilă în timpul efectuării unui apel de urgenţă."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Se iese din modul Apelare inversă de urgenţă"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Da"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Nu"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Renunţaţi"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Setările mesageriei vocale"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;nesetat&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Serviciul de mesagerie vocală"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Setări pentru <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Servicii"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Configurare"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nesetat&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Alte setări de apel"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Apelaţi"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Se apelează prin ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Glisaţi la dreapta pentru a răspunde"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Glisaţi la stânga pentru a dezactiva soneria"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Glisaţi la stânga pentru a respinge"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Glisaţi la dreapta pentru a răspunde şi"\n"reţineţi apelul activ"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Glisaţi la dreapta pentru a răspunde şi"\n"terminaţi apelul activ"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Glisaţi la dreapta pentru a răspunde şi"\n"terminaţi apelul în aşteptare"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Răspuns"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Refuzaţi"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Se apelează prin <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"fotografie persoană din agendă"</string>
     <string name="goPrivate" msgid="865837794424530980">"trecerea la modul privat"</string>
     <string name="selectContact" msgid="781975788478987237">"selectarea unei persoane din agendă"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Setări pentru apeluri prin internet"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Conturi pentru apelare prin internet (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Conturi"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Gestionaţi conturile pentru apelare prin internet (SIP) şi starea acestora"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Primiţi apeluri de intrare"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Reduce durata de funcţionare a bateriei"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Configuraţi opţiunile pentru apeluri"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Utilizaţi apelarea prin internet"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Utilizaţi apelarea prin internet (numai Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Pentru toate apelurile, când reţeaua de date este disponibilă"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Numai pentru apeluri prin internet"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Întrebare la fiecare apel"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Pentru toate apelurile"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Înregistrare automată"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Apel de ieşire prin SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Efectuaţi apel"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Utilizaţi contul pentru apelare prin internet:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Utilizaţi întotdeauna pentru a efectua apeluri prin internet"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Puteţi utiliza Setările pentru apeluri dacă doriţi să editaţi contul pentru apelare prin internet pe care îl utilizaţi în mod prestabilit atunci când efectuaţi apeluri, setând un cont diferit din Setările pentru apelarea prin internet"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Puteţi să schimbaţi contul de apelare prin internet pe care îl utilizaţi în mod prestabilit, din ecranul Telefon &gt; Setări &gt; Setări apeluri prin internet &gt; Conturi."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Apel de pe mobil"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Apel prin internet"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Nu există un cont pentru apelare prin internet"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Nu există conturi pentru apelarea prin internet pe acest telefon. Adăugaţi unul acum?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Nu există conturi de apelare prin internet pe acest telefon. Doriţi să adăugaţi unul acum?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Adăugaţi"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Adăugaţi un cont"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Eliminaţi contul"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Conturi SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Se salvează contul..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Se elimină contul..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Se salvează contul..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Se elimină contul..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Salvaţi"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Renunţaţi"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Închideţi profilul"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Închideţi"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Principal"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Doresc ca acesta să fie contul meu principal"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Utilizat pentru apelurile de ieşire"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Setări avansate"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Cont principal. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Se verifică starea..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Se efectuează înregistrarea..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Se încearcă în continuare..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Nu se primesc apeluri"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Înregistrarea contului s-a oprit, deoarece nu există conexiune la internet"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Înregistrarea contului s-a oprit, deoarece nu există conexiune Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Înregistrarea contului nu a reuşit"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Primire apeluri"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Se înregistrează..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Se încearcă în continuare..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Nu se primesc apeluri."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Înregistrarea contului s-a oprit, deoarece nu există conexiune la internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Înregistrarea contului s-a oprit, deoarece nu există conexiune Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Înregistrarea contului nu a reuşit."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Se primesc apeluri."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Înregistrarea contului nu a reuşit: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); se va încerca mai târziu"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Înregistrarea contului nu a reuşit: nume de utilizator sau parolă incorecte"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Înregistrarea contului nu a reuşit: verificaţi numele serverului"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Acest cont este utilizat în prezent de aplicaţia <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Înregistrarea contului nu a reuşit: nume de utilizator sau parolă incorectă."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Înregistrarea contului nu a reuşit: verificaţi numele serverului."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Acest cont este utilizat în prezent de aplicaţia <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Detalii cont SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Detalii cont SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Server"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Numărul portului"</string>
     <string name="transport_title" msgid="8253139511847746640">"Tip de transport"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Trimiteţi mesaje keep-alive"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Trimiteţi mesaje keep-alive SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Înregistrare automată"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Înregistraţi profilul în mod automat"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Setaţi drept cont principal"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Utilizat pentru apelurile de ieşire"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Setări opţionale"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Opţional&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Atingeţi pentru a le afişa pe toate"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Atingeţi pentru a le ascunde pe toate"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> este obligatoriu şi nu poate fi lăsat necompletat"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Numărul portului trebuie să fie cuprins între 1000 şi 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Câmpul <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> este obligatoriu şi nu poate fi lăsat necompletat."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Numărul portului trebuie să fie cuprins între 1000 şi 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Nu există conexiune la internet"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Nu există conexiune Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Pentru a efectua un apel prin internet, verificaţi mai întâi conexiunea la internet"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Trebuie să fiţi conectat(ă) la o reţea Wi-Fi pentru a efectua apeluri prin internet (utilizaţi setările pentru Wireless şi reţea)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Pentru a efectua un apel prin internet, verificaţi mai întâi conexiunea la internet."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Trebuie să fiţi conectat(ă) la o reţea Wi-Fi pentru a efectua apeluri prin internet (utilizaţi setările pentru Reţele wireless)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Apelarea prin internet neacceptată"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automat"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Se trimite întotdeauna"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Te sun imediat înapoi."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Te sun mai târziu."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Nu pot acum. Vorbim mai târziu?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Mesaj personalizat..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Mesaj personalizat"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Răspunsuri rapide"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Editaţi răspunsurile rapide"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"stea"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"diez"</string>
-    <string name="description_search_button" msgid="239929880630534731">"căutare"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"apelare"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Difuzor activat."</string>
@@ -713,11 +613,46 @@
     <string name="description_target_answer" msgid="7205604197797472471">"Răspundeţi"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Trimiteţi SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Refuzaţi"</string>
-    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrare"</string>
-    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrare"</string>
+    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibraţii"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibraţii"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ton de apel"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Întotdeauna"</item>
     <item msgid="1595097872875714252">"Numai când profilul este Silenţios"</item>
     <item msgid="1458182414036878616">"Niciodată"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Ton de sonerie telefon"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrează când sună"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tonuri la ating. tastaturii pt. apelare"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ton de apel"</string>
+    <string name="mwi_notification_title">"Indicator Mesaj în Aşteptare"</string>
+  <string name="mwi_notification_summary">"Afişaţi notificările indicatorului în aşteptare pentru mesageria vocală"</string>
+  <string name="preferred_network_mode_lte_gsm_summary">"Mod reţea preferat: LTE / GSM/WCDMA"</string>
+  <string name="preferred_network_mode_lte_cdma_evdo_summary">"Mod reţea preferat: LTE / CDMA / EvDo"</string>
+  <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">"Mod reţea preferat: LTE / CMDA / EvDo / GSM/WCDMA"</string>
+  <string-array name="preferred_network_mode_choices_lte_gsm">
+    <item>"LTE/GSM/WCDMA"</item>
+    <item>"GSM/WCDMA preferat"</item>
+  </string-array>
+  <string name="national_roaming">"Roaming de date naţional"</string>
+  <string name="national_roaming_enable">"Serviciile de date în roaming naţional activate"</string>
+  <string name="national_roaming_disable">"Serviciile de date în roaming naţional dezactivate"</string>
+  <string name="dialer_ui_settings_title">"Setări tast. numerică"</string>
+  <string name="dialer_ui_settings_summary">"Setări pentru tastatura numerică"</string>
+  <string name="perm_change_mobile_network">"Modificaţi reţeaua (2G/3G)"</string>
+  <string name="perm_change_mobile_network_desc">"Aplicația cu această permisiune poate, în orice moment, schimba între datele 2G şi 3G. 3G este mai rapid, consumă mai multă baterie și vă poate costa de asemenea, mai mulți bani."</string>
+  <string name="noise_suppression_title">"Suprimare zgomot"</string>
+  <string name="noise_suppression_summary">"Activaţi suprimare zgomot pentru apeluri"</string>
+  <string name="phone_number_label">"Nr. meu de telefon"</string>
+  <string name="phone_number_summary">"Setați numărul de telefon pentru acest dispozitiv"</string>
+  <string name="advanced_setting">"Setări Avansate"</string>
+  <string name="keep_proximity_sensor_on">"Păstraţi sensorul de apropiere activat"</string>
+  <string name="keep_proximity_sensor_on_sum">"Nu dezactivaţi senzorul de apropiere în timpul apelurilor utilizând un set de căști"</string>
+  <string name="lockscreen_if_call_ends_with_screenoff">"Blocare la sfârşitul apelului"</string>
+  <string name="lockscreen_if_call_ends_with_screenoff_sum">"Blocare automată când un apel i-a sfârşit şi ecranul este deconectat"</string>
+  <string name="vibrate_outgoing">"Vibrare la răspuns"</string>
+  <string name="vibrate_45">"Vibrare fiecare 45 de secunde"</string>
+  <string name="vibrate_45_sum">"Vibrare la fiecare a 45-a secundă a unui minut în timpul apelului de ieşire"</string>
+  <string name="vibrate_hangup">"Vibrare la sfârşitul apelului"</string>
+  <string name="vibrate_call_waiting">"Vibrare apel în aşteptare"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9d18be201..946d4ec76 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -18,46 +18,34 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="phoneAppLabel" product="tablet" msgid="8576272342240415145">"Данные для мобильных устройств"</string>
     <string name="phoneAppLabel" product="default" msgid="906161039445636857">"Телефон"</string>
-    <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Номера экстренных вызовов"</string>
+    <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"Экстренный вызов"</string>
     <string name="phoneIconLabel" msgid="2331230813161304895">"Телефон"</string>
     <string name="fdnListLabel" msgid="8630418672279521003">"Разрешенные номера"</string>
     <string name="unknown" msgid="6878797917991465859">"Неизвестный абонент"</string>
     <string name="private_num" msgid="6713286113000232309">"Скрытый номер"</string>
     <string name="payphone" msgid="1931775086311769314">"Телефон-автомат"</string>
     <string name="onHold" msgid="9035493194749959955">"Ждет ответа"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Активный вызов"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Линия занята"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Сеть занята"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Нет ответа, время ожидания истекло"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Сервер недоступен"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Номер недоступен"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Неверное имя пользователя или пароль"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Вызов из сети"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Вызов из другой сети"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Ошибка сервера. Повторите попытку позже."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Нет сигнала"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Превышен лимит ACM"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Радио выключено"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"SIM-карта не установлена или ошибка SIM-карты"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Ошибка SIM-карты или SIM-карта не установлена"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Вне зоны действия сети"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Вы можете позвонить только на телефоны из списка разрешенных номеров."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Если включена функция запрета вызовов, невозможно осуществлять исходящие вызовы."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Исходящие звонки невозможны, если включен запрет вызовов."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Все вызовы запрещены настройками доступа."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Экстренные вызовы запрещены настройками доступа."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Обычные вызовы запрещены настройками доступа."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: телефон заблокирован до следующего включения."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: вызов сброшен."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: вызов перехвачен."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: возобновить."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: не принят параметр службы."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: порядок дозвона."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: не удалось получить доступ."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: зарезервировано."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Возможны только экстренные вызовы"</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Недействительный номер"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Неверный номер"</string>
     <string name="confCall" msgid="1904840547188336828">"Конференц-вызов"</string>
     <string name="call_lost" msgid="317670617901479594">"Вызов был утрачен."</string>
-    <string name="retry" msgid="8462986804300767852">"Повторить попытку"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Вызов утрачен"</string>
     <string name="ok" msgid="3811371167865772377">"ОК"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Код MMI запущен"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Выполняется запрос USSD…"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Проводная гарнитура"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Отправить следующие тоны?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Отправка тональных сигналов"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Отправка тональных сигналов"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Позвонить"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Да"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Нет"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Заменить универсальный символ на"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Заменить универсальный символ на"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Не указан номер голосовой почты"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"На SIM-карте нет ни одного номера голосовой почты."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Добавить номер"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Идет загрузка…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Чтобы разблокировать SIM-карту, введите PIN."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM-карта разблокирована"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Новый PIN SIM-карты"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Для подтверждения введите новый PIN SIM-карты"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Введенные коды PIN SIM-карты не совпадают. Повторите попытку."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Введите код PUK, чтобы разблокировать SIM-карту"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Неверный код PUK"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Продолжить"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"SIM-карта разблокирована. Осуществляется разблокировка телефона..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN для разблокировки сети SIM-карты"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Разблокировать"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Запрос разблокировки сети..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Запрос на разблокировку сети не выполнен."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Разблокировка сети успешно завершена."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Настройки вызовов GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Настройки вызовов CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Точки доступа (APN)"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Дополнительные настройки только для вызовов CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Настройки сетевой службы"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"АОН"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Загрузка настроек…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Скрывать номер при исходящих вызовах"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Номер, отображающийся при исходящих вызовах"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"При исходящих вызовах использовать для отображения моего номера настройки, предоставляемые оператором"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Номер, использующийся, когда линия занята"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Переадресация на номер <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Отключено"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Ваш оператор не поддерживает отключение переадресации звонков, если телефон занят."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Ваш оператор не позволяет отключать переадресацию вызовов, если телефон занят."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"При отсутствии ответа"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Номер для переадресации при отсутствии ответа"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Переадресация на номер <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Отключено"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Ваш оператор не поддерживает отключение переадресации звонков, если нет ответа."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Ваш оператор не позволяет отключать переадресацию вызовов, если нет ответа."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Если недоступен"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Номер для переадресации, если абонент недоступен"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Переадресация на номер <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Отключено"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Ваш оператор не поддерживает отключение переадресации звонков, если телефон находится вне зоны доступа."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Ваш оператор не позволяет отключать переадресацию вызовов, если телефон находится вне зоны доступа."</string>
     <string name="updating_title" msgid="6146755386174019046">"Настройки вызовов"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Ошибка настройки вызовов"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Чтение настроек…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Возврат к предыдущим настройкам…"</string>
     <string name="response_error" msgid="6674110501330139405">"Неожиданный отклик сети."</string>
     <string name="exception_error" msgid="7027667130619518211">"Ошибка сети или SIM-карты."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Возможны операции только с разрешенными номерами."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Чтобы увидеть эти настройки, нужно включить радио."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Разрешенные номера в приложении \"Телефон\" включены. В результате некоторые функции вызовов недоступны."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Чтобы увидеть настройки, включите приемопередатчик."</string>
     <string name="close_dialog" msgid="2365884406356986917">"ОК"</string>
     <string name="enable" msgid="1059008390636773574">"Включить"</string>
     <string name="disable" msgid="7274240979164762320">"Отключить"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Скрыть номер"</item>
     <item msgid="1108394741608734023">"Показывать номер"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Сохранить номер голосовой почты"</string>
     <string name="vm_changed" msgid="380744030726254139">"Номер голосовой почты изменен."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Не удалось изменить номер голосовой почты."\n"Если проблема не будет решена, свяжитесь со своим оператором."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Не удалось изменить номер переадресации вызовов."\n"Если проблема не будет решена, свяжитесь со своим оператором."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Не удалось изменить номер голосовой почты."\n"Если проблема не будет решена, обратитесь к оператору связи."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Не удалось изменить номер переадресации."\n"Если проблема не будет решена, обратитесь к оператору связи."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Не удалось сохранить текущие настройки переадресации."\n"Все равно сменить провайдера?"</string>
     <string name="no_change" msgid="3186040086622435212">"Номер не изменен."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Выберите службу голосовой почты"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Поиск сетей"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Ошибка поиска сетей."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Регистрация в сети <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Установленная SIM-карта не может подключиться к этой сети."</string>
-    <string name="connect_later" msgid="500090982903469816">"Не удается подключиться к этой сети. Повторите попытку позже."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Ваша SIM-карта не поддерживает подключение к этой сети."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Не удалось подключиться к сети. Повторите попытку позже."</string>
     <string name="registration_done" msgid="495135664535876612">"Регистрация в сети завершена."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Выберите оператора связи"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Выберите оператора связи"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Поиск всех доступных сетей"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Выбирать автоматически"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Автоматически выбирать предпочтительную сеть"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Автоматическая регистрация..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Автоматически"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Автоматически выбирать предпочтительную сеть"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Автоматическая регистрация..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Режим сети"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Изменить режим работы сети"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Режим предпочтительной сети"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Предпочтительная сеть: только EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Предпочтительная сеть: LTE или CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Только EvDo"</item>
     <item msgid="454610224530856274">"CDMA без EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo (автоматический режим)"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA (автоматический режим)"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo (авторежим)"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA (авторежим)"</item>
     <item msgid="5189164180446264504">"Только WCDMA"</item>
     <item msgid="5714714953966979187">"Только GSM"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA (предпочтительная сеть)"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA (предпочтение)"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Передача данных"</string>
@@ -210,12 +187,14 @@
     <string name="roaming" msgid="8871412572928323707">"Интернет-роуминг"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Подключаться к службам передачи данных в роуминге"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Подключаться к службам передачи данных в роуминге"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Передача данных прекращена, потому что телефон находится за пределами домашней сети, а интернет-роуминг выключен."</string>
+    <string name="national_roaming">Национальный роуминг</string>
+    <string name="national_roaming_enable">Подключаться к службам передачи данных в национальном роуминге</string>
+    <string name="national_roaming_disable">Не подключаться к службам передачи данных в национальном роуминге</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Передача данных прекращена, потому что телефон находится за пределами домашней сети, а интернет-роуминг выключен."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Разрешить интернет-роуминг? Возможны высокие расходы за использование роуминга."</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Параметры GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Параметры CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Передача данных"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Политика передачи данных оператора связи"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Передача данных в текущем периоде"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Время передачи данных"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Скорость передачи данных"</string>
@@ -228,7 +207,6 @@
     <skip />
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Превышение лимита снижает скорость передачи данных до <xliff:g id="USED">%1$d</xliff:g> кбит/с"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Подробнее о политике передачи данных вашего оператора мобильной связи..."</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Широковещательные SMS-службы"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Широковещательные SMS-службы"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Широковещательные SMS-службы"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Широковещательные SMS-службы включены"</string>
@@ -269,15 +247,6 @@
     <item msgid="1858401628368130638">"корейский"</item>
     <item msgid="1933212028684529632">"китайский"</item>
     <item msgid="1908428006803639064">"иврит"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Языки"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Местный прогноз погоды"</string>
@@ -307,9 +276,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Вакансии"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Вакансии включены"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Вакансии отключены"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Медицинские учреждения и больницы"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Медицинские учреждения и больницы включены"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Медицинские учреждения и больницы отключены"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Медицинские учреждения"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Медицинские учреждения (включено)"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Медицинские учреждения (отключено)"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Новости технологий"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Новости технологий включены"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Новости технологий отключены"</string>
@@ -324,58 +293,22 @@
     <item msgid="8912042051809329533">"Только WCDMA"</item>
     <item msgid="8776934131146642662">"Только GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (предпочтительно WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Только сети 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Использовать сети 2G для экономии заряда батареи"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Выбор системы"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Изменить режим роуминга CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Изменить режим роуминга CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Выбор системы"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Только домашняя"</item>
     <item msgid="1205664026446156265">"Автоматически"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Режим роуминга CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Изменить режим роуминга CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Режим роуминга CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Только домашние сети"</item>
-    <item msgid="8174642753290624634">"Аффилированные сети"</item>
-    <item msgid="2241951431403168661">"Любая сеть"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
-    <string name="cdma_network_preferences_title" msgid="41193174429510391">"Параметры сети CDMA"</string>
-    <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Еще не реализовано!"</string>
-    <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Настройки сети CDMA"</string>
-  <string-array name="cdma_network_preferences_choices">
-    <item msgid="3711054371631487248">"CDMA/EvDo"</item>
-    <item msgid="6143696847467859795">"Только CDMA"</item>
-    <item msgid="2683555124647197574">"Только EvDo"</item>
-  </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA-подключение"</string>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Подписка CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Переключение между RUIM/SIM и NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"подписка"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Активировать устройство"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Настроить передачу данных"</string>
@@ -392,18 +325,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Управление списком разрешенных номеров"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Изменить PIN для доступа к списку разрешенных номеров"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Управление списком разрешенных номеров"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Конфиденциальность разговоров"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Конфиденциальность"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Включить усиленный режим конфиденциальности"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Режим телетайпа"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Включить режим телетайпа"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Режим телетайпа"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Установить режим телетайпа"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Автодозвон"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Включить режим автодозвона"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Автодозвон"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Включить режим автодозвона"</string>
     <string name="menu_add" msgid="1882023737425114762">"Добавить контакт"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Изменить контакт"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Удалить контакт"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Введите PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Тип кода PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Имя"</string>
     <string name="number" msgid="7905950798349903858">"Номер"</string>
     <string name="save" msgid="4094274636321939086">"Сохранить"</string>
@@ -416,56 +347,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Удалить номер ограниченного набора"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Выполняется удаление номера ограниченного набора…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Номер ограниченного набора удален."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Номер ограниченного набора не обновлен: вы ввели неверный PIN-код."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"Номер ограниченного набора не обновлен: он не должен содержать больше 20 цифр."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Разрешенный номер не обновлен, так как введен неверный PIN-код."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Разрешенный номер не обновлен, т. к. не может содержать более 20 цифр."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Список разрешенных номеров не обновлен. Указан неверный PIN2 или номер телефона."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Считывание с SIM-карты…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"На SIM-карте нет контактов."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Выберите контакты для импорта"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Чтобы импортировать контакты с SIM-карты, отключите режим полета."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Чтобы перенести контакты с SIM-карты, отключите режим полета."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Включить/отключить запрос PIN SIM-карты"</string>
     <string name="change_pin" msgid="9174186126330785343">"Изменить PIN SIM-карты"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN SIM-карты:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Прежний PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Новый PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Подтвердите новый PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Введен неверный прежний PIN. Повторите попытку."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Введенные коды PIN не совпадают. Повторите попытку."</string>
+    <string name="badPin" msgid="8955102849303984935">"Прежний PIN-код указан неверно. Повторите попытку."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Введенные PIN-коды не совпадают. Повторите попытку."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Введите PIN, содержащий от 4 до 8 цифр."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Отключить запрос PIN SIM-карты"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Включить запрос PIN SIM-карты"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Подождите..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"Запрос PIN SIM-карты включен"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"Запрос PIN SIM-карты отключен"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Введен неверный PIN"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"PIN SIM-карты успешно изменен"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"Запрос PIN-кода SIM-карты включен"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"Запрос PIN-кода SIM-карты отключен."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"PIN-код указан неверно."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"PIN-код изменен."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Неверный пароль, SIM-карта заблокирована! Введите код PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Прежний PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Новый PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Подтвердите новый PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Введен неверный код PUK2. Повторите попытку."</string>
-    <string name="badPin2" msgid="515218795152422178">"Введен неверный прежний код PIN2. Повторите попытку."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Введенные коды PIN2 не совпадают. Повторите попытку."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Код PUK2 указан неверно. Повторите попытку."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Прежний код PIN2 указан неверно. Повторите попытку."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Введенные коды PIN2 не совпадают. Повторите попытку."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Введите PIN2, содержащий от 4 до 8 цифр."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Введите 8-значный код PUK2."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 успешно изменен"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"Код PIN2 изменен."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Введите код PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Неверный пароль. Измените код PIN2 и повторите попытку."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Неверный пароль, SIM-карта заблокирована! Введите код PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Неверный пароль. Измените код PIN2 и повторите попытку."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Неверный пароль, SIM-карта заблокирована. Введите код PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Готово"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Конференц-вызов: <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Вернуться к вызову"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Продолжить без SIM-карты"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"SIM-карта отсутствует. Установите SIM-карту в телефон."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Закрыть"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Разблокировать"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Проверка PIN…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Номер голосовой почты"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Набор номера"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Повторная попытка"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Конференц-вызов"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Входящий вызов"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Ожидание вызова CDMA"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Вызов завершен"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Ждет ответа"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Завершение разговора"</string>
@@ -475,7 +400,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропущенные вызовы"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Пропущенных вызовов: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Пропущенные вызовы от абонента <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Активный вызов (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Текущий вызов"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"На удержании"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Входящий вызов"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Новое сообщение голосовой почты"</string>
@@ -484,13 +409,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Номер голосовой почты неизвестен"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Сеть не найдена"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Выбранная сеть (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) недоступна."</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Завершить разговор"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Перезвонить"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Сообщение"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Перед тем как звонить, отключите режим полета."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Нет регистрации в сети."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Мобильная сеть недоступна."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Вызов не осуществляется, действительный номер телефона не указан."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Вызов не осуществляется."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Запуск последовательности MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Запуск последовательности кодов функций..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Услуга не поддерживается."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Не удается переключить вызовы."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Не удалось разделить вызов."</string>
@@ -502,18 +429,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Экстренный вызов"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Включение радио…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Вне зоны действия сети, повторное подключение..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Вызов не осуществляется, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не является номером экстренного вызова!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Вызов не осуществлен, наберите номер экстренного вызова!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Вызов не выполнен. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> – не номер экстренной службы."</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Вызов не выполнен. Наберите номер."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Используйте клавиатуру для набора номера"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Тональная клавиатура"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Удерживать"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Снять удержание"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Завершить"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Кнопки"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Скрыть"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Динамик"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Откл. звук"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"+ вызов"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Соединить"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Перевод звонка"</string>
@@ -532,36 +454,31 @@
     <item msgid="1937509904407445684">"Телетайп с возможностью слышать собеседника"</item>
     <item msgid="5644925873488772224">"Телетайп с возможностью передачи голоса"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Текст ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Тональные сигналы DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF-сигналы"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Настроить длительность тональных сигналов DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Обычные"</item>
     <item msgid="2883365539347850535">"Длинные"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Сообщение сети"</string>
+    <string name="network_message" msgid="4483886461245213802">"Сообщение сети"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Активировать телефон"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Необходим специальный звонок для активации службы телефона. "\n\n"После нажатия кнопки \"Активировать\" прослушайте инструкции по активации телефона."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Нажмите “Активировать”, чтобы позвонить на специальный номер для активации телефона в сети оператора мобильной связи. После этого вы сможете совершать вызовы и подключаться к мобильным сетям передачи данных."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Пропустить активацию?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Если вы пропустите активацию, вы не сможете совершать вызовы и подключаться к мобильным сетям передачи данных (хотя вы сможете подключаться к сетям Wi-Fi). Пока вы не активируете свой телефон, запрос активации будет отображаться при каждом его включении."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Пропустить"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Активировать"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Активировать"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Телефон активирован!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Телефон активирован."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Неполадки при активации"</string>
     <string name="ota_listen" msgid="162923839877584937">"Следуйте голосовым инструкциям, пока вам не сообщат, что активация завершена."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Клавиатура"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Динамик"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Дождитесь завершения программирования телефона."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Сбой при программировании"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Дождитесь завершения программирования."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Сбой при программировании"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Ваш телефон активирован. Включение службы может занять до 15 минут."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Телефон не был активирован. "\n"Возможно, вам следует найти зону с более высоким уровнем сигнала (у окна или на улице). "\n\n"Повторите попытку или свяжитесь со службой поддержки."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Телефон не был активирован."\n"Возможно, вам следует найти зону с более высоким уровнем сигнала (у окна или на улице)."\n\n"Повторите попытку или свяжитесь со службой поддержки."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ПРЕВЫШЕНИЕ ЧИСЛА ОШИБОК SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Назад"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Повторите попытку"</string>
     <string name="ota_next" msgid="3904945374358235910">"Далее"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Назад"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"ДиалогВыходаРАЭВ"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Телефон переведен в режим экстренных обратных вызовов"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Режим экстренных обратных вызовов"</string>
@@ -571,87 +488,69 @@
     <item quantity="other" msgid="3122217344579273583">"Подключение для передачи данных отсутствует <xliff:g id="COUNT">%s</xliff:g> мин."</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Телефон перейдет в режим экстренных обратных вызовов на <xliff:g id="COUNT">%s</xliff:g> мин. В этом режиме невозможно использовать приложения, задействующие передачу данных. Выйти из режима?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Телефон перейдет в режим экстренных обратных вызовов на <xliff:g id="COUNT">%s</xliff:g> мин. В этом режиме невозможно использовать приложения, задействующие передачу данных. Выйти из режима?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Телефон будет оставаться в режиме экстренных обратных вызовов еще <xliff:g id="COUNT">%s</xliff:g> мин. При этом будут недоступны приложения с поддержкой передачи данных. Выйти?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Телефон будет оставаться в режиме экстренных обратных вызовов еще <xliff:g id="COUNT">%s</xliff:g> мин. При этом будут недоступны приложения с поддержкой передачи данных. Выйти?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Выбранное действие недоступно в режиме экстренных обратных вызовов. Телефон будет оставаться в этом режиме еще <xliff:g id="COUNT">%s</xliff:g> мин. Выйти из режима?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Выбранное действие недоступно в режиме экстренных обратных вызовов. Телефон будет оставаться в этом режиме еще <xliff:g id="COUNT">%s</xliff:g> мин. Выйти из режима?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Выбранное действие невозможно при экстренных обратных вызовах. Телефон будет оставаться в этом режиме еще <xliff:g id="COUNT">%s</xliff:g> мин. Выйти?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Выбранное действие невозможно при экстренных обратных вызовах. Телефон будет оставаться в этом режиме еще <xliff:g id="COUNT">%s</xliff:g> мин. Выйти?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Выбранное действие невозможно в режиме экстренной связи"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Выход из режима экстренных обратных вызовов"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Выбранное действие невозможно при экстренном вызове."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Выход из режима экстренных обратных вызовов"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Да"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Нет"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Закрыть"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Настройки голосовой почты"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;не задано&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Служба голосовой почты"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Настройки (<xliff:g id="PROVIDER_NAME">%s</xliff:g>)"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Служба"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Настройка"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Не задано&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Другие настройки вызовов"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Набор номера"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Звонок через ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Перетащите вкладку вправо, чтобы ответить"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Перетащите вкладку влево, чтобы отключить звонок"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Перетащите вкладку влево, чтобы отклонить вызов"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Перетащите вкладку вправо, чтобы ответить,"\n"удерживая активный вызов"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Перетащите вкладку вправо, чтобы ответить,"\n"завершив активный вызов"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Перетащите вкладку вправо, чтобы ответить,"\n"завершив удерживаемый вызов"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Ответить"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Отклонить"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Звонок через <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"фотография контакта"</string>
     <string name="goPrivate" msgid="865837794424530980">"приватная конференция"</string>
     <string name="selectContact" msgid="781975788478987237">"выбрать контакт"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Настройки интернет-телефонии"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Аккаунты интернет-телефонии (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Аккаунты"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Управление аккаунтами и состоянием интернет-вызовов (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Принимать входящие"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Повышает расход заряда батареи"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Настроить параметры вызова"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Использовать Интернет"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Использовать интернет-соединение (Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Для всех вызовов при возможности передачи данных"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Только для интернет-вызовов"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Спрашивать для каждого вызова"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Для всех вызовов"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Автоматическая регистрация"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Исходящий вызов через SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Исходящий вызов"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Аккаунт для интернет-вызовов:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Использовать для всех интернет-вызовов"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"В настройках вызовов можно изменить аккаунт интернет-телефонии, который используется по умолчанию при выполнении вызовов. Для этого выберите другой аккаунт в настройках интернет-вызовов."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Изменить аккаунт интернет-вызовов, используемый по умолчанию, можно в настройках интернет-телефонии на экране \"Аккаунты\"."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Вызов по сотовой сети"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Интернет-вызов"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Нет аккаунтов для интернет-вызовов"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Нет аккаунтов для интернет-вызовов. Создать аккаунт?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"На телефоне нет аккаунтов для интернет-телефонии. Добавить?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Добавить"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Добавить аккаунт"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Удалить аккаунт"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP-аккаунты"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Сохранение аккаунта..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Удаление аккаунта..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Сохранение..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Удаление аккаунта..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Сохранить"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Отменить"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Закройте профиль"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"ОК"</string>
     <string name="close_profile" msgid="6886968271423155284">"Закрыть"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Основной"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Сделать этот аккаунт основным"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Использовать этот аккаунт по умолчанию для исходящих вызовов"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Расширенные настройки"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Основной аккаунт. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Проверка состояния..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Регистрация..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Подождите..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Вызовы не принимаются"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Регистрация аккаунта прервана – отсутствует подключение к Интернету"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Регистрация прервана – отсутствует подключение Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Не удалось зарегистрировать аккаунт"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Вызовы принимаются"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Регистрация..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Подождите..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Вызовы не принимаются."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Регистрация аккаунта прервана – отсутствует подключение к Интернету."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Регистрация прервана. Отсутствует подключение к Wi-Fi"</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Не удалось зарегистрировать аккаунт."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Вызовы принимаются."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Не удалось зарегистрировать аккаунт (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Новая попытка будет предпринята позже."</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Не удалось зарегистрировать аккаунт. Неверное имя пользователя или пароль."</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Не удалось зарегистрировать аккаунт. Неверное имя сервера."</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Этим аккаунтом сейчас пользуется приложение <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Не удалось зарегистрировать аккаунт. Неверное имя пользователя или пароль."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Не удалось зарегистрировать аккаунт. Неверное имя сервера."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Аккаунт используется приложением \"<xliff:g id="ACCOUNT_OWNER">%s</xliff:g>\"."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Настройки SIP-аккаунта"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Настройки SIP-аккаунта"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Сервер"</string>
@@ -662,9 +561,6 @@
     <string name="port_title" msgid="5952939408078626657">"Номер порта"</string>
     <string name="transport_title" msgid="8253139511847746640">"Протокол"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Отправлять keep-alive"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Отправлять сообщения keep-alive"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Автоматическая регистрация"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Регистрировать профиль автоматически"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Основной аккаунт"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Использовать этот аккаунт по умолчанию для исходящих вызовов"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Расширенные настройки"</string>
@@ -675,12 +571,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Необязательно&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Нажмите, чтобы показать все"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Нажмите, чтобы скрыть все"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"Поле \"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>\" не может быть пустым"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Номер порта должен быть от 1000 до 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Поле \"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>\" должно быть заполнено."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Номер порта должен быть от 1000 до 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Подключение к Интернету отсутствует"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Отсутствует подключение Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Перед звонком через Интернет проверьте подключение"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Для совершения интернет-вызовов необходимо подключение к сети Wi-Fi (используйте настройки беспроводной сети)."</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Перед звонком проверьте подключение к Интернету"</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Чтобы выполнить интернет-вызов, подключитесь к сети Wi-Fi (см. настройки беспроводной сети)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Интернет-вызов не поддерживается"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Автоматически"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Отправлять всегда"</string>
@@ -689,7 +585,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Я сейчас вам перезвоню."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Я перезвоню вам позже."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Не могу говорить. Позвоните позже."</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Собственное сообщение..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Добавить сообщение"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Быстрые ответы"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Быстрые ответы"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -707,7 +603,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"звездочка"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"ноль"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"решетка"</string>
-    <string name="description_search_button" msgid="239929880630534731">"поиск"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"набор номера"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"возврат"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Громкая связь включена."</string>
@@ -717,9 +612,46 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Отклонить"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вибросигнал"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вибросигнал"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Рингтон"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Всегда"</item>
-    <item msgid="1595097872875714252">"Только в режиме без звука"</item>
+    <item msgid="1595097872875714252">"Только в тихом режиме"</item>
     <item msgid="1458182414036878616">"Никогда"</item>
   </string-array>
+
+    <string name="ringtone_title" msgid="6374978286202084684">"Рингтон"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вибросигнал и рингтон"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Звук клавиш"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Рингтон"</string>
+
+    <!-- Voice quality filter -->
+    <string name="voice_quality_preferences_title">Настройка CrystalTalk</string>
+    <string name="voice_quality_summary">Аудио-профили: %s</string>
+
+    <!-- Dialer UI Settings -->
+    <string name="dialer_ui_settings_title">Настройки кнопок</string>
+    <string name="dialer_ui_settings_summary">Настройки номеронабирателя</string>
+
+    <string name="perm_change_mobile_network">Изменение сети (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Приложение, имеющее данное разрешение, может в любое время переключать режимы связи между 2G и 3G. Режим 3G имеет более высокую скорость и большее потребление энергии.</string>
+
+    <!-- Noise suppression -->
+    <string name="noise_suppression_title">Шумоподавление</string>
+    <string name="noise_suppression_summary">Включить шумоподавление в телефонных разговорах</string>
+    <string name="phone_number_label">Мой номер телефона</string>
+    <string name="phone_number_summary">Установка номера телефона для этого устройства</string>
+
+    <!-- Advanced Phone Settings -->
+    <string name="advanced_setting">Дополнительные настройки</string>
+    <string name="keep_proximity_sensor_on">Не выключать датчик приближения</string>
+    <string name="keep_proximity_sensor_on_sum">Не выключать датчик приближения во время разговора с использованием гарнитуры</string>
+    <string name="lockscreen_if_call_ends_with_screenoff">Блокировка по окончании разговора</string>
+    <string name="lockscreen_if_call_ends_with_screenoff_sum">Заблокировать экран после окончания разговора</string>
+    <string name="vibrate_outgoing">Вибрировать при ответе</string>
+    <string name="vibrate_call_waiting">Вибрировать при ожидании</string>
+    <string name="vibrate_call_waiting_sum">Вибрировать при ожидании на линии</string>
+    <string name="vibrate_hangup">Вибрировать при отбое</string>
+    <string name="vibrate_hangup_sum">Вибрировать когда разговор окончен</string>
+    <string name="vibrate_45">Вибрировать каждые 45с</string>
+    <string name="vibrate_45_sum">Вибрировать каждые 45 секунд в течение исходящего звонка</string>
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index f8ae18258..ee360b1ab 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Súkromné číslo"</string>
     <string name="payphone" msgid="1931775086311769314">"Verejný telefón"</string>
     <string name="onHold" msgid="9035493194749959955">"Podržaný hovor"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Aktuálny hovor"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Linka je obsadená"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Sieť je zaneprázdnená"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Bez odozvy, vypršal časový limit"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Server je nedostupný"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Volané číslo je nedostupné"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Nesprávne používateľské meno alebo heslo"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Volanie z priestoru mimo siete"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Volanie z priestoru mimo siete"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Chyba servera: Skúste to znova neskôr."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Žiadny signál"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Bol prekročený limit ACM"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Rádio je vypnuté"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Karta SIM chýba alebo nefunguje"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Karta SIM chýba alebo nefunguje"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Nepokrytá oblasť"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Odchádzajúce hovory sú obmedzené na pevne určené čísla (FDN)."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Ak je zapnuté blokovanie hovorov, nie je možné uskutočňovať odchádzajúce hovory."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Ak je zapnuté blokovanie hovorov, nie je možné uskutočňovať odchádzajúce hovory."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Všetky hovory sú obmedzené ovládaním prístupu."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Tiesňové volania sú obmedzené ovládaním prístupu."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Bežné volania sú obmedzené ovládaním prístupu."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Telefón uzamknutý do Ďalšieho cyklu nabíjania."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Hovor prerušený."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Hovor prerušený."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: preusporiadanie."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Odmietnutie možnosti služby."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: Poradie opakovaní."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Prístup nebol úspešný."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Zabránené."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Uskutočňovať sa dajú len tiesňové volania."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Neplatné číslo"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Neplatné číslo"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferenčný hovor"</string>
     <string name="call_lost" msgid="317670617901479594">"Hovor bol prerušený."</string>
-    <string name="retry" msgid="8462986804300767852">"Skúsiť znova"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Hovor bol prerušený"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Kód MMI bol spustený"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Kód USSD je spustený..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Náhlavná súprava s káblom"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Odoslať nasledujúce tóny?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Odosielanie tónov"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Odosielanie tónov"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Odoslať"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Áno"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Nie"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Nahradiť zástupný znak znakom"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Nahradiť zástupný znak znakom"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Chýba číslo hlasovej schránky"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Na karte SIM nie je uložené žiadne číslo hlasovej schránky."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Pridať číslo"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Prebieha načítavanie…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Kartu SIM odomknete zadaním kódu PIN:"</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"Karta SIM bola odomknutá."</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Nový kód PIN karty SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Potvrďte nový kód PIN karty SIM"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Zadané kódy PIN karty SIM sa nezhodujú. Skúste to znova."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Kartu SIM odomknete zadaním kódu PUK"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Zadaný kód PUK je nesprávny."</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Pokračovať"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Karta SIM bola odblokovaná. Prebieha odomykanie telefónu..."</string>
     <string name="label_ndp" msgid="780479633159517250">"Kód PIN odomknutia siete pre kartu SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Odomknúť"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Žiadosť o odomknutie siete..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Žiadosť o odomknutie siete nebola úspešná."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Sieť bola odomknutá."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Nastavenia hovorov GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Nastavenia hovorov CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Názvy prístupových bodov"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Ďalšie nastavenia hovorov, iba CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Nastavenia sieťovej služby"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Identifikácia volajúceho"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Načítavajú sa nastavenia..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Číslo je v odchádzajúcich hovoroch skryté"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Číslo je zobrazené v odchádzajúcich hovoroch"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Zobrazenie čísla v odchádzajúcich hovoroch sa bude riadiť predvolenými nastaveniami operátora"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Číslo pri obsadenej linke"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Presmerovanie na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Zakázané"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Váš operátor neumožňuje zakázanie presmerovaní, keď je telefón obsadený."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Váš operátor neumožňuje zakázanie presmerovaní, keď je telefón nedostupný."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Presmerovať – neprijatý hovor"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Číslo pri neprijatí hovoru"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Presmerovanie na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Zakázané"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Váš operátor neumožňuje zakázanie presmerovaní, keď telefón neodpovedá."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Váš operátor neumožňuje zakázanie presmerovaní hovorov, keď telefón neodpovedá."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Presmerovať v prípade nedostupnosti"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Číslo pri nedostupnosti"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Presmerovanie na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Zakázané"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Váš operátor neumožňuje zakázanie presmerovaní, keď je telefón nedostupný."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Váš operátor neumožňuje zakázanie presmerovaní, keď je telefón nedostupný."</string>
     <string name="updating_title" msgid="6146755386174019046">"Nastavenia hovorov"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Chyba nastavení hovorov"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Prebieha načítavanie nastavení..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Prebieha vrátenie predchádzajúcich nastavení…"</string>
     <string name="response_error" msgid="6674110501330139405">"Neočakávaná odpoveď siete."</string>
     <string name="exception_error" msgid="7027667130619518211">"Došlo k chybe siete alebo karty SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Operácie je možné vykonávať iba na číslach pevného vytáčania."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Pred zobrazením nastavení zapnite rádio."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Nastavenie Pevne určené čísla v aplikácii Telefón je povolené. Z toho dôvodu nefungujú niektoré funkcie volania."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Pred zobrazením nastavení zapnite rádio."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Povoliť"</string>
     <string name="disable" msgid="7274240979164762320">"Zakázať"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Skryť číslo"</item>
     <item msgid="1108394741608734023">"Zobraziť číslo"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Uložiť číslo hlasovej schránky"</string>
     <string name="vm_changed" msgid="380744030726254139">"Číslo hlasovej schránky bolo zmenené."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Zmena čísla hlasovej schránky nebola úspešná."\n"Ak problém pretrváva, kontaktujte svojho operátora."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Zmena čísla pre presmerovania nebola úspešná."\n"Ak problém pretrváva, kontaktujte svojho operátora."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Číslo hlasovej schránky sa nepodarilo zmeniť."\n"Ak bude problém pretrvávať, kontaktujte operátora."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Číslo presmerovania hovorov sa nepodarilo zmeniť."\n"Ak bude problém pretrvávať, kontaktujte operátora."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Načítanie a uloženie aktuálnych nastavení čísla presmerovania zlyhalo."\n"Chcete aj napriek tomu prepnúť na nového poskytovateľa?"</string>
     <string name="no_change" msgid="3186040086622435212">"Neuskutočnili sa žiadne zmeny."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Zvoliť službu hlasovej schránky"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Vyhľadávanie sietí"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Pri vyhľadávaní sietí došlo k chybe."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Prebieha registrácia v sieti <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Vaša karta SIM nepovoľuje pripojenie k tejto sieti."</string>
-    <string name="connect_later" msgid="500090982903469816">"K tejto sieti sa teraz nepodarilo pripojiť. Skúste to znova neskôr."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Vaša karta SIM nepovoľuje pripojenie k tejto sieti."</string>
+    <string name="connect_later" msgid="2308119155752343975">"V tejto chvíli sa nedá pripojiť k sieti. Skúste to znova neskôr."</string>
     <string name="registration_done" msgid="495135664535876612">"Prihlásenie k sieti prebehlo úspešne."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Vybrať sieťového operátora"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Zvoliť sieťového operátora"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Hľadať všetky dostupné siete"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Automatický výber"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Preferovaná sieť je volená automaticky"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automatická registrácia..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Vybrať automaticky"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Automaticky vybrať preferovanú sieť"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automatická registrácia..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Režim siete"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Zmeniť prevádzkový režim siete"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Preferovaný režim siete"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Preferovaný režim siete: iba EVDO"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Preferovaný režim siete: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE / CDMA"</item>
     <item msgid="3273348576277144124">"Iba EvDo"</item>
     <item msgid="454610224530856274">"CDMA bez EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA/EvDo – automaticky"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA – automaticky"</item>
+    <item msgid="648505122852496166">"CDMA / EvDo – automaticky"</item>
+    <item msgid="7148247646407324800">"GSM / WCDMA – automaticky"</item>
     <item msgid="5189164180446264504">"Iba WCDMA"</item>
     <item msgid="5714714953966979187">"Iba GSM"</item>
-    <item msgid="4775796025725908913">"GSM/WCDMA – preferované"</item>
+    <item msgid="8508331239546115206">"GSM / WCDMA – preferované"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE / CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Dátové prenosy aktivované"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Dátové služby pri roamingu"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Dátové služby sa môžu pripájať pri roamingu"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Dátové služby sa môžu pripájať pri roamingu"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Pripojenie dátových služieb bolo prerušené, pretože ste opustili domovskú sieť a dátové služby pri roamingu máte vypnuté."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Pripojenie dátových služieb bolo prerušené, pretože ste opustili domovskú sieť a dátové služby pri roamingu máte vypnuté."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Naozaj chcete povoliť dátové služby pri roamingu? Môžu sa účtovať vysoké poplatky."</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Možnosti GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Možnosti CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Využitie dát"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Pravidlá operátora pre dáta"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Dáta využité v aktuálnom období"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Obdobie využitia dát"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Pravidlá pre prenosovú rýchlosť"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Uplynulo <xliff:g id="USED_0">%1$d</xliff:g>٪ cyklu"\n"Počet dní do začiatku ďalšieho obdobia: <xliff:g id="USED_1">%2$d</xliff:g> (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"V prípade prekročenia limitu využitia dát sa prenosová rýchlosť zníži na <xliff:g id="USED">%1$d</xliff:g> kB/s"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Ďalšie informácie o pravidlách využitia dát v mobilnej sieti vášho mobilného operátora"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS Cell Broadcast"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS Cell Broadcast"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS Cell Broadcast"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS Cell Broadcast povolené"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Kórejčina"</item>
     <item msgid="1933212028684529632">"čínština"</item>
     <item msgid="1908428006803639064">"Hebrejčina"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Jazyky"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Miestne počasie"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Pracovné príležitosti"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Pracovné príležitosti povolené"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Pracovné príležitosti zakázané"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Lekárstvo, zdravie a nemocnica"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Lekárstvo, zdravie a nemocnica povolené"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Lekárstvo, zdravie a nemocnica zakázané"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Lekárstvo, zdravie a nemocnica"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Lekárstvo, zdravie a nemocnica povolené"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Lekárstvo, zdravie a nemocnica zakázané"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Technologické správy"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Technologické správy povolené"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Technologické správy zakázané"</string>
@@ -323,34 +289,17 @@
     <item msgid="8776934131146642662">"Iba GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (preferované WCDMA)"</item>
   </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
-  </string-array>
+
     <string name="prefer_2g" msgid="8442550937280449639">"Používať iba siete 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Šetrí batériu"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Výber systému"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Zmeniť režim roamingu CDMA"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Zmeniť režim roamingu CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Výber systému"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Iba plocha"</item>
     <item msgid="1205664026446156265">"Automaticky"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Režim CDMA roamingu"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Zmeniť režim roamingu CDMA"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Režim roamingu CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Iba domovské siete"</item>
-    <item msgid="8174642753290624634">"Partnerské siete"</item>
-    <item msgid="2241951431403168661">"Akákoľvek sieť"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Odber CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Nastavenia siete CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Zatiaľ neimplementované"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Predvoľby siete CDMA"</string>
@@ -359,21 +308,11 @@
     <item msgid="6143696847467859795">"Iba CDMA"</item>
     <item msgid="2683555124647197574">"Iba EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Odber CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Prepnúť medzi RUIM/SIM a NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"odber"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivovať zariadenie"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Nastaviť dátovú službu"</string>
@@ -390,18 +329,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Umožňuje spravovať Pevne určené čísla"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Umožňuje zmeniť kód PIN pre prístup k pevne určeným číslam (FDN)"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Správa telefónneho zoznamu"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Ochrana osobných údajov hlasovej pošty"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Ochrana osobných údajov hlasovej pošty"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Povoliť režim vylepšenej ochrany osobných údajov"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Režim TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Povoliť režim TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Režim TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Nastaviť režim TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Automaticky skúsiť znova"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Povoliť režim Automaticky skúsiť znova"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Automaticky skúsiť znova"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Povoliť režim Automaticky skúsiť znova."</string>
     <string name="menu_add" msgid="1882023737425114762">"Pridať kontakt"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Upraviť kontakt"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Odstrániť kontakt"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Zadať kód PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Zadajte kód PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Meno"</string>
     <string name="number" msgid="7905950798349903858">"Číslo"</string>
     <string name="save" msgid="4094274636321939086">"Uložiť"</string>
@@ -414,56 +351,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Odstrániť pevne určené čísla"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Prebieha odstraňovanie pevne určených čísiel..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Pevne určené čísla boli odstránené."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Pevne určené čísla (FDN) neboli aktualizované: Zadali ste nesprávny kód PIN."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"Pevne určené čísla (FDN) neboli aktualizované: dĺžka čísla nemôže presahovať 20 číslic."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Pevne určené čísla (FDN) neboli aktualizované, pretože ste zadali nesprávny kód PIN."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Pevne určené čísla (FDN) neboli aktualizované, pretože číslo nesmie presiahnuť 20 číslic."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Pevne určené čísla (FDN) neboli aktualizované. Kód PIN2 bol nesprávny alebo bolo telefónne číslo odmietnuté."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Prebieha čítanie z karty SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Na karte SIM nie sú žiadne kontakty."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Vybrať kontakty na import"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Ak chcete importovať kontakty z karty SIM, vypnite režim  V lietadle."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Ak chcete importovať kontakty z karty SIM, vypnite režim V lietadle."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Povoliť alebo zakázať kód PIN karty SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Zmeniť kód PIN karty SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"Kód PIN karty SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Pôvodný kód PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Nový kód PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Potvrďte nový kód PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Pôvodný kód PIN bol zadaný nesprávne. Skúste to znova."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Zadané kódy PIN sa nezhodujú. Skúste to znova."</string>
+    <string name="badPin" msgid="8955102849303984935">"Pôvodný kód PIN bol zadaný nesprávne. Skúste to znova."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Zadané kódy PIN sa nezhodujú. Skúste to znova."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Zadajte kód PIN s dĺžkou 4 až 8 číslic."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Zakázať kód PIN karty SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Povoliť kód PIN karty SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Čakajte..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"Kód PIN karty SIM je povolený"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"Kód PIN karty SIM je zakázaný."</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Zadaný kód PIN je nesprávny."</string>
-    <string name="pin_changed" msgid="9000716792724195093">"Kód PIN karty SIM bol zmenený."</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"Kód PIN karty SIM je povolený."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"Kód PIN karty SIM je zakázaný."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Zadaný kód PIN je nesprávny."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"Kód PIN karty SIM bol zmenený."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Neplatné heslo, karta SIM je uzamknutá. Zadajte kód PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Pôvodný kód PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nový kód PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Potvrdiť nový kód PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Pôvodný kód PUK2 bol zadaný nesprávne. Skúste to znova."</string>
-    <string name="badPin2" msgid="515218795152422178">"Pôvodný kód PIN2 bol zadaný nesprávne. Skúste to znova."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Zadané kódy PIN2 sa nezhodujú. Skúste to znova."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Zadaný kód PUK2 nie je správny. Skúste to znova."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Pôvodný kód PIN2 bol zadaný nesprávne. Skúste to znova."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Zadané kódy PIN2 sa nezhodujú. Skúste to znova."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Zadajte kód PIN2 s dĺžkou 4 až 8 číslic."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Zadajte 8-miestny kód PUK2."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"Kód PIN2 bol úspešne zmenený"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"Kód PIN2 bol zmenený."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Zadajte kód PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Heslo je nesprávne. Zmeňte kód PIN2 a skúste to znova."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Neplatné heslo, karta SIM je uzamknutá. Zadajte kód PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Heslo je nesprávne. Zmeňte kód PIN2 a skúste to znova."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Nesprávne heslo, karta SIM bola uzamknutá. Zadajte kód PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Hotovo"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenčný hovor <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Späť na hovor"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Pokračovať bez karty SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Karta SIM sa nenašla. Vložte do telefónu kartu SIM."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Zrušiť"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Odomknúť"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Prebieha overovanie kódu PIN..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Číslo hlasovej schránky"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Vytáčanie"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Opakuje sa pokus"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferenčný hovor"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Prichádzajúci hovor"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Čakajúci hovor CDMA"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Hovor bol ukončený"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Podržaný hovor"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Ukončovanie hovoru"</string>
@@ -473,7 +404,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Zmeškané hovory"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Zmeškané hovory: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>."</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Zmeškaný hovor od volajúceho <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Aktuálny hovor (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Prebiehajúci hovor"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Podržaný hovor"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Prichádzajúci hovor"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nová hlasová správa"</string>
@@ -482,13 +413,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Číslo hlasovej schránky je neznáme"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Žiadny signál"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Vybratá sieť (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) nie je k dispozícii"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Položiť"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Zavolať späť"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Správa"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Ak chcete telefonovať, vypnite najprv režim V lietadle."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Prihlásenie do siete nebolo úspešné."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobilná sieť nie je k dispozícii."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Hovor sa nepodarilo spojiť, nebolo zadané platné číslo."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Hovor nebol spojený."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Prebieha spúšťanie sekvencie MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Prebieha spúšťanie sekvencie kódu funkcie…"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nepodporovaná služba."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Hovory nie je možné prepnúť."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Hovor nie je možné oddeliť."</string>
@@ -500,18 +433,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Tiesňové volanie"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Prebieha zapínanie rádia..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Nepokrytá oblasť, opakovanie pokusu..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Hovor sa nepodarilo spojiť, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nie je číslo núdzového volania."</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Hovor nebol spojený, vytočte číslo tiesňového volania."</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Hovor sa nepodarilo spojiť. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> nie je číslo núdzového volania."</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Hovor nebol spojený, vytočte číslo tiesňového volania."</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Číslo vytočíte pomocou klávesnice."</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Tónová klávesnica"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Podržať"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Pokračovať"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Koniec"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Číselná klávesnica"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Skryť"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Reproduktor"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Ignorovať"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Pridať hovor"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Zlúčiť hovory"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Zameniť"</string>
@@ -530,36 +458,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Text ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Tóny DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Tóny DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Nastaviť dĺžku tónov DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normálna"</item>
     <item msgid="2883365539347850535">"Dlhé"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Správa siete"</string>
+    <string name="network_message" msgid="4483886461245213802">"Informácia siete"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktivujte svoj telefón"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Telefónnu službu je potrebné aktivovať uskutočnením mimoriadneho hovoru. "\n\n"Stlačte tlačidlo Aktivovať a aktivujte telefón podľa poskytnutých pokynov."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Dotknite sa tlačidla Aktivovať. Uskutočníte tak mimoriadny hovor, ktorým telefón aktivujete v mobilnej sieti svojho operátora. Budete tak môcť volať a pripájať sa k mobilným dátovým sieťam."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Preskočiť aktiváciu?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ak preskočíte aktiváciu, nemôžete volať ani sa pripájať k mobilným dátovým sieťam (môžete sa ale pripojiť k sieťam Wi-Fi). Ak svoj telefón neaktivujete, bude sa pri každom zapnutí zobrazovať výzva na aktiváciu."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Preskočiť"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktivovať"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktivovať"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Telefón je aktivovaný."</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefón je aktivovaný."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problém s aktiváciou"</string>
     <string name="ota_listen" msgid="162923839877584937">"Postupujte podľa hlasových pokynov, až kým nebudete informovaní o dokončení aktivácie."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Klávesnica"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Reproduktor"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Počkajte, kým sa telefón naprogramuje."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programovanie nebolo úspešné"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Počkajte, kým sa telefón naprogramuje."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programovanie nebolo úspešné"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Váš telefón je teraz aktivovaný. Spustenie služby môže trvať až 15 minút."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Váš telefón nebol aktivovaný."\n"Možno bude treba vyhľadať oblasť s lepším pokrytím (blízko okna alebo vonku). "\n\n"Skúste to znova alebo kontaktujte oddelenie zákazníckych služieb, kde získate informácie o ďalších možnostiach."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Váš telefón nebol aktivovaný. "\n"Možno bude treba vyhľadať oblasť s lepším pokrytím (blízko okna alebo vonku). "\n\n"Skúste to znova alebo kontaktujte oddelenie zákazníckych služieb, kde získate informácie o ďalších možnostiach."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"PRÍLIŠ VEĽA ZLYHANÍ CERTIFIKÁTOV SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Späť"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Skúsiť znova"</string>
     <string name="ota_next" msgid="3904945374358235910">"Ďalej"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Späť"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"Dialóg ukončenia režimu tiesňového spätného volania"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Bol aktivovaný režim tiesňového spätného volania"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Režim tiesňového spätného volania"</string>
@@ -569,87 +492,69 @@
     <item quantity="other" msgid="3122217344579273583">"Žiadne dátové pripojenie po dobu <xliff:g id="COUNT">%s</xliff:g> min"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Telefón zotrvá v režime tiesňového spätného volania <xliff:g id="COUNT">%s</xliff:g> min. V tomto režime nie je možné použiť žiadne aplikácie využívajúce dátové pripojenie. Chcete režim ukončiť teraz?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Telefón zotrvá v režime tiesňového spätného volania <xliff:g id="COUNT">%s</xliff:g> min. V tomto režime nie je možné použiť žiadne aplikácie využívajúce dátové pripojenie. Chcete režim ukončiť teraz?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Telefón bude v režime spätného núdzového volania počas <xliff:g id="COUNT">%s</xliff:g> min. V tomto režime nie je možné používať žiadne aplikácie používajúce dátové pripojenie. Chcete ho ukončiť?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Telefón bude v režime spätného núdzového volania počas <xliff:g id="COUNT">%s</xliff:g> min. V tomto režime nie je možné používať žiadne aplikácie používajúce dátové pripojenie. Chcete ho ukončiť?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Vybratá akcia nie je v režime tiesňového spätného volania k dispozícii. Telefón zotrvá v tomto režime <xliff:g id="COUNT">%s</xliff:g> min. Chcete režim ukončiť teraz?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Vybratá akcia nie je v režime tiesňového spätného volania k dispozícii. Telefón zotrvá v tomto režime <xliff:g id="COUNT">%s</xliff:g> min. Chcete režim ukončiť teraz?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Vybratá akcia nie je k dispozícii v režime Tiesňového spätného volania. Telefón v ňom bude <xliff:g id="COUNT">%s</xliff:g> min. Chcete ho ukončiť?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Vybratá akcia nie je k dispozícii v režime Tiesňového spätného volania. Telefón v ňom bude <xliff:g id="COUNT">%s</xliff:g> min. Chcete ho ukončiť?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Počas tiesňového volania nie je vybratá akcia k dispozícii"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Ukončenie režimu tiesňového spätného volania"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Počas tiesňového volania nie je vybratá akcia k dispozícii."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Ukončenie režimu tiesňového spätného volania"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Áno"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Nie"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Zrušiť"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Nastavenia hlasovej schránky"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;nenastavené&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Služba hlasovej schránky"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Nastavenia poskytovateľa „<xliff:g id="PROVIDER_NAME">%s</xliff:g>“"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Služba"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Nastavenie"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Nenastavené&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Ďalšie nastavenia hovorov"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Vytočiť"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Volanie prostredníctvom ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Pretiahnutím doprava hovor prijmete"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Pretiahnutím doľava stlmíte vyzváňanie"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Pretiahnutím doľava hovor odmietnete"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Pretiahnutím doprava hovor prijmete"\n"a aktívny podržíte"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Pretiahnutím doprava prijmete aj"\n"ukončíte aktívny hovor"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Pretiahnutím doprava hovor prijmete"\n"a podržaný ukončíte"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Odpoveď"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Odmietnuť"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Voláte prostredníctvom poskytovateľa <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"fotografia kontaktu"</string>
     <string name="goPrivate" msgid="865837794424530980">"prepnúť na súkromné"</string>
     <string name="selectContact" msgid="781975788478987237">"vybrať kontakt"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Nastavenie internetových hovorov"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Účty pre internetové hovory (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Účty"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Správa a stav účtov pre internetové volanie (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Prijímať prichádzajúce hovory"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Znižuje výdrž batérie"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Konfigurácia možností hovorov"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Použiť internetový volanie"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Použiť internetový hovor (iba s pripojením Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Pre všetky hovory, pokiaľ je k dispozícii dátová sieť"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Iba pre internetové hovory"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Zakaždým sa spýtať"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Pre všetky hovory"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Automatická registrácia"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Odchádzajúce hovory pomocou protokolu SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Uskutočniť hovor"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Použiť účet na internetové hovory:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Vždy používať pri internetových hovoroch"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"V časti Nastavenia hovorov môžete pomocou možnosti Nastavenia internetových hovorov zmeniť účet pre internetové hovory, ktorý chcete pri volaní používať ako predvolený."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Predvolený účet na internetové hovory môžete zvoliť na obrazovke Telefón &gt; Nastavenia &gt; Nastavenia internetového hovoru &gt; Účty."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Hovor z mobilného telefónu"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Internetový hovor"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Žiadny účet na internetové hovory:"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"V tomto telefóne nie sú žiadne účty pre internetové hovory. Chcete účet pridať?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"V tomto telefóne neexistujú žiadne účty internetového hovoru. Chcete jeden pridať?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Pridať"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Pridať účet"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Odstrániť účet"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Účty SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Prebieha ukladanie účtu..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Prebieha odstraňovanie účtu..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Prebieha ukladanie účtu..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Prebieha odstraňovanie účtu..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Uložiť"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Zahodiť"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Zavrieť profil"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Zavrieť"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Primárny"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Nastaviť tento účet ako primárny"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Použité pre odchádzajúce hovory"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Rozšírené nastavenia"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Primárny účet. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Prebieha kontrola stavu..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Prebieha registrácia..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Prebiehajú ďalšie pokusy..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Hovory sa neprijímajú"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Registrácia účtu bola zastavená, pretože pripojenie k Internetu nie je k dispozícii"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Registrácia účtu bola zastavená, pretože pripojenie Wi-Fi nie je k dispozícii"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Registrácia účtu nebola úspešná"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Príjem hovorov"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Prebieha registrácia..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Prebiehajú ďalšie pokusy..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Hovory sa neprijímajú."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Registrácia účtu bola zastavená, pretože pripojenie k internetu nie je k dispozícii."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Registrácia účtu bola zastavená, pretože pripojenie Wi-Fi nie je k dispozícii."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Registrácia účtu nebola úspešná."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Príjem hovorov."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Registrácia účtu nebola úspešná: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); skúsime to znova neskôr"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Registrácia účtu nebola úspešná: nesprávne používateľské meno alebo heslo"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Registrácia účtu nebola úspešná: skontrolujte názov servera"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Tento účet je aktuálne používaný aplikáciou <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Registrácia účtu nebola úspešná: nesprávne používateľské meno alebo heslo."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Registrácia účtu nebola úspešná: skontrolujte názov servera."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Tento účet je momentálne používaný aplikáciou <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Podrobnosti o účtu SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Podrobnosti o účtu SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Server"</string>
@@ -660,9 +565,6 @@
     <string name="port_title" msgid="5952939408078626657">"Číslo portu"</string>
     <string name="transport_title" msgid="8253139511847746640">"Typ prenosu"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Odosielať správy na zachovanie pripojenia"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Odosielať správy protokolu SIP na zachovanie pripojenia"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Automatická registrácia"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Profil zaregistrovať automaticky"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Nastaviť ako primárny účet"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Použité pre odchádzajúce hovory"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Voliteľné nastavenia"</string>
@@ -673,12 +575,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Voliteľné&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Výberom tejto položky zobrazíte všetky nastavenia"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Výberom tejto položky skryjete všetky nastavenia"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"Pole <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> je povinné. Nie je možné ho ponechať prázdne."</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Číslo portu by malo byť od 1000 do 65 534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Pole <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> je povinné. Nie je možné ho ponechať prázdne."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Číslo portu by malo byť od 1 000 do 65 534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Žiadne pripojenie k Internetu"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Pripojenie Wi-Fi nie je k dispozícii"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Ak chcete uskutočniť internetový hovor, skontrolujte, či ste pripojení k Internetu"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Aby ste mohli uskutočniť internetový hovor, musíte byť pripojení k sieti Wi-Fi (viď časť Nastavenia bezdrôtového pripojenia a siete)."</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Ak chcete uskutočniť internetový hovor, skontrolujte, či máte pripojenie k internetu."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Ak chcete uskutočniť internetový hovor, musíte mať pripojenie k sieti Wi-Fi (použite sekciu Nastavenia bezdrôtového pripojenia a siete)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Internetové hovory nie sú podporované"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automatické"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Vždy odoslať"</string>
@@ -687,7 +589,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Zavolám späť."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Zavolám neskôr."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Teraz nemôžem, zavolajte inokedy."</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Vlastná správa..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Vlastná správa"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Rýchle odpovede"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Upraviť rýchle odpovede"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +607,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"hviezdička"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"nula"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"libra"</string>
-    <string name="description_search_button" msgid="239929880630534731">"hľadať"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"vytáčanie"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Reproduktor je povolený."</string>
@@ -715,9 +616,22 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Odmietnuť"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrovať"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrovať"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Tón zvonenia"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Vždy"</item>
     <item msgid="1595097872875714252">"Iba v tichom režime"</item>
     <item msgid="1458182414036878616">"Nikdy"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Tón zvonenia telefónu"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibrovať pri zvonení"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Zvuky pri dotyku na číselnú klávesnicu"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Tón zvonenia"</string>
+    <string name="perm_change_mobile_network">Zmeniť sieť (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Aplikácia s týmito povoleniami môže kedykoľvek zmeniť sieť medzi 2G a 3G. 3G je rýchlejšie, viac využíva batériu, a taktiež Vás môže stáť viac peňazí.</string>
+    <string name="advanced_setting">Rozšírené Nastavenia</string>
+    <string name="vibrate_outgoing">Vibrovať pri odpovedi</string>
+    <string name="vibrate_45">Vibrovať každých 45 sekúnd</string>
+    <string name="vibrate_45_sum">Vibrovať každých 45 sekúnd počas odchádzajúceho hovoru</string>
+    <string name="vibrate_hangup">Vibrovať pri zložení</string>
+    <string name="vibrate_call_waiting">Vibrovať pri čakajúcom hovore</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 171ef1ed0..ec58e3b76 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Zasebna številka"</string>
     <string name="payphone" msgid="1931775086311769314">"Telefonska govorilnica"</string>
     <string name="onHold" msgid="9035493194749959955">"Zadržano"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Trenutni klic"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Linija je zasedena"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Omrežje je zasedeno"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Ni odziva, časovna omejitev je potekla"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Strežnik ni dosegljiv"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Številka ni dosegljiva"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Napačno uporabniško ime ali geslo"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Klic iz omrežja"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Klic iz nepooblaščenega omrežja"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Napaka strežnika: poskusite znova pozneje."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Ni signala"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Presežena omejitev ACM"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio je izklopljen"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Ni kartice SIM ali napaka kartice SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Ni kartice SIM ali napaka kartice SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Območje zunaj storitve"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Odhodni klici so omejeni s FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Ko je vklopljena zapora klicev, ne morete klicati."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Ko je vklopljena zapora klicev, ne morete klicati."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Vsi klici so omejeni z nadzorom dostopa."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Klici v sili so omejeni z nadzorom dostopa."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Navadni klici so omejeni z nadzorom dostopa."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Telefon je zaklenjen, dokler ga ne izklopite in ponovno vklopite."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Klic izpuščen."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Klic prestrežen."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: ponovno naročilo."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Možnost storitve zavrnjena."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: ponoven poskus naročila."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: dostop ni uspel."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Izvedeno prej."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Mogoči so samo klici v sili."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Neveljavna številka"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Neveljavna številka"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferenčni klic"</string>
     <string name="call_lost" msgid="317670617901479594">"Klic je bil izgubljen."</string>
-    <string name="retry" msgid="8462986804300767852">"Poskusi znova"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Izgubljeni klic"</string>
     <string name="ok" msgid="3811371167865772377">"V redu"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Koda MMI zagnana"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Koda USSD se izvaja ..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Žične slušalke"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Ali želite poslati naslednje tone?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Pošiljanje tonov "\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Pošiljanje tonov"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Pošlji"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Da"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Ne"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Zamenjaj nadomestni znak z"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Zamenjaj nadomestni znak z"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Manjkajoča številka glasovne pošte"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Na kartici SIM ni shranjena številka glasovne pošte."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Dodaj številko"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Nalaganje …"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Vnesite kodo PIN, da odklenete kartico SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"Kartica SIM odklenjena"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Nova koda PIN kartice SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Za potrditev ponovno vnesite novo kodo PIN kartice SIM"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Vneseni kodi PIN kartice SIM se ne ujemata. Poskusite znova."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Vnesite kodo PUK, da odklenete kartico SIM."</string>
-    <string name="badPuk" msgid="3213017898690275965">"Nepravilna koda PUK."</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Naprej"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Kartica SIM je bila deblokirana. Telefon se odklepa ..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN za odklep omrežja kartice SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Odkleni"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Zahteva za odklepanje omrežja ..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Zahteva za odklepanje omrežja neuspešna."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Odklepanje omrežja uspešno."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Nastavitve klicev GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Nastavitve klicev CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Imena dostopnih točk"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Dodatne nastavitve klicev samo za CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Omrežne nastavitve"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"ID klicatelja"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Nalaganje nastavitev ..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Skrita številka pri odhodnih klicih"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Prikaz številke pri odhodnih klicih"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Uporaba privzetih nastavitev operaterja za prikaz moje številke pri odhodnih klicih"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Številka, ko je zasedeno"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Preusmerjanje na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Onemogočeno"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Operater ne podpira izklopa preusmeritve klicev, kadar je linija zasedena."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operater ne podpira izklopa preusmeritve klicev, kadar je linija zasedena."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Preusmeri, ko ni odgovora"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Številka, ko ni odgovora"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Preusmerjanje na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Onemogočeno"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Operater ne podpira izklopa preusmeritve klicev, kadar ni odgovora."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operater ne podpira izklopa preusmeritve klicev, kadar ni odgovora."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Preusmeri, ko ni dosegljivo."</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Številka, ko ni dosegljivo"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Preusmerjanje na <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Onemogočeno"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Vaš operater ne podpira izklopa preusmeritve klicev, kadar je telefon nedosegljiv."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Vaš operater ne podpira izklopa preusmeritve klicev, kadar je telefon nedosegljiv."</string>
     <string name="updating_title" msgid="6146755386174019046">"Nastavitve klicev"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Napaka nastavitev klicev"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Branje nastavitev …"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Povrnitev nastavitev ..."</string>
     <string name="response_error" msgid="6674110501330139405">"Nepričakovan odgovor iz omrežja."</string>
     <string name="exception_error" msgid="7027667130619518211">"Napaka omrežja ali kartice SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Postopki so dovoljeni samo za telefonske številke, za katere ne velja zapora odhodnega klica."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Pred ogledom teh nastavitev vklopite radio."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Nastavitev predpisanih številk aplikacije telefona je vklopljena. Zato nekatere funkcije, povezane s klici, ne delujejo."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Pred ogledom teh nastavitev vklopite radijski oddajnik."</string>
     <string name="close_dialog" msgid="2365884406356986917">"V redu"</string>
     <string name="enable" msgid="1059008390636773574">"Omogoči"</string>
     <string name="disable" msgid="7274240979164762320">"Onemogoči"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Skrij številko"</item>
     <item msgid="1108394741608734023">"Prikaz številke"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Shrani številko glasovne pošte"</string>
     <string name="vm_changed" msgid="380744030726254139">"Številka glasovne pošte je spremenjena."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Sprememba številke glasovne pošte neuspešna."\n"Če se težava ponovi, se obrnite na operaterja."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Sprememba številke za preusmeritev neuspešna."\n"Če se težava ponovi, se obrnite na svojega operaterja."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Številke odzivnika ni mogoče spremeniti."\n"Če se težava ponovi, se obrnite na operaterja."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Številke za preusmeritev ni mogoče spremeniti."\n"Če se težava ponovi, se obrnite na operaterja."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Trenutnih nastavitev številke za posredovanje ni mogoče pridobiti in shraniti."\n"Ali želite vseeno preklopiti na novega ponudnika?"</string>
     <string name="no_change" msgid="3186040086622435212">"Narejena ni bila nobena sprememba."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Izberite storitev glasovne pošte"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Preišči omrežja"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Napaka pri iskanju omrežij."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registriranje v <xliff:g id="NETWORK">%s</xliff:g> ..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Kartica SIM ne dovoljuje povezave s tem omrežjem."</string>
-    <string name="connect_later" msgid="500090982903469816">"Trenutno ni mogoče vzpostaviti povezave s tem omrežjem. Poskusite znova pozneje."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Kartica SIM ne dovoljuje povezave s tem omrežjem."</string>
+    <string name="connect_later" msgid="2308119155752343975">"S tem omrežjem trenutno ni mogoče vzpostaviti povezave. Poskusite znova pozneje."</string>
     <string name="registration_done" msgid="495135664535876612">"Registrirano v omrežju."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Izbira omrežnega operaterja"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Izbira omrežnega operaterja"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Najdi vsa razpoložljiva omrežja"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Samodejno izberi"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Samodejna izbira želenega omrežja"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Samodejna registracija ..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Samodejna izbira"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Samodejna izbira želenega omrežja"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Samodejna registracija ..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Način omrežja"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Sprememba načina delovanja omrežja"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Prednostni način omrežja"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Prednostni način omrežja: samo EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Prednostni način omrežja: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Samo EvDo"</item>
     <item msgid="454610224530856274">"CDMA brez EvDo"</item>
-    <item msgid="8928247118825616081">"Samodejno CDMA/EvDo"</item>
-    <item msgid="8595462903294812666">"Samodejno GSM/WCDMA"</item>
+    <item msgid="648505122852496166">"Samodejno CDMA/EvDo"</item>
+    <item msgid="7148247646407324800">"Samodejno GSM/WCDMA"</item>
     <item msgid="5189164180446264504">"Samo WCDMA"</item>
     <item msgid="5714714953966979187">"Samo GSM"</item>
-    <item msgid="4775796025725908913">"Prednostno GSM/WCDMA"</item>
+    <item msgid="8508331239546115206">"Prednostno GSM/WCDMA"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Podatki omogočeni"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Podatkovno gostovanje"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Med gostovanjem vzpostavi povezavo s podatkovnimi storitvami"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Med gostovanjem vzpostavi povezavo s podatkovnimi storitvami"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Podatkovna povezava ni mogoča, ker ste zapustili domače omrežje, podatkovno gostovanje pa je izklopljeno."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Podatkovna povezava ni mogoča, ker ste zapustili domače omrežje, podatkovno gostovanje pa je izklopljeno."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Ali želite dovoliti podatkovno gostovanje? Stroški gostovanja utegnejo biti veliki."</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Možnosti GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Možnosti CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Uporaba podatkov"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Podatkovni pravilnik operaterja"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Poraba podatkov v trenutnem obdobju"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Obdobje uporabe podatkov"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Pravilnik podatkovne hitrosti"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ cikla potečenega"\n"Naslednje obdobje se začne čez <xliff:g id="USED_1">%2$d</xliff:g> dni (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Če je presežena omejitev porabe podatkov, se podatkovna hitrost zmanjša na <xliff:g id="USED">%1$d</xliff:g> Kb/s."</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Več informacij o pravilniku o uporabi podatkov v mobilnem omrežju vašega operaterja"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Oddajni vmesnik SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Oddajni vmesnik SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Oddajni vmesnik SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Oddajni vmesnik SMS omogočen"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"korejščina"</item>
     <item msgid="1933212028684529632">"kitajščina"</item>
     <item msgid="1908428006803639064">"hebrejščina"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Jeziki"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Lokalno vreme"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Zaposlitvene priložnosti"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Zaposlitvene priložnosti omogočene"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Zaposlitvene priložnosti onemogočene"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Zdravila in zdravstveni pripomočki, zdravje in bolnišnica"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Zdravila in zdravstveni pripomočki, zdravje in bolnišnica omogočeni"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Zdravila in zdravstveni pripomočki, zdravje in bolnišnica onemogočeni"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Zdravila in zdravstveni pripomočki, zdravje in bolnišnica"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Zdravila in zdravstveni pripomočki, zdravje in bolnišnica omogočeni"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Zdravila in zdravstveni pripomočki, zdravje in bolnišnica onemogočeni"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Tehnološke novice"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Tehnološke novice omogočene"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Tehnološke novice onemogočene"</string>
@@ -323,34 +289,18 @@
     <item msgid="8776934131146642662">"Samo GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (prednostno WCDMA)"</item>
   </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
-  </string-array>
+
     <string name="prefer_2g" msgid="8442550937280449639">"Uporabi samo omrežja 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Varčevanje z baterijo"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Sistemska izbira"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Spremeni način gostovanja cdma"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Spremeni način gostovanja CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistemska izbira"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Samo domov"</item>
     <item msgid="1205664026446156265">"Samodejno"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Način gostovanja CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Spremeni način gostovanja cdma"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Način gostovanja CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Samo domača omrežja"</item>
-    <item msgid="8174642753290624634">"Povezana omrežja"</item>
-    <item msgid="2241951431403168661">"Katero koli omrežje"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Naročnina CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Prednostne nastavitve omrežja CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Ni še uveljavljeno."</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Prednostne nastavitve omrežja CDMA"</string>
@@ -359,21 +309,11 @@
     <item msgid="6143696847467859795">"Samo CDMA"</item>
     <item msgid="2683555124647197574">"Samo EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Naročnina CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Preklopi med RUIM/SIM in NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"naročnina"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Vklop naprave"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Nastavite podatkovni prenos"</string>
@@ -390,18 +330,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Upravljanje zapor odhodnih klicev"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Spremeni kodo PIN za dostop FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Upravljanje seznama telefonskih številk"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Zasebnost glasovne pošte"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Zasebnost odzivnika"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Omogoči izboljšane nastavitve zasebnosti"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Način TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Omogoči način TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Način TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Nastavitev načina TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Samodejen ponovni poskus"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Omogoči način samodejnega ponovnega poskusa"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Samodejen ponovni poskus"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Omogoči način samodejnega ponovnega poskusa"</string>
     <string name="menu_add" msgid="1882023737425114762">"Dodaj stik"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Urejanje stika"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Izbriši stik"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Vnesite kodo PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Vnesite kodo PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Ime"</string>
     <string name="number" msgid="7905950798349903858">"Številka"</string>
     <string name="save" msgid="4094274636321939086">"Shrani"</string>
@@ -414,56 +352,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Izbriši zaporo odhodnega klica"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Brisanje zapore odhodnega klica ..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Zapora odhodnega klica izbrisana."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN ni posodobljen; vnesli ste nepravilni PIN."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN ni posodobljen: število ne sme imeti več kot 20 števk."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN ni bil posodobljen, ker ste vnesli napačno kodo PIN."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN ni bil posodobljen, ker število ne sme presegati 20 mest."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN ni bil posodobljen. Koda PIN2 je bila napačna ali pa je bila telefonska številka zavrnjena."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Branje kartice SIM ..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Na kartici SIM ni stikov."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Izberite stike, ki jih želite uvoziti"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Če želite uvoziti stike s kartice SIM, izklopite letalski način."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Če želite uvoziti stike s kartice SIM, najprej izklopite način za letalo."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Omogoči/onemogoči PIN kartice SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Spremeni PIN kartice SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN kartice SIM"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Stara koda PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Novi PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Potrdi novi PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Stara koda PIN, ki ste jo vnesli, ni pravilna. Poskusite znova."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Kodi PIN, ki ste ju vnesli, se ne ujemata. Poskusite znova."</string>
+    <string name="badPin" msgid="8955102849303984935">"Stara koda PIN, ki ste jo vnesli, ni pravilna. Poskusite znova."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Kodi PIN, ki ste ju vnesli, se ne ujemata. Poskusite znova."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Vnesite PIN, ki vsebuje od štiri do osem številk."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Onemogoči PIN kartice SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Omogoči PIN kartice SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Počakajte trenutek ..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"PIN kartice SIM omogočen"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN kartice SIM onemogočen"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"PIN, ki ste ga vnesli, ni bil pravilen"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"Sprememba kode PIN za kartico SIM je uspela"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN za kartico SIM omogočen"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN za kartico SIM onemogočen."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"PIN, ki ste ga vnesli, ni bil pravilen."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"Sprememba kode PIN za kartico SIM je uspela."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Nepravilno geslo, kartica SIM je zaklenjena. Vnesti morate kodo PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Stari PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Novi PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Potrdi novi PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Vnesena koda PUK2 ni pravilna. Poskusite znova."</string>
-    <string name="badPin2" msgid="515218795152422178">"Stara koda PIN2, ki ste jo vnesli, ni pravilna. Poskusite znova."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Kodi PIN2, ki ste ju vnesli, se ne ujemata. Poskusite znova."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Vnesena koda PUK2 ni pravilna. Poskusite znova."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Stara koda PIN2, ki ste jo vnesli, ni pravilna. Poskusite znova."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Kodi PIN2, ki ste ju vnesli, se ne ujemata. Poskusite znova."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Vnesite kodo PIN2, ki vsebuje od štiri do osem številk."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Vnesite osemmestno kodo PUK2."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"Koda PIN2 je bila uspešno spremenjena."</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"Koda PIN2 je bila uspešno spremenjena."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Vnesite kodo PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Nepravilno geslo. Spremenite PIN2 in poskusite znova."</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Nepravilno geslo, kartica SIM je zaklenjena. Vnesti morate kodo PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Napačno geslo. Spremenite PIN2 in poskusite znova."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Nepravilno geslo, kartica SIM je zaklenjena. Vnesti morate kodo PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Dokončano"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenčni klic <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Nazaj na klic"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Nadaljuj brez kartice SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Kartica SIM ni bila najdena. Vstavite kartico SIM v telefon."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Opusti"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Odkleni"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Preverjanje pristnosti kode PIN ..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Številka glasovne pošte"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Klicanje"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Ponovni poskus"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferenčni klic"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Dohodni klic"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Čakajoči klic CDMA"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Klic je bil končan"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Zadržano"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Prekinitev"</string>
@@ -473,7 +405,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Neodgovorjeni klici"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> neodgovorjenih klicev"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Neodgovorjeni klic od <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Trenutni klic (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Aktivni klic"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Zadržano"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Dohodni klic"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Nova glasovna pošta"</string>
@@ -482,13 +414,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Neznana številka glasovne pošte"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ni storitve"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Izbrano omrežje (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ni na voljo"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Prekinite klic"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Povratni klic"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Sporočilo"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Če želite poklicati, najprej izklopite način za letalo."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ni registrirano v omrežju."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Omrežje prenosnega telefona ni na voljo."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Klic ni bil poslan, veljavna številka ni vnesena."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Klic ni bil poslan."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Začetek zaporedja MMI ..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Zagon zaporedja kod funkcije..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Nepodprta storitev."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Preklop klicev ni mogoč."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Klica ni mogoče ločiti."</string>
@@ -500,18 +434,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Klic v sili"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Vklop radia …"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Zunaj območja storitve, ponovni poskus ..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Klic ni bil poslan, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ni številka za nujne primere."</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Klic ni bil poslan, pokličite številko za nujne primere!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Klic ni bil poslan. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ni številka za nujne primere!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Klic ni bil poslan. Pokličite številko za nujne primere!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Za klicanje uporabite tipkovnico"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Tonska tipkovnica"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Zadrži"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Ne zadrži"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Konec"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Številčnica"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Skrij"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Zvočnik"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Nemo"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Dodaj klic"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Združi klice"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Zamenjaj"</string>
@@ -530,36 +459,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Besedilo ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Toni DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Toni DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Nastavitev dolžine tonov DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Navadno"</item>
     <item msgid="2883365539347850535">"Dolgo"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Sporočilo omrežja"</string>
+    <string name="network_message" msgid="4483886461245213802">"Sporočilo omrežja"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktivirajte telefon"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Izvesti morate poseben klic, da aktivirate telefonsko storitev. "\n\n"Po pritisku »Aktiviranje« poslušajte navodila za aktiviranje telefona."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Dotaknite se možnosti »Aktiviranje«, da izvedete poseben klic, s katerim boste aktivirali telefon v mobilnem omrežju svojega operaterja, da boste lahko klicali in vzpostavili povezavo z mobilnimi podatkovnimi omrežji."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Želite preskočiti aktiviranje?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Če preskočite aktiviranje, ne morete klicati oziroma vzpostaviti stika z mobilnimi podatkovnimi omrežji (lahko pa se povežete v brezžična omrežja). Dokler telefona ne aktivirate, boste k aktiviranju pozvani ob vsakem vklopu telefona."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Preskoči"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktiviraj"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktiviraj"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Telefon je aktiviran."</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefon je aktiviran."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Težava pri aktiviranju"</string>
     <string name="ota_listen" msgid="162923839877584937">"Sledite govorjenim navodilom, dokler ne zaslišite, da je aktiviranje končano."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Tipkovnica"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Zvočnik"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Počakajte trenutek, telefon se programira."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programiranje neuspešno"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Počakajte trenutek, telefon se programira."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programiranje neuspešno"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Telefon je zdaj aktiviran. Traja lahko do 15 minut, da se storitev zažene."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Telefon se ni aktiviral. "\n"Morda boste morali poiskati mesto z boljšo pokritostjo signala (v bližini okna ali zunaj). "\n\n"Poskusite znova ali se obrnite na storitve za stranke za več možnosti."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Telefon se ni aktiviral. "\n"Morda boste morali poiskati mesto z boljšo pokritostjo signala (v bližini okna ali zunaj). "\n\n"Poskusite znova ali se obrnite na podporo za stranke za več možnosti."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"PREVELIKO ŠTEVILO NAPAK SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Nazaj"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Poskusite znova"</string>
     <string name="ota_next" msgid="3904945374358235910">"Naprej"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Nazaj"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Vnesen način za povratni klic v sili"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Način povratnega klica v sili"</string>
@@ -569,87 +493,69 @@
     <item quantity="other" msgid="3122217344579273583">"Podatkovne povezave ni <xliff:g id="COUNT">%s</xliff:g> minut"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Telefon bo v načinu za povratni klic v sili še <xliff:g id="COUNT">%s</xliff:g> minuto. V tem času ni mogoče uporabljati programov s podatkovno povezavo. Ali želite ta način zdaj zapreti?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Telefon bo v načinu za povratni klic v sili še <xliff:g id="COUNT">%s</xliff:g> minut. V tem času ni mogoče uporabljati programov s podatkovno povezavo. Ali želite ta način zdaj zapreti?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Telefon bo v načinu za povratni klic v sili <xliff:g id="COUNT">%s</xliff:g> minuto. V tem načinu ni mogoče uporabljati programov, ki uporabljajo podatkovno povezavo. Ali želite zapreti okno?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Telefon bo v načinu za povratni klic v sili <xliff:g id="COUNT">%s</xliff:g> minut. V tem načinu ni mogoče uporabljati programov, ki uporabljajo podatkovno povezavo. Ali želite zapreti okno?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Izbrano dejanje ni na voljo, ko je vklopljen način za povratni klic v sili. Telefon bo v tem načinu še <xliff:g id="COUNT">%s</xliff:g> minut. Ali želite ta način zdaj zapreti?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Izbrano dejanje ni na voljo, ko je vklopljen način za povratni klic v sili. Telefon bo v tem načinu še <xliff:g id="COUNT">%s</xliff:g> minut. Ali želite ta način zdaj zapreti?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Izbrano dejanje ni na voljo, kadar je aktiven način za povratni klic v sili. Telefon bo v tem načinu <xliff:g id="COUNT">%s</xliff:g> minuto. Ali želite zapustiti program?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Izbrano dejanje ni na voljo, kadar je aktiven način za povratni klic v sili. Telefon bo v tem načinu <xliff:g id="COUNT">%s</xliff:g> minut. Ali želite zapustiti program?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Izbrano dejanje ni na voljo, kadar je aktiven klic v sili"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Izhod iz načina za povratni klic v sili"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Izbrano dejanje ni na voljo med klicanjem v sili."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Izhod iz načina za povratni klic v sili"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Da"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Ne"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Opusti"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Nastavitve glasovne pošte"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;ni nastavljeno&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Storitev glasovne pošte"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Nastavitve za <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Storitev"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Nastavitev"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ni nastavljeno&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Druge nastavitve klicev"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Kliči"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Klic prek ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Povlecite v desno za odgovor"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Povlecite v levo, da utišate zvonjenje"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Povlecite v levo za zavrnitev"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Povlecite v desno za odgovor in"\n"zadržite aktivni klic"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Povlecite v desno za odgovor in"\n"zaključite aktivni klic"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Povlecite v desno za odgovor in "\n" končanje zadržanega klica"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Odgovor"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Zavrni"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Klicanje prek ponudnika <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"fotografija stika"</string>
     <string name="goPrivate" msgid="865837794424530980">"zasebno"</string>
     <string name="selectContact" msgid="781975788478987237">"izbira stika"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Nastavitve internetnega klicanja"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Računi za internetno klicanje (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Računi"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Upravljanje računov in stanja za internetno klicanje (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Sprejmi dohodne klice"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Skrajša delovanje baterije"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Konfiguriraj klicne možnosti"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Uporaba internetnega klicanja"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Uporaba internetnega klicanja (samo brezžični dostop)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Za vse klice, ko podatkovno omrežje ni na voljo"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Samo za internetne klice"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Vprašaj za vsak klic"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Za vse klice"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Samodejna registracija"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Odhodni klic prek SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Klicanje"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Uporaba računa za internetno klicanje"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Vedno uporabi za internetno klicanje"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"V klicnih nastavitvah lahko spremenite privzeti račun za internetno klicanje, tako da v nastavitvah internetnega klica izberete želeni račun."</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Na zaslonu Telefon &gt; Nastavitve &gt; Nastavitve internetnega klicanja &gt; Računi lahko spremenite privzeti račun za internetno klicanje."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Klic z mobilnim telefonom"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Internetni klic"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Ni računa za internetno klicanje"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"V telefonu ni računa za internetno klicanje. Ali ga želite dodati zdaj?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"V tem telefonu ni računov za internetno klicanje. Ali želite dodati račun zdaj?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Dodaj"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Dodaj račun"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Odstrani račun"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Računi SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Shranjevanje računa ..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Odstranjevanje računa ..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Shranjevanje računa ..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Odstranjevanje računa ..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Shrani"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Zavrzi"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Zapiranje profila"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"V redu"</string>
     <string name="close_profile" msgid="6886968271423155284">"Zapri"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Primarni"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Naj bo moj primarni račun"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Za odhodne klice"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Dodatne nastavitve"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Primarni račun. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Preverjanje stanja ..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Registriranje ..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Še poskušamo ..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Ne sprejema klicev"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Registracija računa je zaustavljena, ker ni internetne povezave"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Registracija računa je zaustavljena, ker ni brezžične povezave"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Registracija računa ni uspela"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Sprejemanje klicev"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registriranje ..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Še vedno poskušamo ..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Ne sprejema klicev."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Registracija računa je bila ustavljena, ker ni internetne povezave."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Registracija računa je bila ustavljena, ker ni povezave Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Registracija računa ni uspela."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Sprejemanje klicev."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Registracija računa ni uspela: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); znova poskusite pozneje"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Registracija računa ni uspela: napačno uporabniško ime ali geslo"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Registracija računa ni uspela: preverite ime strežnika"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Ta račun trenutno uporablja program <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Registracija računa ni uspela: napačno uporabniško ime ali geslo."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Registracija računa ni uspela: preverite ime strežnika."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Ta račun trenutno uporablja program <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Podrobnosti o računu SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Podrobnosti o računu SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Strežnik"</string>
@@ -660,9 +566,6 @@
     <string name="port_title" msgid="5952939408078626657">"Številka vrat"</string>
     <string name="transport_title" msgid="8253139511847746640">"Vrsta prevoza"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Pošlji ohranjanje povezave"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Pošiljaj sporočila za ohranjanje povezave SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Samodejna registracija"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Samodejno registriraj profil"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Nastavi kot primarni račun"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Za odhodne klice"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Izbirne nastavitve"</string>
@@ -673,12 +576,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Izbirno&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Dotaknite se, da prikažete vse"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Dotaknite se, če želite skriti vse"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"Polje <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> je obvezno"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Številka vrat mora biti med 1000 in 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Polje <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> je obvezno in ne sme biti prazno."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Številka vrat mora biti med 1000 in 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Ni internetne povezave"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Ni brezžične povezave"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Če želite opraviti internetni klic, najprej preverite internetno povezavo"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Če želite opraviti internetni klic, vzpostavite povezavo z brezžičnim omrežjem (v nastavitvah »Brezžične in omrežne povezave«)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Če želite opraviti internetni klic, najprej preverite internetno povezavo."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Če želite klicati po internetu, morate biti v omrežju WiFi (v nastavitvah »Brezžične in omrežne nastavitve«)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Internetno klicanje ni podprto"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Samodejno"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Vedno pošlji"</string>
@@ -687,7 +590,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Takoj bom poklical."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Poklical bom pozneje."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Zdaj ne morem govoriti. Pozneje?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Sporočilo po meri ..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Sporočilo po meri"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Hitri odgovori"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Urejanje hitrih odgovorov"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +608,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"zvezda"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"nič"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"funt"</string>
-    <string name="description_search_button" msgid="239929880630534731">"iskanje"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"klicanje"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"vračalka"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Zvočnik omogočen."</string>
@@ -713,11 +615,16 @@
     <string name="description_target_answer" msgid="7205604197797472471">"Odgovori"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Pošlji SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Zavrni"</string>
-    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibriranje"</string>
-    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibriranje"</string>
+    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibriraj"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibriraj"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Melodija zvonjenja"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Vedno"</item>
     <item msgid="1595097872875714252">"Samo v tihem načinu"</item>
     <item msgid="1458182414036878616">"Nikoli"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Ton zvonjenja telefona"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Vibriranje ob zvonjenju"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Zvok številčnice"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ton zvonjenja"</string>
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b9cbbe736..e18b9bb0c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Приватан број"</string>
     <string name="payphone" msgid="1931775086311769314">"Јавна говорница"</string>
     <string name="onHold" msgid="9035493194749959955">"На чекању"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Тренутни позив"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Линија је заузета"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Мрежа је заузета"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Нема одговора, време је истекло"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Сервер није доступан"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Број је недоступан"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Неважеће корисничко име или лозинка"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Позив изван мреже"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Позив изван мреже"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Грешка сервера: покушајте поново касније."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Нема сигнала"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Прекорачено је ACM ограничење"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Радио је искључен"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Нема SIM картица или постоји грешка на њој"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Нема SIM картице или постоји грешка на њој"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Област ван домета"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Број за фиксно бирање је ограничио одлазне позиве."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Успостављање одлазних позива није могуће док је у току забрана позива."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Не можете да упућујете одлазне позиве док је укључено ограничавање позива."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Сви позиви су ограничени контролом приступа."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Сви хитни позиви су ограничени контролом приступа."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Стандардни позиви су ограничени контролом приступа."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: телефон је закључан током укључивања и искључивања."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: позив је прекинут."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: позив је блокиран."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: прегруписање."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: одбијена је опција услуге"</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: налог за поновни покушај."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Приступање није успело."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: унапред испражњено."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Могући си само хитни позиви"</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Неважећи број"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Неважећи број"</string>
     <string name="confCall" msgid="1904840547188336828">"Конференцијски позив"</string>
     <string name="call_lost" msgid="317670617901479594">"Позив је изгубљен."</string>
-    <string name="retry" msgid="8462986804300767852">"Покушај поново"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Позив је изгубљен"</string>
     <string name="ok" msgid="3811371167865772377">"Потврди"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Покренут је MMI кôд."</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD кôд је покренут…"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Жичане слушалице"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Желите ли да пошаљете следеће тонове?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Тонови слања "\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Тонови слања"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Пошаљи"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Да"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Не"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Замени ове џокер знакове са"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Замените џокер знак са"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Недостаје број за говорну пошту"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Није ускладиштен ниједан број говорне поште на SIM картици."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Додај број"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Учитавање…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Унесите PIN кôд да бисте откључали SIM картицу."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM картица је закључана"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Нови SIM PIN кôд"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Унесите нови SIM PIN поново да бисте потврдили"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Унети SIM PIN бојеви се не подударају. Покушајте поново."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Унесите PUK кôд да бисте откључали SIM картицу"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Нетачан PUK кôд!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Настави"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Ваша SIM картица је одблокирана. Телефон се откључава..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN за откључавање мреже на SIM картици"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Откључај"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Тражење откључавања мреже"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Неуспешан захтев за закључавање мреже."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Успешно откључавање мреже"</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Подешавања GSM позива"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA подешавања позива"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Називи приступних тачака"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Додатна само CDMA подешавања позива"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Подешавања мрежне услуге"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"ИД позиваоца"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Учитавање подешавања…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Број је скривен у одлазним позивима"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Број приказан у одлазним позивима"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Користи подразумевана подешавања оператера за приказивање мог броја у одлазним порукама"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Број када је заузето"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Прослеђивање на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Онемогућено"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Ваш мобилни оператер не подржава онемогућавање прослеђивања позива када је телефон заузет."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Оператер не подржава онемогућавање преусмеравања позива када је телефон заузет."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Проследи када нема одговора"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Број када нема одговора"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Прослеђивање на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Онемогућено"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Ваш мобилни оператер не подржава онемогућавање прослеђивања позива када нема одговора на телефону."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Оператер не подржава онемогућавање преусмеравања позива када се на позив не одговори."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Проследи када је недоступно"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Број у случају недоступности"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Прослеђивање на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Онемогућено"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Ваш мобилни оператер не подржава онемогућавање прослеђивања позива када телефон није доступан."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Мобилни оператер не подржава онемогућавање преусмеравања позива када је телефон недоступан."</string>
     <string name="updating_title" msgid="6146755386174019046">"Подешавања позива"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Грешка у подешавањима позива"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Учитавање подешавања…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Враћање подешавања…"</string>
     <string name="response_error" msgid="6674110501330139405">"Неочекивани одговор мреже."</string>
     <string name="exception_error" msgid="7027667130619518211">"Грешка на мрежи или SIM картици."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Операције су дозвољене само за фиксне бројеве."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Укључите радио пре него што прикажете ова подешавања."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Подешавање Бројева за фиксно бирање апликације Телефон је укључено. Због тога неке функције у вези са позивима не функционишу."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Укључите радио пре прегледања ових подешавања."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Потврди"</string>
     <string name="enable" msgid="1059008390636773574">"Омогући"</string>
     <string name="disable" msgid="7274240979164762320">"Онемогући"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Сакриј број"</item>
     <item msgid="1108394741608734023">"Прикажи број"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Сачувај број говорне поште"</string>
     <string name="vm_changed" msgid="380744030726254139">"Промењен је број говорне поште."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Неуспешна промена броја говорне поште."\n"Обратите се мобилном оператеру ако се овај проблем настави."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Неуспешно прослеђивање промене броја."\n"Обратите се мобилном оператеру ако се овај проблем настави."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Није могуће променити број говорне поште."\n"Контактирајте мобилног оператера ако се овај проблем настави."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Није могуће променити број за преусмеравање."\n"Контактирајте мобилног оператера ако се овај проблем настави."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Није било могуће преузети и сачувати тренутна подешавања броја за прослеђивање."\n"Желите ли да ипак пређете на новог добављача?"</string>
     <string name="no_change" msgid="3186040086622435212">"Нису начињене промене."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Одаберите услугу говорне поште"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Претражи мреже"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Грешка током тражења мрежа."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Регистровање на <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Ваша SIM картица не дозвољава везу са овом мрежом."</string>
-    <string name="connect_later" msgid="500090982903469816">"Повезивање са овом мрежом тренутно није могуће. Покушајте поново касније."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"SIM картица не дозвољава везу са овом мрежом."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Тренутно није могуће повезати се са овом мрежом. Покушајте поново касније."</string>
     <string name="registration_done" msgid="495135664535876612">"Регистровано на мрежи."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Избор мрежног оператера"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Изаберите мрежног оператера"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Потражи све доступне мреже"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Аутоматски избор"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Аутоматски избор жељене мреже"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Аутоматска регистрација..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Изабери аутоматски"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Аутоматски избор жељене мреже"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Аутоматска регистрација..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Режим мреже"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Промена режима рада мреже"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Жељени режим мреже"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Жељени режим мреже: само EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Жељени режим мреже: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Само EvDo"</item>
     <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo аутоматски"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA аутоматски"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo аутоматски"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA аутоматски"</item>
     <item msgid="5189164180446264504">"Само WCDMA"</item>
     <item msgid="5714714953966979187">"Само GSM"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA има предност"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA има предност"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Подаци су омогућени"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Пренос података у ромингу"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Повезивање са услугом за податке током роминга"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Повезивање са услугом за податке током роминга"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Веза за пренос података је прекинута зато што сте напустили матичну мрежу са искљученим преносом података у ромингу."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Веза за пренос података је прекинута зато што сте напустили кућну мрежу са искљученим преносом података у ромингу."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Желите ли да дозволите пренос података у ромингу? Могу да настану велики трошкови роминга!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Опције за GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA опције"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Коришћење података"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Смернице мобилног оператера за податке"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Подаци коришћени у тренутном периоду"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Период коришћења података"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Смернице за оцену података"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪  је протекло од циклуса"\n"Следећи период почиње за <xliff:g id="USED_1">%2$d</xliff:g> дана (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Брзина преноса података смањена је на <xliff:g id="USED">%1$d</xliff:g> Kb/s ако је премашено ограничење за коришћење података"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Више информација о смерницама за коришћење података мобилне мреже оператера"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS инфо сервиса"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS инфо сервиса"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS инфо сервиса"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Омогућен је SMS инфо сервиса"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"корејски"</item>
     <item msgid="1933212028684529632">"кинески"</item>
     <item msgid="1908428006803639064">"хебрејски"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Језици"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Локално време"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Могућности за запошљавање"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Могућности за запошљавање су омогућене"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Могућности за запошљавање су онемогућене"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Медицина, здравље и болница"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Медицина, здравље и болница су омогућени"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Медицина, здравље и болница су онемогућени"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Медицина, здравље и болница"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Медицина, здравље и болница су омогућени"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Медицина, здравље и болница су онемогућени"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Вести из технологије"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Вести из технологије су омогућене"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Вести из технологије су онемогућене"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"Само WCDMA"</item>
     <item msgid="8776934131146642662">"Само GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA има приоритет)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Користи само 2G мреже"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Чува батерију"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Избор система"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Промена cdma режима роминга"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Промена режима CDMA роминга"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Избор система"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Само почетна"</item>
     <item msgid="1205664026446156265">"Аутоматски"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA режим роминга"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Промена cdma режима роминга"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA режим роминга"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Само кућне мреже"</item>
-    <item msgid="8174642753290624634">"Сродне мреже"</item>
-    <item msgid="2241951431403168661">"Било која мрежа"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA пријава"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA мрежна подешавања"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Још увек није примењено!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA мрежна подешавања"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"Само CDMA"</item>
     <item msgid="2683555124647197574">"Само EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA пријава"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Промени између RUIM/SIM и NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"пријава"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Активирање уређаја"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Подесите усл. преноса података"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Управљање фиксним бираним бројевима"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Промени PIN за приступ броју за фиксно бирање"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Управљање листе телефонских бројева"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Приватност гласа"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Приватност гласа"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Омогући побољшан режим приватности"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY режим"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Омогући TTY режим"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY режим"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Подеси TTY режим"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Аутоматски покушај поново"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Омогући режим аутоматског поновно покушаја"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Аутоматски поновни покушај"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Омогућавање режима аутоматског поновног покушаја"</string>
     <string name="menu_add" msgid="1882023737425114762">"Додај контакт"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Измени контакт"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Избриши контакт"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Унесите PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Унесите PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Име"</string>
     <string name="number" msgid="7905950798349903858">"Број"</string>
     <string name="save" msgid="4094274636321939086">"Сачувај"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Избриши број за фиксно бирање"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Брисање броја за фиксно бирање…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Избрисан је број за фиксно бирање."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Број за фиксно бирање није ажуриран: унели сте нетачан PIN."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"Број за фиксно бирање није ажуриран: број не сме да премаши 20 цифара."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Број за фиксно бирање није ажуриран јер сте унели нетачан PIN кôд."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Број за фиксно бирање није ажуриран јер број не сме да премашује 20 цифара."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN није ажуриран. PIN2 је нетачан или је број телефона одбачен."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Читање са SIM картице…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Нема контаката на SIM картици."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Избор контаката за увоз"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Да бисте увезли контакте са SIM картице, искључите Режим рада у авиону."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Да бисте увезли контакте са SIM картице, прво искључите Режим рада у авиону."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Омогућавање/онемогућавање SIM PIN-а"</string>
     <string name="change_pin" msgid="9174186126330785343">"Промена SIM PIN-а"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Стари PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Нови PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Потврдите нови PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Стари PIN који сте унели је нетачан. Покушајте поново."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Унети PIN бојеви се не подударају. Покушајте поново."</string>
+    <string name="badPin" msgid="8955102849303984935">"Стари PIN кôд који сте унели је нетачан. Покушајте поново."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"PIN кодови које сте унели се не подударају. Покушајте поново."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Откуцајте PIN који има од 4 до 8 бројева."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Онемогућавање SIM PIN-а"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Омогући SIM PIN"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Сачекајте…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"Омогућен је SIM PIN"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM PIN је онемогућен"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Унети PIN је нетачан."</string>
-    <string name="pin_changed" msgid="9000716792724195093">"SIM PIN је успешно промењен"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN кôд SIM картице је омогућен."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN кôд SIM картице је онемогућен."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"PIN кôд који сте унели је нетачан."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"PIN кôд SIM картице је промењен."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Лозинка је нетачна, SIM картица је закључана! Потребан је PUK2 кôд."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Стари PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Нови PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Потврдите нови PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">" PUK2 који сте унели је нетачан. Покушајте поново."</string>
-    <string name="badPin2" msgid="515218795152422178">"Стари PIN2 који сте унели је нетачан. Покушајте поново."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Унети PIN2 бројеви се не подударају. Покушајте поново."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"PUK2 кôд који сте унели је нетачан. Покушајте поново."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Стари PIN2 кôд који сте унели је нетачан. Покушајте поново."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"PIN2 кодови које сте унели се не подударају. Покушајте поново."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Откуцајте PIN2 који има од 4 до 8 бројева."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Унесите PUK2 који садржи 8 бројева."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 је успешно промењен"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 кôд је промењен."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Унесите PUK2 кôд"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Лозинка је нетачна, промените PIN2 и покушајте поново!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Лозинка је нетачна, SIM картица је закључана! Потребан је PUK2 кôд."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Лозинка је нетачна. Промените PIN2 кôд и покушајте поново."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Лозинка је нетачна, SIM картица је закључана. Потребан је PUK2 кôд."</string>
     <string name="doneButton" msgid="2859593360997984240">"Готово"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Конференцијски позив <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Назад на позив"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Настави без SIM картице"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Није пронађена SIM картица. Ставите SIM картицу у телефон."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Одбаци"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Откључај"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Провера PIN-а…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Број говорне поште"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Позивање"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Поновни покушај"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Конференцијски позив"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Долазни позив"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Cdma позив на чекању"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Позив је завршен"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"На чекању"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Прекид везе"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропуштени позиви"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Број пропуштених позива: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Пропуштен позив од: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Тренутни позив (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Актуелни позив"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"На чекању"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Долазни позив"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Нова говорна пошта"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Непознат број говорне поште"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Нема услуге"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Изабрана мрежа (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) није доступна"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Прекини везу"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Узврати позив"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Порука"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Да бисте упутили позив, прво искључите режим рада у авиону."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Није регистровано на мрежи."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Мобилна мрежа није доступна."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Позив није послат, није унет исправан број."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Позив није послат."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Покретање MMI секвенце"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Почетак секвенце функције кода..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Неподржана услуга."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Није могуће пребацивати позиве."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Одвајање позива није могуће."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Хитни позив"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Укључивање радија…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Област ван домета, поновни покушај..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Позив није прослеђен, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> није хитан број!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Позив није послат, позовите хитан број!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Позив није послат. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> није број за хитне случајеве!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Позив није послат. Позовите број за хитне случајеве!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Користите тастатуру за позивање"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Додирни екран"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Чекање"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Опозив чекања"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Заврши"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Нумеричка тастатура"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Сакриј"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Звучник"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Искључи звук"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Додај позив"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Обједини позиве"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Замени"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI текст"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF тонови"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF тонови"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Подеси јачину DTMF тонова"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Нормалан"</item>
     <item msgid="2883365539347850535">"Дугачак"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Мрежна порука"</string>
+    <string name="network_message" msgid="4483886461245213802">"Мрежна порука"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Активирајте телефон"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Потребно је да упутите посебан позив да бисте активирали услугу свој телефона. "\n\n"Након што притиснете дугме „Активирај“, слушајте дата упутства да бисте да бисте активирали свој телефон."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Додирните „Aктивирај“ да бисте поставили посебан позив који активира ваш телефон у мобилној мрежи провајдера, тако да можете да успостављате позиве и повезујете се са мрежама за пренос мобилних података."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Желите ли да прескочите активацију?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Ако прескочите активацију, не можете да упућујете позиве или да се повезујете са мрежама за мобилни пренос података (иако можете да се повежете са Wi-Fi мрежама). Све док не активирате свој телефон, бићете упитани да то учините сваки пут када га укључите."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Прескочи"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Активирај"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Активирај"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Телефон је активиран!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Телефон је активиран."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Проблем са активацијом"</string>
     <string name="ota_listen" msgid="162923839877584937">"Следите изговорена упутства све док не чујете да је активација завршена."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Тастатура"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Звучник"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Сачекајте док се ваш телефон програмира."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Програмирање је неуспешно"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Сачекајте док се телефон програмира."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Програмирање је неуспешно"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Телефон је сада активиран. Можда ће бити потребно највише 15 минута да би се услуга покренула."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Телефон није активиран. "\n"Потребно је да пронађете област са бољом покривеношћу (близу прозора или напољу). "\n\n"Покушајте поново или се обратите корисничкој подршци да бисте добили још опција."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Телефон се није активирао. "\n"Можда је потребно да пронађете област са бољом покривеношћу (близу прозора или напољу). "\n\n"Покушајте поново или позовите корисничку подршку за још опција."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"СЛУЧАЈНА SPC ГРЕШКА"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Назад"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Покушај поново"</string>
     <string name="ota_next" msgid="3904945374358235910">"Следеће"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Назад"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"Дијалог за излазак из режима хитног повратног позива"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Унет је режим за хитан повратни позив"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Режим за хитан повратни позив"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"Нема везе за пренос података за <xliff:g id="COUNT">%s</xliff:g> минута"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Телефон ће бити у режиму хитног повратног позива на <xliff:g id="COUNT">%s</xliff:g> минута. Док је у овом режиму, неће бити коришћене апликације са везом за преноса података. Желите ли сада да изађете?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Телефон ће бити у режиму хитног повратног позива на <xliff:g id="COUNT">%s</xliff:g> минута. Док је у овом режиму, неће бити коришћене апликације са везом за преноса података. Желите ли сада да изађете?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Телефон ће бити у Режиму хитног повратног позива <xliff:g id="COUNT">%s</xliff:g> минут. Док сте у овом режиму, не можете да користите ниједну апликацију која користи везу за пренос података. Да ли желите сада да изађете?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Телефон ће бити у Режиму хитног повратног позива <xliff:g id="COUNT">%s</xliff:g> минута. Док сте у овом режиму, не можете да користите ниједну апликацију која користи везу за пренос података. Да ли желите сада да изађете?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Изабрана радња није доступна када је у режиму хитног повратног позива. Телефон ће бити у овом режиму у наредних <xliff:g id="COUNT">%s</xliff:g> минута. Желите ли да изађете одмах?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Изабрана радња није доступна када је у режиму хитног повратног позива. Телефон ће бити у овом режиму у наредних <xliff:g id="COUNT">%s</xliff:g> минута. Желите ли да изађете одмах?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Изабрана радња није доступна док сте у Режиму хитног повратног позива. Телефон ће бити у овом режиму <xliff:g id="COUNT">%s</xliff:g> минут. Да ли желите сада да изађете?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Изабрана радња није доступна док сте у Режиму хитног повратног позива. Телефон ће бити у овом режиму <xliff:g id="COUNT">%s</xliff:g> минутa. Да ли желите сада да изађете?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Изабрана радња није доступна када је у току хитан позив"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Излаз из режима за хитан повратни позив"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Изабрана радња није доступна када је у току хитан позив"</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Излазак из Режима хитног повратног позива"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Да"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Не"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Одбаци"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Подешавања гласовне поште"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&amp;није подешено&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Услуга говорне поште"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Подешавања за <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Услуга"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Подешавање"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Није подешено&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Друга подешавања позива"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Позови"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Позивање преко ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Превуците удесно да бисте одговорили"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Превлачите налево да бисте утишали звоно"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Превуците налево да бисте одбили"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Превуците удесно да бисте одговорили на"\n"активан позив и ставили га на чекање"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Превуците удесно да бисте одговорили на"\n"активан позив и прекинули га"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Превуците удесно да бисте одговорили и "\n" прекинули позив на чекању"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Одговори"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Одбиј"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Позивање преко добављача <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"фотографија контакта"</string>
     <string name="goPrivate" msgid="865837794424530980">"иди на приватно"</string>
     <string name="selectContact" msgid="781975788478987237">"изаберите контакт"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Подешавања Интернет позива"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Налози за Интернет позивање (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Налози"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Управљање налозима за Интернет позиве (SIP) и статусима"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Прими долазеће позиве"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Смањује радни век батерије"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Конфигурисање опција позива"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Користи Интернет позивање"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Користи Интернет позивање (само Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"За све позиве када је мрежа података доступна"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Само за Интернет позиве"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Упитај за сваки позив"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"За све позиве"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Аутоматска регистрација"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Долазни позив преко SIP-а"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Успостави позив"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Користи налог за Интернет позивање:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Користи увек за успостављање Интернет позива"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Можете да користите поставке позива да бисте променили налог за Интернет позивање који ће се подразумевано користити за успостављање позива, тако што ћете изабрати други налог у оквиру подешавања Интернет позива"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Можете да промените налог за интернет позиве који ће се подразумевано користити на екрану Телефон &gt; Подешавања &gt; Подешавања интернет позива &gt; Налози."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Позив ка мобилном телефону"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Интернет позив"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Нема налога за Интернет позивање"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"На овом телефону не постоје налози за Интернет позиве. Желите ли сада да га додате?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Нема налога за интернет позиве на овом телефону. Да ли желите сада да додате један?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Додај"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Додај налог"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Уклони налог"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP налози"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Чување налога..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Уклањање налога..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Чување налога..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Уклањање налога..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Сачувај"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Одбаци"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Затвори профил"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"Потврди"</string>
     <string name="close_profile" msgid="6886968271423155284">"Затвори"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Примарни"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Постави овај налог као примарни"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Користи се за одлазне позиве"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Напредна подешавања"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Примарни налог. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Провера статуса..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Регистровање..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"И даље покушава..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Не прима позиве"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Заустављена је регистрација налога зато што не постоји Интернет веза"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Заустављена је регистрација налога зато што не постоји Wi-Fi веза"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Регистрација налога није успела"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Пријем позива"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Регистровање..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"И даље покушава..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Не прима позиве."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Регистрација налога је заустављена зато што не постоји интернет веза."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Регистрација налога је заустављена зато што не постоји Wi-Fi веза."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Регистрација налога није успела."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Пријем позива."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Регистрација налога није успела: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); покушаћемо касније"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Регистрација налога није успела: нетачно корисничко име или лозинка"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Регистрација налога није успела: Проверите назив сервера"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Овај налог тренутно користи апликација <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Регистрација налога није успела: нетачно корисничко име или лозинка."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Регистрација налога није успела: Проверите назив сервера."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Овај налог тренутно користи апликација <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Детаљи о SIP налогу"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Детаљи о SIP налогу"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Сервер"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Број порта"</string>
     <string name="transport_title" msgid="8253139511847746640">"Тип преноса"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Пошаљи keep-alive поруку"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Пошаљи SIP keep-alive поруке"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Аутоматска регистрација"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Аутоматски региструј профил"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Подеси као примарни налог"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Користи се за одлазне позиве"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Опционална подешавања"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Опционално&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Додирните да бисте приказали све"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Додирните да бисте све сакрили"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> је потребно, не може да буде празно"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Број порта би требало да буде између 1000 и 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Поље <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> је обавезно и не може да буде празно."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Број порта би требало да буде између 1000 и 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Нема Интернет везе"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Не постоји Wi-Fi веза"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Да бисте успоставили Интернет позив, прво проверите своју Интернет везу"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Потребно је да се повежете са Wi-Fi мрежом за Internet позиве (користите Подешавања бежичне и мобилне мреже)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Да бисте упутили интернет позив, прво проверите интернет везу."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Потребно је да се повежете са Wi-Fi мрежом за интернет позиве (користите Подешавања бежичне везе и мреже)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Интернет позиви нису подржани"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Аутоматски"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Увек шаљи"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Позваћу те ускоро."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Позваћу те касније."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"У гужви сам. Да се чујемо касније?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Прилагођена порука..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Прилагођена порука"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Брзи одговори"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Измена брзих одговора"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"звездица"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"нула"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"фунта"</string>
-    <string name="description_search_button" msgid="239929880630534731">"претрага"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"бирање"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"тастер за брисање"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Спикерфон је омогућен."</string>
@@ -715,9 +615,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Одбиј"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вибрација"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вибрација"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Мелодија звона"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Увек"</item>
     <item msgid="1595097872875714252">"Само у нечујном режиму"</item>
-    <item msgid="1458182414036878616">"Никад"</item>
+    <item msgid="1458182414036878616">"Никада"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Мелодија звона телефона"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вибрирај када звони"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Тонови при додиру нумеричке тастатуре"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Мелодија звона"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 98bf1c169..95c570b92 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Privat nummer"</string>
     <string name="payphone" msgid="1931775086311769314">"Telefonautomat"</string>
     <string name="onHold" msgid="9035493194749959955">"Parkerat"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Pågående samtal"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Linjen är upptagen"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Nätverket är upptaget"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Inget svar, avbröts"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Servern kan inte nås"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numret kan inte nås"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Felaktigt användarnamn eller lösenord"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Uppringt från ett annat nätverk"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Uppringt från ett annat nätverk"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Serverfel. Försök igen senare."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Ingen signal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM-gränsen har överskridits"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio av"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Inget SIM-kort eller SIM-kortsfel"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Inget SIM-kort eller SIM-kortsfel"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Fungerar inte i detta område"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Utgående samtal begränsas av FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Du kan inte ringa utgående samtal när samtalsspärren är aktiverad."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Du kan inte ringa utgående samtal när samtalsspärren är aktiverad."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Alla samtal begränsas av åtkomstkontroll."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Nödsamtal begränsas av åtkomstkontroll."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Vanliga samtal begränsas av åtkomstkontroll."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Telefonen är låst till kall omstart."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Samtalet gick förlorat."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Samtalet hänvisades."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: Beställ igen."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Tillval av tjänst avvisat."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: Beställ igen."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Åtkomstfel."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Flyttat."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Det går bara att ringa nödsamtal."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Ogiltigt nummer"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Ogiltigt nummer"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferenssamtal"</string>
     <string name="call_lost" msgid="317670617901479594">"Samtal har försvunnit."</string>
-    <string name="retry" msgid="8462986804300767852">"Försök igen"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Samtalet försvann"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI-kod körs"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD-kod körs…"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Trådanslutet headset"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Skicka följande toner?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Skickar signaler"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Skickar signaler"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Skicka"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Ja"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Nej"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Ersätt jokertecknet med"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Ersätt jokertecknet med"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Nummer till röstbrevlåda saknas"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Det finns inget nummer till röstbrevlådan sparat på SIM-kortet."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Lägg till nummer"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Läser in…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Ange PIN-kod för att låsa upp SIM-kortet."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM-kortet är upplåst"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Ny PIN-kod för SIM-kort"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Bekräfta genom att ange SIM-kortets nya PIN-kod igen"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"PIN-koderna som du angav för SIM-kortet matchar inte. Försök igen."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Ange PUK-kod för att låsa upp SIM-kortet"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Felaktig PUK-kod!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Fortsätt"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"SIM-kortets spärr har tagits bort. Låser upp telefonen…"</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN-kod för upplåsning av SIM-nätverk"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Lås upp"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Försöker låsa upp nätverket…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Det gick inte att låsa upp nätverket."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Nätverket upplåst"</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI-kod"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Samtalsinst. för GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Samtalsinst. för CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Åtkomstpunktsnamn"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Ytterligare samtalsinställningar för endast CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Inställningar för nätverkstjänst"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Nummerpresentatör"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Inställningarna läses in ..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Dolt nummer i utgående samtal"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Nummer som visas för utgående samtal"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Använd operatörens standardinställningar när mitt nummer visas för utgående samtal"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Nummer vid upptagen"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Vidarebefordrar till <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Inaktiverat"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Operatören stöder inte inaktivering av vidarebefordran av samtal när telefonen används."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operatören stöder inte inaktivering av vidarebefordran av samtal under pågående samtal."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Vidarebefordra vid ej svar"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Nummer vid ej svar"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Vidarebefordrar till <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Inaktiverat"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Operatören stöder inte inaktivering av vidarebefordran av samtal när ingen svarar i telefonen."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operatören stöder inte inaktivering av vidarebefordran av samtal när du inte svarar i telefonen."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Vidarebefordra när du inte är tillgänglig"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Nummer när du inte är tillgänglig"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Vidarebefordrar till <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Inaktiverat"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Operatören stöder inte inaktivering av vidarebefordran av samtal när det inte går att nå telefonen."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Operatören stöder inte inaktivering av vidarebefordran av samtal när det inte går att nå telefonen."</string>
     <string name="updating_title" msgid="6146755386174019046">"Samtalsinställningar"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Felaktiga samtalsinställningar"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Läser inställningar…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Återställer inställningarna…"</string>
     <string name="response_error" msgid="6674110501330139405">"Oväntat svar från nätverket."</string>
     <string name="exception_error" msgid="7027667130619518211">"Nätverks- eller SIM-kortsfel."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Endast fasta nummer kan användas."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Sätt på radion innan du visar inställningarna."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Inställningen Fasta nummer i mobilappen är aktiverad. Därför fungerar inte vissa samtalsfunktioner."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Sätt på radion innan du visar inställningarna."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Aktivera"</string>
     <string name="disable" msgid="7274240979164762320">"Inaktivera"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Dölj nummer"</item>
     <item msgid="1108394741608734023">"Visa nummer"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Spara nummer till röstbrevlåda"</string>
     <string name="vm_changed" msgid="380744030726254139">"Numret till röstbrevlåda har ändrats."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Det gick inte att ändra numret till röstbrevlådan."\n"Kontakta operatören om problemet kvarstår."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Det gick inte att ändra numret för vidarebefordran."\n"Kontakta operatören om problemet kvarstår."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Det gick inte att ändra numret till röstbrevlådan."\n"Kontakta operatören om problemet kvarstår."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Det gick inte att ändra numret för vidarebefordran."\n"Kontakta din operatör om problemet kvarstår."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Det gick inte att hämta och spara inställningarna för numret för vidarebefordran."\n"Vill du byta till den nya operatören istället?"</string>
     <string name="no_change" msgid="3186040086622435212">"Du har inte gjort några ändringar."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Välj tjänst för röstbrevlådan"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Sök efter nätverk"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Ett fel uppstod när vi sökte efter nätverk."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Registrerar på <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Ditt SIM-kort tillåter inte anslutning till detta nätverk."</string>
-    <string name="connect_later" msgid="500090982903469816">"Det går inte att ansluta till nätverket för tillfället. Försök igen senare."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Ditt SIM-kort tillåter inte anslutning till detta nätverk."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Det går inte att ansluta till det här nätverket just nu. Försök igen senare."</string>
     <string name="registration_done" msgid="495135664535876612">"Registrerad på nätverk."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Välj en nätverksoperatör"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Välj en nätverksoperatör"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Sök efter alla tillgängliga nätverk"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Välj automatiskt"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Välj önskat nätverk automatiskt"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Automatisk registrering..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Välj automatiskt"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Välj önskat nätverk automatiskt"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Automatisk registrering ..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Nätverksläge"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Ändra nätverksläge"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Föredraget nätverksläge"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Föredraget nätverksläge: Endast EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Föredraget nätverksläge: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Endast EvDo"</item>
     <item msgid="454610224530856274">"CDMA utan EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo auto"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA auto"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo auto"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA auto"</item>
     <item msgid="5189164180446264504">"Endast WCDMA"</item>
     <item msgid="5714714953966979187">"Endast GSM"</item>
-    <item msgid="4775796025725908913">"Föredrar GSM / WCDMA"</item>
+    <item msgid="8508331239546115206">"Föredrar GSM/WCDMA"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data är aktiverat"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Roaming"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Anslut till datatjänster vid roaming"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Anslut till datatjänster vid roaming"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Du förlorade dataanslutningen eftersom du lämnade ditt hemnätverk utan att aktivera roaming."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Du förlorade dataanslutningen eftersom du lämnade ditt hemnätverk utan att aktivera roaming."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Tillåta roaming? Observera att detta kan leda till höga kostnader!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Alternativ för GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA-alternativ"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Dataanvändning"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Operatörens datapolicy"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Använda data under nuvarande period"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Dataanvändningsperiod"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Datahastighetspolicy"</string>
@@ -232,7 +208,6 @@
     <skip />
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Datahastigheten sänks till <xliff:g id="USED">%1$d</xliff:g> kbit/s om dataanvändningsgränsen överskrids"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Mer information om operatörens dataanvändningspolicy för mobilnätverket"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Cell Broadcast SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Cell Broadcast SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Cell Broadcast SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Cell Broadcast SMS aktiverat"</string>
@@ -273,15 +248,6 @@
     <item msgid="1858401628368130638">"Koreanska"</item>
     <item msgid="1933212028684529632">"Kinesiska"</item>
     <item msgid="1908428006803639064">"Hebreiska"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Språk"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Lokala väderprognoser"</string>
@@ -311,9 +277,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Jobbannonser"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Jobbannonser aktiverade"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Jobbannonser inaktiverade"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Medicin, hälsa och sjukvård"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Medicin, hälsa och sjukvård aktiverade"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Medicin, hälsa och sjukvård inaktiverade"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Medicin, hälsa och sjukvård"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Medicin, hälsa och sjukvård aktiverade"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Medicin, hälsa och sjukvård inaktiverade"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Tekniknyheter"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Tekniknyheter aktiverade"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Tekniknyheter inaktiverade"</string>
@@ -329,34 +295,17 @@
     <item msgid="8776934131146642662">"Endast GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (föredrar WCDMA)"</item>
   </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
-  </string-array>
+
     <string name="prefer_2g" msgid="8442550937280449639">"Använd endast 2G-nätv."</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Sparar batteri"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Systemval"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Ändra cdma-roamingläge"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Ändra CDMA-roamingläge"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Systemval"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Endast hemma"</item>
     <item msgid="1205664026446156265">"Automatiskt"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA-roamingläge"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Ändra cdma-roamingläge"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA-roamingläge"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Endast hemnätverk"</item>
-    <item msgid="8174642753290624634">"Anslutna nätverk"</item>
-    <item msgid="2241951431403168661">"Alla nätverk"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA-prenumeration"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Nätverksinställningar för CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Inte implementerad än!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Nätverksinställningar för CDMA"</string>
@@ -365,21 +314,11 @@
     <item msgid="6143696847467859795">"Endast CDMA"</item>
     <item msgid="2683555124647197574">"Endast EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA-prenumeration"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Växla mellan RUIM/SIM och NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"prenumeration"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Aktivera enhet"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Ställ in datatjänst"</string>
@@ -396,18 +335,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Hantera fasta nummer"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Ändra PIN-kod för FDN-åtkomst"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Hantera nummerlistan"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Röstsekretess"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Sekretess för Voice"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Aktivera avancerat sekretessläge"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY-läge"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Aktivera TTY-läge"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY-läge"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Ange TTY-läge"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Försök igen automatiskt"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Aktivera läget Försök igen automatiskt"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Försök igen automatiskt"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Aktivera läget Försök igen automatiskt"</string>
     <string name="menu_add" msgid="1882023737425114762">"Lägg till kontakt"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Redigera kontakt"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Ta bort kontakt"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Ange PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Ange PIN2-kod"</string>
     <string name="name" msgid="7329028332786872378">"Namn"</string>
     <string name="number" msgid="7905950798349903858">"Nummer"</string>
     <string name="save" msgid="4094274636321939086">"Spara"</string>
@@ -420,56 +357,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Ta bort fast nummer"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Tar bort fast nummer…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Det fasta numret har tagits bort."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN är inte uppdaterat. Du angav en felaktig PIN-kod."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN är inte uppdaterat. Numret får inte innehålla fler än 20 siffror."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN uppdaterades inte eftersom du skrev en felaktig PIN-kod."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN uppdaterades inte eftersom numret inte får ha mer än 20 siffror."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN uppdaterades inte. Antingen har du angivit fel PIN2, eller så avvisades telefonnumret."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Läser från SIM-kort…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Inga kontakter på SIM-kortet."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Välj vilka kontakter som ska importeras"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Om du vill importera kontakter från SIM-kortet måste du inaktivera flygplansläget."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Om du vill importera kontakter från SIM-kortet måste du inaktivera flygplansläget."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Aktivera/inaktivera SIM-kortets PIN-kod"</string>
     <string name="change_pin" msgid="9174186126330785343">"Ändra SIM-kortets PIN-kod"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM-kortets PIN-kod:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Gammal PIN-kod"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Ny PIN-kod"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Bekräfta ny PIN-kod"</string>
-    <string name="badPin" msgid="4154316827946559447">"Den gamla PIN-koden är felaktig. Försök igen."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"PIN-koderna som du angav matchar inte. Försök igen."</string>
+    <string name="badPin" msgid="8955102849303984935">"Den gamla PIN-koden som du angav är felaktig. Försök igen."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"PIN-koderna du skrev matchar inte. Försök igen."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Ange en PIN-kod med 4 till 8 siffror."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Inaktivera SIM-kortets PIN-kod"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Aktivera PIN-kod"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Vänta…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"SIM-kortets PIN-kod är aktiverad"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM-kortets PIN-kod är inaktiverad"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"PIN-koden du angav är felaktig"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"SIM-kortets PIN-kod har ändrats"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM-kortets PIN-kod är aktiverad."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM-kortets PIN-kod är inaktiverad."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Du angav fel PIN-kod."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"SIM-kortets PIN-kod har ändrats."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Lösenordet är felaktigt och SIM-kortet har spärrats! PUK2 krävs."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Gammal PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Ny PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Bekräfta ny PIN2-kod"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"PUK2-koden du angav är felaktig. Försök igen."</string>
-    <string name="badPin2" msgid="515218795152422178">"Den gamla PIN2-koden du angav är felaktig. Försök igen."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"PIN2-koderna som du angav matchar inte. Försök igen."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"PUK2-koden du angav är felaktig. Försök igen."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Den gamla PIN2-koden som du angav är felaktig. Försök igen."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"PIN2-koderna som du angav matchar inte. Försök igen."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Ange en PIN2-kod med 4 till 8 siffror."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Ange en PUK2-kod med 8 siffror."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 har ändrats"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 har ändrats."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Ange PUK2-kod"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Lösenordet är felaktigt. Ange en annan PIN2-kod och försök igen!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Lösenordet är felaktigt och SIM-kortet har spärrats! PUK2 krävs."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Lösenordet är felaktigt. Ange en annan PIN2-kod och försök igen."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Lösenordet är felaktigt och SIM-kortet har spärrats. PUK2 krävs."</string>
     <string name="doneButton" msgid="2859593360997984240">"Färdig"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferenssamtal <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Tillbaka till samtal"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Fortsätt utan SIM-kort"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Inget SIM-kort hittades. Sätt i ett SIM-kort i telefonen."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Ta bort permanent"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Lås upp"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Verifierar PIN-kod…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nummer till röstbrevlåda"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Ringer"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Försöker igen"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferenssamtal"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Inkommande samtal"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Cdma-samtal väntar"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Samtal avslutat"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Parkerat"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Lägger på"</string>
@@ -479,7 +410,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Missade samtal"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> missade samtal"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Missat samtal från <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Pågående samtal (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Pågående samtal"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Parkerat"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Inkommande samtal"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Ny röstbrevlåda"</string>
@@ -488,13 +419,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nummer till röstbrevlåda okänt"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ingen tjänst"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Det valda nätverket (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) är inte tillgängligt"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Lägg på"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Ring upp"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Meddelande"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Om du vill ringa ett samtal måste du först inaktivera flygplansläge."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Inte registrerat på nätverk."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Inget mobilt nätverk är tillgängligt."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Samtalet har inte skickats. Du måste ange ett giltigt nummer."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Samtalet har inte skickats."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Startar sekvens för MMI-kod…"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Startar sekvens för funktionskod..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Inget stöd för tjänsten."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Det gick inte att växla mellan samtal."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Det gick inte att koppla isär samtalen."</string>
@@ -506,18 +439,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Nödsamtal"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Sätter på radion…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Fungerar inte i detta område. Försöker igen…"</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Samtalet har inte skickats. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> är inte ett nödsamtalsnummer!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Samtalet har inte skickats. Ring ett nödsamtalsnummer!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Samtalet har inte skickats. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> är inte ett nödsamtalsnummer!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Samtalet har inte skickats. Ring ett nödsamtalsnummer!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Använd tangentbordet om du vill ringa"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Knappsats för tonval"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Parkera"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Ta bort parkering"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Avsluta"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Knappsats"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Dölj"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Högtalare"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Ljud av"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Lägg till samtal"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Koppla ihop samtal"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Växla"</string>
@@ -536,36 +464,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI-text"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF-signaler"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF-signaler"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Ange längd på DTMF-signaler"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Lång"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Nätverksmeddelande"</string>
+    <string name="network_message" msgid="4483886461245213802">"Nätverksmeddelande"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Aktivera telefonen"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Du måste ringa ett särskilt samtal för att aktivera telefontjänsten. "\n\n" Tryck på \"Aktivera\" och lyssna på instruktionerna om hur du aktiverar telefonen."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Tryck på Aktivera för att ringa ett speciellt samtal som aktiverar din telefon i operatörens mobila nätverk, så att du kan ringa och ansluta till mobila datanätverk."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Vill du hoppa över aktiveringen?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Om du hoppar över aktiveringen kan du inte ringa samtal eller ansluta till mobila datanätverk (men du kan ansluta till WiFi-nätverk). Du kommer att påminnas om att aktivera telefonen varje gång du sätter på den, tills du har aktiverat den."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Hoppa över"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Aktivera"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Aktivera"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Telefonen är aktiverad!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefonen är aktiverad."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problem med aktivering"</string>
     <string name="ota_listen" msgid="162923839877584937">"Följ de talade instruktionerna tills du här att aktiveringen är slutförd."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Knappsats"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Högtalare"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Vänta medan telefonen programmeras."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Det gick inte att programmera"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Vänta medan mobilen programmeras."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Det gick inte att programmera"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Telefonen är nu aktiverad. Det kan ta upp till 15 minuter innan tjänsten startar."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Telefonen har inte aktiverats. "\n"Du kanske måste hitta en plats med bättre täckning (nära ett fönster eller utomhus). "\n\n"Försök igen eller ring kundtjänst om du vill ha fler alternativ."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Telefonen har inte aktiverats. "\n"Du kanske måste hitta en plats med bättre täckning (nära ett fönster eller utomhus). "\n\n"Försök igen eller ring kundtjänst om du vill ha fler alternativ."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"FÖR MÅNGA MISSLYCKADE SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Tillbaka"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Försök igen"</string>
     <string name="ota_next" msgid="3904945374358235910">"Nästa"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Tillbaka"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Starta läget Återuppringning vid nödsamtal"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Läget Återuppringning vid nödsamtal"</string>
@@ -575,87 +498,69 @@
     <item quantity="other" msgid="3122217344579273583">"Inga dataanslutningar på <xliff:g id="COUNT">%s</xliff:g> minuter"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Telefonen är i läget Återuppringning vid nödsamtal i <xliff:g id="COUNT">%s</xliff:g> minut. I det här läget kan inga appar som använder dataanslutningar användas. Vill du avsluta nu?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Telefonen är i läget Återuppringning vid nödsamtal i <xliff:g id="COUNT">%s</xliff:g> minuter. I det här läget kan inga program som använder dataanslutningar användas. Vill du avsluta nu?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Telefonen kommer att vara i läget Återuppringning vid nödsamtal i <xliff:g id="COUNT">%s</xliff:g> minut. I det här läget kan inga appar som kräver en dataanslutning användas. Vill du avsluta nu?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Telefonen kommer att vara i läget Återuppringning vid nödsamtal i <xliff:g id="COUNT">%s</xliff:g> minuter. I det här läget kan inga appar som kräver en dataanslutning användas. Vill du avsluta nu?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Den valda åtgärden är inte tillgänglig i läget Återuppringning vid nödsamtal. Telefonen kommer att vara i det här läget i <xliff:g id="COUNT">%s</xliff:g> minut. Vill du avsluta nu?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Den valda åtgärden är inte tillgänglig i läget Återuppringning vid nödsamtal. Telefonen kommer att vara i det här läget i <xliff:g id="COUNT">%s</xliff:g> minuter. Vill du avsluta nu?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Den valda åtgärden är inte tillgänglig i läget Återuppringning vid nödsamtal. Telefonen kommer att vara i det här läget i <xliff:g id="COUNT">%s</xliff:g> minut. Vill du avsluta nu?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Den valda åtgärden är inte tillgänglig i läget Återuppringning vid nödsamtal. Telefonen kommer att vara i det här läget i <xliff:g id="COUNT">%s</xliff:g> minuter. Vill du avsluta nu?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Den valda åtgärden är inte tillgänglig under nödsamtal"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Avslutar läget Återuppringning vid nödsamtal"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Den valda åtgärden är inte tillgänglig under nödsamtal."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Avslutar läget Återuppringning vid nödsamtal"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Ja"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Nej"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Ta bort permanent"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Inställningar för röstbrevlådan"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;Har inte angetts&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Tjänst för röstbrevlådan"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Inställningar för <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Tjänst"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Konfiguration"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Har inte angetts&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Övriga samtalsinställningar"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Ring"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Ringer via ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Tryck och dra till höger om du vill svara"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Tryck och dra till vänster för tyst signal"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Tryck och dra till vänster om du vill avvisa"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Tryck och dra till höger om du vill svara och"\n"parkera det aktiva samtalet"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Tryck och dra till höger om du vill svara och"\n"avsluta det aktiva samtalet"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Tryck och dra till höger om du vill svara och"\n"avsluta det parkerade samtalet"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Svara"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Avvisa"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Ringer via <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"kontaktbild"</string>
     <string name="goPrivate" msgid="865837794424530980">"gör privat"</string>
     <string name="selectContact" msgid="781975788478987237">"välj kontakt"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Inställningar för Internetsamtal"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Konton för Internetsamtal (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Konton"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Hantera konton och status för Internetsamtal (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Ta emot inkommande samtal"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Sänker batteriförbrukningen"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Konfigurera samtalsalternativ"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Använd Internetsamtal"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Använd Internetsamtal (endast WiFi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"För alla samtal när datanätverk är tillgängligt"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Endast för Internetsamtal"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Fråga för varje samtal"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"För alla samtal"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Automatisk registrering"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Utgående samtal via SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Ring samtal"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Använd detta konto för Internetsamtal:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Använd för alla Internetsamtal"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Från Samtalsinställningar kan du ändra vilket konto för Internetsamtal som ska användas som standard när du ringer. Det gör du genom att markera ett annat konto under Inställningar för Internetsamtal"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Du kan ändra vilket konto som ska användas som standard för Internetsamtal. Valet görs under Telefon &gt; Inställningar &gt; Inställningar för Internetsamtal &gt; Konton."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Mobilsamtal"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Internetsamtal"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Inget konto för Internetsamtal"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Det finns inga konton för Internetsamtal. Vill du lägga till ett nu?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Det finns inget konto för Internetsamtal på den här mobilen. Vill du lägga till ett nu?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Lägg till"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Lägg till konto"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Ta bort konto"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP-konton"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Sparar kontot..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Tar bort kontot..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Kontot sparas ..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Kontot tas bort ..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Spara"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Släng"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Stäng profilen"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Stäng"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Primärt"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Gör det här till mitt primära konto"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Används för utgående samtal"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Avancerade inställningar"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Primärt konto. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Kontrollerar status..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Registrerar..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Försöker fortfarande..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Tar inte emot samtal"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Kontoregistreringen avbröts eftersom det inte finns någon Internetanslutning"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Kontoregistreringen avbröts eftersom det inte finns någon WiFi-anslutning"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Det gick inte att registrera kontot"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Tar emot samtal"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Registrerar ..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Försöker fortfarande ..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Tar inte emot samtal."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Kontoregistreringen avbröts eftersom det inte finns någon Internetanslutning."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Kontoregistreringen avbröts eftersom det inte finns någon Wi-Fi-anslutning."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Det gick inte att registrera kontot."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Tar emot samtal."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Det gick inte att registrera kontot: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); försöker igen senare"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Det gick inte att registrera kontot: felaktigt användarnamn eller lösenord"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Det gick inte att registrera kontot. Kontrollera servernamnet"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Kontot används för närvarande i appen <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Det gick inte att registrera kontot: felaktigt användarnamn eller lösenord."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Det gick inte att registrera kontot. Kontrollera servernamnet."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Kontot används för närvarande i appen <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Information om SIP-kontot"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Information om SIP-kontot"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Server"</string>
@@ -666,9 +571,6 @@
     <string name="port_title" msgid="5952939408078626657">"Portnummer"</string>
     <string name="transport_title" msgid="8253139511847746640">"Transporttyp"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Skicka \"behåll aktiv\""</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Skicka SIP-meddelanden om \"behåll aktiv\""</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Automatisk registrering"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Registrera profilen automatiskt"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Använd som primärt konto"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Används för utgående samtal"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Valfria inställningar"</string>
@@ -679,12 +581,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Valfri&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Tryck om du vill visa alla"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▷ Tryck om du vill dölja alla"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> är ett obligatoriskt fält som måste fyllas i"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Portnumret ska vara mellan 1000 och 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> är ett obligatoriskt fält som måste fyllas i."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Portnumret ska vara mellan 1000 och 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Ingen Internetanslutning"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Ingen WiFi-anslutning"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Kontrollera Internetanslutningen om du vill ringa Internetsamtal"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Telefonen måste vara ansluten till ett WiFi-nätverk för att du ska kunna ringa Internetsamtal (använd inställningarna för trådlöst och nätverk)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Kontrollera Internetanslutningen om du vill ringa Internetsamtal."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Enheten måste vara ansluten till ett Wi-Fi-nätverk för att du ska kunna ringa Internetsamtal (använd inställningarna under Trådlöst och nätverk)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Inget stöd för Internetsamtal"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Automatiskt"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Skicka alltid"</string>
@@ -693,7 +595,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Jag ringer tillbaka alldeles strax."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Jag ringer dig senare."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Kan inte prata nu. Ring senare!"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Anpassat meddelande..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Anpassat meddelande"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Snabbsvar"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Redigera snabbsvar"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -711,7 +613,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"stjärna"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"noll"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"pund"</string>
-    <string name="description_search_button" msgid="239929880630534731">"sök"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"ring upp"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backsteg"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Högtalartelefon aktiverad."</string>
@@ -721,9 +622,22 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Avvisa"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Vibrera"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Vibrera"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ringsignal"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Alltid"</item>
-    <item msgid="1595097872875714252">"Bara vid tyst"</item>
+    <item msgid="1595097872875714252">"Bara i tyst läge"</item>
     <item msgid="1458182414036878616">"Aldrig"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Ringsignal"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Mobilen vibrerar när det ringer"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Knappljud"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ringsignal"</string>
+    <string name="perm_change_mobile_network">Byt nätverk (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">En applikation med denna tillåtelse kan, när som helst, byta mellan 2G data och 3G data. 3G är snabbare, förbrukar mer batteri och kan också kosta dig mer pengar.</string>
+    <string name="advanced_setting">Avancerade inställningar</string>
+    <string name="vibrate_outgoing">Vibrera vid svar</string>
+    <string name="vibrate_45">Vibrera var 45:e sekund</string>
+    <string name="vibrate_45_sum">Vibrera var 45:e sekund under utgående samtal</string>
+    <string name="vibrate_hangup">Vibrera vid avslut</string>
+    <string name="vibrate_call_waiting">Vibrera vid samtal väntar</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index b82c501ef..edf342f10 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">" Number isiyojulikana"</string>
     <string name="payphone" msgid="1931775086311769314">"Simu ya kulipia"</string>
     <string name="onHold" msgid="9035493194749959955">"Inangoja"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Simu ya sasa"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Simu inatumika"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Mtandao unatumika"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Hakuna jibu, muda umekwisha"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Seva haiwezi kufikiwa"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Nambari haifikiwi"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Jina la mtumiaji au nenosiri sio sahihi"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Ulipiga kutoka nje ya mtandao"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Ilipigwa kutoka nje ya mtandao"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Hitilafu ya seva: Tafadhali jaribu tena baadaye."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Hakuna mtandao"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Kiwango cha ACM kimezidishwa"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radio imezima"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Hakuna SIM, ama hitilafu ya SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Hakuna SIM au kuna hitilafu ya SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Eneo ambalo halina huduma"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Simu zinazopigwa zimezuiliwa na FDN"</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Hauwezi kupiga simu wakati kizuia simu kimefunguliwa"</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Huwezi kupiga simu za kutoka wakati kupiga simu kumezuiwa."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Simu zote zimezuiwa na kidhibiti ufikiaji."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Simu za dharura zimezuiwa na kidhibiti ufikiaji."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Simu za kawaida zimezuiwa na kidhibiti ufikiaji."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Simu imefungwa hadi mzunguko wa nishati."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Simu imekatwa."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Simu imeingiliwa."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: agiza upya."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Kataa Chaguo la Huduma."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: jaribu agizo tena."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Ufikivu haujafaulu."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Imeopolewa mapema."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Simu za dharura tu ndizo zinazowezekana."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Nambari Batili"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Nambari batili"</string>
     <string name="confCall" msgid="1904840547188336828">"Simu ya kongamano"</string>
     <string name="call_lost" msgid="317670617901479594">"Simu imepotea."</string>
-    <string name="retry" msgid="8462986804300767852">"Jaribu tena"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Simu Imepotea"</string>
     <string name="ok" msgid="3811371167865772377">"Sawa"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Msimbo wa MMI  umeanza"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Msimbo wa USSD unafungua"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Viskizi vya maskio pasiwaya"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Tuma toni zinazofuata? "\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Inatuma Toni "\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Inatuma toni"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Tuma"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Ndiyo"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Hapana"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Badilisha herufi ngeni na"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Badilisha kibambo egemezi na"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Nambari ya sauti inayokosekana"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Hakuna nambari ya ujumbe wa sauti iliyohifadhiwa katika SIM kadi."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Ongeza nambari"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Inapakia…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Andika msimbo wa PUK ili kufungua SIM kadi."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM imefunguliwa"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Msimbo mpya wa PIN ya SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Andika tena msimbo mpya wa PIN ya SIM ili kuthibitisha"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Manenosiri ya pili uliyoweka hayaoani. Tafadhali jaribu tena."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Andika msimbo wa PUK ili kufungua SIM kadi"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Msimbo wa PUK sio sahihi!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Endelea"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Kadi yako ya simu imefunguliwa. Simu yangu inafungua…."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN ya kufungua mtandao wa SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Fungua"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Inaomba nywila ya mtandao…."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Ombi la kufungua mtandao halijafaulu."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Umefaulu kufungua mtandao."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Mipangilio ya simu ya GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Mipangilio ya simu ya CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Fikia Majina ya Pointi za mfikio"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Mipangilio ya ziada ya simu ya CDMA tu"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Mipangilio ya huduma ya mtandao"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Kitambulisho cha mpigaji SIM"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Inapakia mipangilio..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Nambari imefichwa kwa simu unayopiga"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Namba inaonekana kwa simu zinazopigwa"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Tumia mipangilio ya kiendesha chaguo-msingi kuonyesha namba kwa simu zinazopigwa"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Wakati namba inatumika"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Inasambaza kwa <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Imelemazwa"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Mtoa huduma wako hahimili ulemezaji wa usambazaji wa simu wakati simu yako inashughulika."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Mtoa huduma wako haauni ulemezaji wa kusambaza simu wakati simu yako inashughuli."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Sambaza wakati haipokelewi"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Weka namba wakati haijajibiwa"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Inasambaza kwa <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Imelemazwa"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Mtoa huduma wako hahimili usambazaji wa kupeleka mbele simu wakati simu yako haipokelewi."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Mtoa huduma wako haauni ulemezaji wa kusambaza simu wakati simu yako haijibu."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Sambaza wakati haifikiwi"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Wakati namba haipatikani"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Inasambaza kwa <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Imelemazwa"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Mtoa huduma wako hahimili kuzima usambazaji wa simu wakat simu yako haifikiwi."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Mtoa huduma wako haauni ulemezaji wa kusambaza simu wakati simu yako haifikiwi."</string>
     <string name="updating_title" msgid="6146755386174019046">"Mipangilio ya simu"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Hitlafu ya mipangilio ya kupiga simu"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Inasoma mipangilio…."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Inageuza mipangilio..."</string>
     <string name="response_error" msgid="6674110501330139405">"Jibu lisilotarajiwa kutoka kwa mtandao."</string>
     <string name="exception_error" msgid="7027667130619518211">"Hitilafu ya Mtandao au SIM kadi"</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Uendeshaji unaruhusiwa tu kwa namba za upigaji simu za kudumu."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Tafadhaali fungua redio kabla ya kutazama mipangilio hii."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Mpangilio wa programu ya simu yako wa Kupigia Nambari Fulani Pekee umewashwa. Kutokana na hayo, baadhi ya vipengele vinavyohusiana na simu havifanyi kazi."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Washa redio kabla ya kutazama mipangilio hii."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Sawa"</string>
     <string name="enable" msgid="1059008390636773574">"Wezesha"</string>
     <string name="disable" msgid="7274240979164762320">"Lemaza"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Ficha nambari"</item>
     <item msgid="1108394741608734023">"Onyesha nambari"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Hifadhi namba z ujumbe wa sauti"</string>
     <string name="vm_changed" msgid="380744030726254139">"Nambari ya ujumbe wa sauti haijabadilishwa"</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Mabadiliko ya nambari ya barua za sauti hayakufanikiwa. "\n"Tafadhali wasiliana na mtoa huduma wako ikiwa tatizo hili litaendelea."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Mabadiliko ya namba hayakufanikiwa"\n"Tafadhali wasiliana na mtoa huduma wako kama tatizo hili litaendelea."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Haikuweza kubadilisha namba ya ujumbe wa sauti."\n"Wasiliana na mtoa huduma wako shida hii ikiendelea."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Haikuweza kubadilisha namba ya kusambaza."\n"Wasiliana na mtoa huduma wako shida hii ikiendelea."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Haikuweza kuepua na kuhifadhi mipangilio ya nambari ya  usambazaji. "\n" Hata hivyo swichi kwa mtoahuduma  mpya?"</string>
     <string name="no_change" msgid="3186040086622435212">"Hakuna mabadiliko yaliyofanywa"</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Chagua huduma ya barua ya sauti"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Tafuta mitandao"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Hitilafu wakati wa utafutaji wa mitandao."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Inasajili kwa <xliff:g id="NETWORK">%s</xliff:g>….."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Kadi yako ya SIM hairuhusu muunganidho kwa mtandao huu."</string>
-    <string name="connect_later" msgid="500090982903469816">"Haiwezi kuunganisha kwa mtandao huu kwa wakati huu. Tafadhali jaribu tena baadaye."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"SIM kadi yako hairuhusu muunganisho wa mtandao huu."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Haiwezi kuunganisha na mtandao huu hivi sasa. Jaribu tena baadaye."</string>
     <string name="registration_done" msgid="495135664535876612">"Imesajiliwa katika mtandao"</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Chagua kiendesha mtandao"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Chagua mtoa huduma wa mtandao"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Tafuta mitandao yote inayopatikana"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Chagua kiotomatiki"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Chagua kiotomatiki mtandao unaopendelea"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Usajili otomatiki..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Chagua kiotomatiki"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Chagua mtandao unaoupendelea kiotomatiki"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Usajili otomatiki..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Hali ya Mtandao"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Badilisha gumzo ya utendaji wa mtandao"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"hali ya mtandao unaopendelewa"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Modi pendekezwa ya mtandao:  EvDo pekee"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Modi pendekezwa ya mtandao:  LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"EvDo tu"</item>
     <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo kioto"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA kiotomatiki"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo otomatiki"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA otomatiki"</item>
     <item msgid="5189164180446264504">"WCDMA tu"</item>
     <item msgid="5714714953966979187">"GSM tu"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA inapendelewa"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA inapendelewa"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Data imewezeshwa"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Urandaji wa data"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Unganisha huduma ya data  wakati wa urandaji"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Unganisha huduma ya data  wakati wa urandaji"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Umepoteza muunganisho wa data kwa sababu uliacha mtandao wako wa nyumbani wa urandaji ukiwa umezimwa"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Umepoteza muunganisho wa data kwa sababu uliacha mtandao wako wa nyumbani, data ya urandaji ikiwa imezimwa."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Je, unnataka kuruhusuji wa data? Huenda ukagharamia ada za urandaji!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Chaguo za GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Chaguo za CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Matumizi ya data"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Sera ya data ya mtoa huduma"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Data iliyotumika katika kipindi cha sasa"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Muda wa matumizi ya data"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Sera ya kasi ya data"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ ya mzunguko imekamilika"\n"Muda ufuatao unaanza baada ya siku <xliff:g id="USED_1">%2$d</xliff:g> (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Kasi ya data imepunguzwa hadi kilibaiti <xliff:g id="USED">%1$d</xliff:g> kwa sekunde kama kiwango cha matumizi ya data kimepitwa"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Maelezo zaidi kuhusu sera ya matumizi ya data ya mtandao wa mtoa huduma wako"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS ya Matangazo ya Simu"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS ya Matangazo ya Simu"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS ya Kutangaza Seli"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"SMS ya Kutangaza Seli imewezeshwa"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Kikorea"</item>
     <item msgid="1933212028684529632">"Kichina"</item>
     <item msgid="1908428006803639064">"Kiyahudi"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Lugha"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Hali ya hewa ya Nchini"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Nafasi za Ajira"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Nafasi za Ajira zimewezeshwa"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Nafasi za Ajira zimelemazwa"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Tiba, Afya na Hospitali"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Tiba, Afya na Hospitali imewezeshwa"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Tiba, Afya na Hospitali imelemazwa"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Tiba, Afya, na Hospitali"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Tiba, Afya, na Hospitali imewezeshwa"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Tiba, Afya, na Hospitali imelemazwa"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Habari za Teknolojia"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Habari za Teknolojia zimewezeshwa"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Habari za Teknolojia zimelemazwa"</string>
@@ -322,35 +288,18 @@
     <item msgid="8912042051809329533">"WCDMA tu"</item>
     <item msgid="8776934131146642662">"GSM tu"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA inapendelewa)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Tumia mitandao ya 2g peke yake"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Huokoa betri"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Chagua mfumo"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Badilisha gumzo ya kuzurura ya cdma"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Badilisha hali ya urandaji ya CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Chagua mfumo"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Nyumbani tu"</item>
     <item msgid="1205664026446156265">"Otomatiki"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Hali ya Kuzurura ya CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Badilisha hali ya kuzurura ya cdma"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Hali ya kuzurura ya CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Mitandao ya Nyumbani tu"</item>
-    <item msgid="8174642753290624634">"Mitandao Husika"</item>
-    <item msgid="2241951431403168661">"Mtandao Wowote"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Usajili wa CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Mapendeleo ya mtandao wa CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Haijatekelezwa bado!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Mapendeleo ya mtandao wa CDMA"</string>
@@ -359,21 +308,12 @@
     <item msgid="6143696847467859795">"CDMA tu"</item>
     <item msgid="2683555124647197574">"EvDo tu"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Usajili wa CDMA"</string>
+
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Badilisha kati ya RUIM/SIM na NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"usajili"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Wezesha kifaa"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Sanidi huduma ya data"</string>
@@ -390,18 +330,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Dhibiti nambari Za Upigaji simu Zilizobanwa"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Badilisha nenosiri la kufikia FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Dhibiti orodha ya nambari ya simu"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Faragha ya Sauti"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Faragha ya sauti"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Wezesha gumzo ya faragha iliyoboreshwa"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Hali ya TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Wezesha gumzo ya TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Hali ya TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Weka hali ya TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Jaribu tena Kiotomati"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Wezesha gumzo ya Jaribu tena Kioto"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Jaribu tena Kiotomatiki"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Wezesha hali ya kujaribu tena Kiotomatiki"</string>
     <string name="menu_add" msgid="1882023737425114762">"Ongeza anwani"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Hariri anwani"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Futa anwani"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Ingiza nenosiri la 2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Chapa PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Jina"</string>
     <string name="number" msgid="7905950798349903858">"Nambari"</string>
     <string name="save" msgid="4094274636321939086">"Hifadhi"</string>
@@ -414,56 +352,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Futa namba ya upigaji simu ya kudumu"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Inafuta nambari ya upigaji simu uliobanwa..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Nambari ya upigaji simu uliobanwa imefutwa"</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN haijasasishwa. Uliingiza PIN isiyo sahihi."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN haijasasishwa: nambari haiwezi kuzidisha dijiti 20."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN haikusasishwa kwa sababu uliweka PIN isiyo sahihi."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN haikusasishwa kwa sababu namba haiwezi kuzidisha herufi 20."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN haikusasishwa. PIN2 haikuwa sahihi, au namba ya simu ilikataliwa."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Inasoma kutoka kwa SIM kadi"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Hakuna anwani kwenye kadi yako ya SIM."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Chagua anwani za kuagiza"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Kuleta wasiliani kutoka kwa SIM kadi tafadhali zima modi ya Ndege."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Ili kuleta anwani kutoka kwa SIM kadi, kwanza zima hali ya Ndege."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Wezesha/lemaza nenosiri la SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Badilisha nenosiri la SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN ya SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"PIN ya zamani"</string>
     <string name="newPinLabel" msgid="207488227285336897">"PIN mpya"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Thibitisha PIN mpya"</string>
-    <string name="badPin" msgid="4154316827946559447">"PUK uliyoandika sio sahihi. Tafadhali jaribu tena."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Manenosiri ya pili uliyoweka hayaoani. Tafadhali jaribu tena."</string>
+    <string name="badPin" msgid="8955102849303984935">"PIN ya zamani uliyochapa sio sahihi. Jaribu tena."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"PIN ulizochapa hazilingani. Jaribu tena."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Chapisha nenosiri lenye nambari kati ya 4 na 8."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Lemaza Nensiri la SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Wezesha Nenosiri la SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Tafadhali subiri…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"Nenosiri la SIM limewezeshwa"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"Nenosiri la SIM limelemazwa"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Nenosiri ulilochapisha sio sahihi."</string>
-    <string name="pin_changed" msgid="9000716792724195093">"Umefaulu kubadilisha nenosiri la SIM"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN ya SIM imewezeshwa."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN ya SIM imelemazwa."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"PIN uliyochapa haikuwa sahihi."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"Umefaulu kubadilisha PIN ya SIM."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Nenosiri sio sahihi, SIM imefungwa! PUK2 imeombwa."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Nenosiri la zamani"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Nenosiri la 2 mpya"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Thibitisha nenosiri la pili mpya"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"PUK2 uliyoandika sio sahihi. Tafadhali jaribu tena."</string>
-    <string name="badPin2" msgid="515218795152422178">"PUK2 uliyoandika sio sahihi. Tafadhali jaribu tena."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Manenosiri ya pili uliyoweka hayaoani. Tafadhali jaribu tena."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"PUK2 uliyocharaza sio sahihi. Jaribu tena."</string>
+    <string name="badPin2" msgid="1041576234483629991">"PIN2 ya zamani uliyochapa sio sahihi. Jaribu tena."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"PIN2 ulizocharaza haziambatani. Jaribu tena."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Chapisha nenosiri la 2 yaani nambari 4 hadi 8."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Chapisha PUK2 ambayo ina namba 8."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"Umefaulu kubadilisha nenosiri la 2"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 imefaulu kubadilishwa."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Andika msimbo wa PUK ya 2."</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Nenosiri sio sahihi, tafadhali badilisha nenosiri la pili kisha ujaribu tena!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Nenosiri sio sahihi, SIM imefungwa! PUK2 imeombwa."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Nenosiri sio sahihi. Badilisha PIN2 na ujaribu tena."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Nenosiri sio sahihi, SIM imefungwa. PUK2 imeombwa."</string>
     <string name="doneButton" msgid="2859593360997984240">"Kwisha"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Simu ya kongamano <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Rudi nyuma upige simu"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Endelea bila ya SIM kadi"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Hakuna SIM kadi iliyopatikana. Tafadhali weka SIM kadi kwa simu."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Kataa"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Fungua"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Inathibitisha nenosiri...."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Nambari ya ujumbe wa sauti"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Inapiga"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Inajaribu tena"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Simu ya kongamano"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Simu inayoingia"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Kusubiri simu ya Cdma"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Simu imekamilika"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Inangoja"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Kukata simu"</string>
@@ -473,7 +405,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Simu zisizojibiwa"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> simu ambazo hazijajibiwa"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Simu isiyojibiwa kutoka <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Simu ya sasa (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Simu inayoendelea"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Inangoja"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Simu inayoingia"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Ujumbe mpya wa sauti"</string>
@@ -482,13 +414,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Nambari ya ujumbe wa sauti haijulikani."</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Hakuna huduma"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Mtandao uliochaguliwa <xliff:g id="OPERATOR_NAME">%s</xliff:g> haupatikani"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Kata simu"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Mpigie"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Ujumbe"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Kupiga simu, kwanza zima hali ya ndege."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Haijasajiliwa kwa mitandao"</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mtandao wa simu haupatikani."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Simu haijatumwa, hakuna nambari halali iliyoingizwa."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Simu haijatumwa."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Inaanzisha msururu wa MMI…"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Inaanzisha mfuatano wa msimbo wa kipengele..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Kifaa ambacho hakijahiliwa."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Imeshindwa kubadilisha simu"</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Imeshindwa kutenganisha simu."</string>
@@ -500,18 +434,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Simu ya dharura"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Inawasha redio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Uko mahali pasipokuwa na huduma, inajaribu tena…."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Simu haijatumwa, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> sio nambari ya dharura!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Simu haijatumwa, tafadhali bonyeza nambari ya dharura!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Simu haijatumwa. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> sio nambari ya dharura!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Simu haijatumwa. Piga nambari ya dharura!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Tumia kichapishi kubonyeza"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Kibao namba cha toni cha mguso"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Shikilia"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Endeleza"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Mwisho"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Kibao cha kupiga"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Ficha"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Spika"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Nyamazisha"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Ongeza simu"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Changanyisha simu"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Badili"</string>
@@ -530,36 +459,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Maandishi ya ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Toni za DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Toni za DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Weka urefu wa toni za DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Kawaida"</item>
     <item msgid="2883365539347850535">"Ndefu"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Ujumbe wa Mtandao"</string>
+    <string name="network_message" msgid="4483886461245213802">"Ujumbe wa mtandao"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Wezesha simu yako"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Simu maalum inahitaji kupigwa ili kuamilisha huduma ya simu yako. "\n\n" Baada ya kubonyeza \"Amilisha\", sikiliza maagizo yaliyotolewa ili kuamilisha simu yako."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Gusa \'\'Wezesha\'\' ili kupiga simu maalum ambayo inaamilisha simu yako kwenye mtoa huduma wa mtando wa simu, sasa unaweza kupia simu na kuunganisha kwa mitandao ya data ya simu."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Ruka uwezeshaji?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Kama utaruka kuwezesha, hauwezi kupiga simu au kuunganisha kwa mitandao ya data ya simu (ingawaje unaweza kuunganisha kwa mitandao-hewa). Hadi uiwezeshe simu yako, utaulizwa uiwezeshe kila utakapoiwasha."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Ruka"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Wezesha"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Amilisha"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Simu imelemazwa!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Simu imeamilishwa."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Tatizo na uamilisho"</string>
     <string name="ota_listen" msgid="162923839877584937">"Fuata maagizo yanayotamkwa hadi usikie kwamba uwezeshaji umekamilika."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Kibao cha vitufe"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Spika"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Tafadhali subiri wakati simu yako inaprogramiwa."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Usanidi Haukufanikiwa"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Subiri wakati simu yako inapoprogramiwa."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Usanidi haukufanikiwa"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Simu yako imeamilishwa sasa. Huenda ikachukua hadi dakika 15 kwa huduma kuanza."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Simu yako haikuamilishwa. "\n" Huenda ukahitaji kupata eneo lenye mtandao bora (karibu na dirisha, au nje). "\n\n" Jaribu tena au piga simu kwa huduma kwa wateja kwa chaguo zaidi."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Simu yako haikuamilishwa. "\n" Huenda ukahitaji kupata eneo lenye mtandao bora (karibu na dirisha, au nje). "\n\n"Jaribu tena au piga simu kwa huduma ya wateja kwa chaguo zaidi."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"USHINDE ZAIDI WA SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Nyuma"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Jaribu tena"</string>
     <string name="ota_next" msgid="3904945374358235910">"Ifuatayo"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Nyuma"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Umeingia katika gumzo ya kupiga tena simu ya Dharura"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"hali ya kupiga tena simu ya Dharura"</string>
@@ -569,87 +493,69 @@
     <item quantity="other" msgid="3122217344579273583">"Hakuna data ya muunganisho kwa dakika <xliff:g id="COUNT">%s</xliff:g>"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Simu itakuwa katika hali ya kupiga tena simu za dharura kwa dakika <xliff:g id="COUNT">%s</xliff:g>. Ukiwa katika hali hii hakuna programu zinazotumia muunganisho wa data zinazoweza kutumiwa. Je, ungependa kuondoka sasa."</item>
-    <item quantity="other" msgid="3231879566243957821">"Simu itakuwa katika gumzo ya kupiga tena simu ya dharura kwa dakika <xliff:g id="COUNT">%s</xliff:g>. Ukiwa katika gumzo hii hakuna programu za kompyuta zinazotumia muunganisho wa data zinazoweza kutumiwa. Je, ungependa kutoka sasa?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Simu itakuwa katika hali ya Kupiga tena Simu ya Dharura kwa dakika <xliff:g id="COUNT">%s</xliff:g>. Ukiwa katika hali hii hakuna programu zinazotumia muunganisho wa data zinazoweza kutumika. Je, unataka kutoka sasa?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Simu itakuwa katika hali ya Kupiga tena Simu ya Dharura kwa dakika <xliff:g id="COUNT">%s</xliff:g>. Ukiwa katika hali hii hakuna programu zinazotumia muunganisho wa data zinazoweza kutumika. Je, unataka kutoka sasa?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Kitendo kilichochaguliwa hakipatikani ikiwa katika hali ya kupiga tena simu ya dharura. Simu itakuwa katika hali hii kwa dakika <xliff:g id="COUNT">%s</xliff:g>. Ungependa kutoka sasa?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Kitendo kilichochaguliwa hakipatikani ikiwa katika hali ya kupiga tena simu ya dharura. Simu itakuwa katika hali hii kwa dakika <xliff:g id="COUNT">%s</xliff:g>. Ungependa kutoka sasa?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Tendo lililochaguliwa halipatikana wakati iko katika hali ya kupiga tena simu ya dharura. Simu itakuwa katika hali hii kwa dakika <xliff:g id="COUNT">%s</xliff:g>. Je, unataka kutoka sasa?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Kitendo kilichochaguliwa hakipatikani katika hali ya Kupiga Tena Simu ya Dharura. Simu itakuwa katika hali hii kwa dakika <xliff:g id="COUNT">%s</xliff:g>. Je, unataka kutoka sasa?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Kitendo kilichochaguliwa hakipatikani ikiwa katika simu ya dharura"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Inatoka kwa Hali ya kupiga tena simu ya Dharura"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Kitendo kilichochaguliwa hakipatikani ikiwa katika simu ya dharura."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Inatoka kwa hali ya Kupiga tena simu ya Dharura"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Ndiyo"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Hapana"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Kataa"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Mipangilio ya barua ya sauti"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;haijawekwa&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Huduma ya barua ya sauti"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Mipangilio ya <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Huduma"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Sanidi"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Haijawekwa&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Mipangilio mingine ya simu"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Piga"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Inapiga simu kupitia ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Kokota kulia ili kujibu"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Kokota kushoto ili kunyamazisha mlio"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Kokota kushoto kukataa"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Kokota kulia ili jibu na "\n"kushikilia simu inayoendelea"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Kokota kulia ili kujibu na "\n"katisha simu amilifu"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Kokota kulia ili kujibu na "\n"kata simu inayosubiri"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Jibu"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Kataa"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Kupiga simu kupitia <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"picha ya anwani"</string>
     <string name="goPrivate" msgid="865837794424530980">"nenda kwa faragha"</string>
     <string name="selectContact" msgid="781975788478987237">"chagua anwani"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Mipangilio ya simu za wavuti"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Akaunti za upigaji simu za wavuti (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Akaunti"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">" Dhibiti akaunti na hali za upigaji simu za wavuti (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Pokea simu zinazoingia"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Hupunguza maisha ya betri"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Sanidi chaguo za simu"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Tumia upigaji simu wa wavuti"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Tumia upigaji simu ya wavuti (mtandao-hewa tu)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Kwa simu zote wakati mtandao wa data unapatikana"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Kwa simu za wavuti tu"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Uliza kwa kila simu"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Kwa simu zote"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Usajili wa kiotomatiki"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Simu ya kutoka kupitia SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Piga simu"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Tumia akaunti ya upigaji simu za wavuti:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Tumia kila wakati kupiga simu za wavuti"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Unaweza kutumia Mipangilio ya Kupiga simu kubadilisha ni akaunti ipi ya upigaji simu kwenye wavuti itakayotumika kwa chaguo-msingi wakati wa kupiga simu, kwa kuchagua akaunti tofauti chini ya mipangilio ya Upigaji simu za Wavuti"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Unaweza kubadilisha ni akaunti gani ya kupiga simu ya mtandao itatumika kimsingi kutoka kwa Simu &gt; Mipangilio &gt; mipangilio ya kupiga simu ya mtandao &gt; Skrini ya akaunti."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Kupiga simu ya mkononi"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Simu ya wavuti"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Hakuna akaunti ya upigaji simu wa Mtandao"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Hakuna akaunti za upigaji wa simu za wavuti kwenye simu hii. Ongeza moja sasa?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Hakuna akaunti za kupiga simu za mtandao kwenye simu hii. Je, unataka kuongeza moja sasa?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Ongeza"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Ongeza akaunti"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Ondoa akaunti"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Akaunti za SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Inahifadhi akaunti..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Inaondoa akaunti..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Inahifadhi akaunti..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Inaondoa akaunti..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Hifadhi"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Tupa"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Funga maelezo mafupi"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"Sawa"</string>
     <string name="close_profile" msgid="6886968271423155284">"Funga"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Msingi"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Fanya hii iwe akaunti yangu ya msingi"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Ilitumika kwa simu zinazotoka"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Mipangilio mahiri"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Akaunti ya msingi: <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Inakakuga hali..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Inasajili..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Bado inajaribu..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Haipokeai simu"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Usajili wa akaunti umesimamishwa kwa sababu hakuna muunganisho wa Mtandao"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Usajili wa akaunti umekomeshwa kwa sababu hakuna muunganisho wa mtandao-hewa"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Usajili wa akaunti haujafanikiwa"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Inapokea simu"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Inasajili..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Bado inajaribu..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Haipokei simu."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Usajili wa akaunti umesimamishwa kwa sababu hakuna muunganisho wa Mtandao."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Usajili wa akaunti umekomeshwa kwa sababu hakuna muunganisho wa Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Usajili wa akaunti haujafanikiwa."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Inapokea simu."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Usajili wa akaunti haujafaulu: <xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>; nitajaribu baadaye"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Usajili wa akaunti hujafanikiwa: jina lamtumiaji au nywila isiyo sahihi"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Usajili wa akaunti hujafaulu: angalia jina la seva"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Akaunti hii inatumika kwa sasa na programu ya <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Usajili wa akaunti hujafaulu: Jina la mtumiaji au nenosiri sio sahihi."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Usajili wa akaunti haujafaulu: Kagua jina la seva."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Akaunti hii inatumika kwa sasa na programu ya <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Maelezo ya akaunti ya SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Maelezo ya akaunti ya SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Seva"</string>
@@ -660,9 +566,6 @@
     <string name="port_title" msgid="5952939408078626657">"Nambari ya mlango"</string>
     <string name="transport_title" msgid="8253139511847746640">"Aina ya usafiri"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Tuma weka-hai"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Tuma ujumbe wa SIP keep-alive"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Usajili wa kiotomatiki?"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Sajili maelezo mafupi kiotomatiki"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Weka kama akaunti ya msingi"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Hutumika kwa simu zinazotoka"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Mipangilio ya hiari"</string>
@@ -673,12 +576,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&amp;lt Ni hiari &gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Gusa ili kuonyesha yote"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Guza ili kuficha zote"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> inahitajika, haiwezi kuachwa wazi"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Nambari ya mlango inafaa kuwa kati ya 1000 na 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> inahitajika na haiwezi kuachwa wazi."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Nambari ya kituo tarishi inafaa kuwa kati ya 1000 na 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Hakuna muunganisho wa wavuti"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Hakuna muunganisho wa mtandao-hewa"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Ili kupiga simu ya wavuti, kagua muunganisho wako wa wavuti kwanza"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Lazima uwe umeunganishwa kwa mtandao-hewa ili kupiga simu za Wavuti (tumia mipangilio ya Mtandao-hewa na Mtandao)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Ili kupiga simu ya mtandao, kagua muunganisho wako wa Mtandao kwanza."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Lazima uwe umeunganishwa kwa mtandao wa Wi-Fi ili kupiga simu za mtandao(tumia pasi waya &amp; Mipangilio ya mtandao)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Upigaji simu za wavuti hauhimiliwi"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Otomatiki"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Tuma kila wakati"</string>
@@ -687,7 +590,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Nitakupigia mara moja."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Nitakupigia baadaye."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Siwezi kuongea sasa. Nipigie baadaye?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Ujumbe maalum..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Ujumbe maalum"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Majibu ya haraka"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Hariri majibu ya haraka"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +608,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"nyota"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"sufuri"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"pauni"</string>
-    <string name="description_search_button" msgid="239929880630534731">"tafuta"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"piga simu"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"nafasi ya nyuma"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Spika za simu zimewezeshwa"</string>
@@ -713,11 +615,16 @@
     <string name="description_target_answer" msgid="7205604197797472471">"Jibu"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Tuma SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Kataa"</string>
-    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Tikisika"</string>
-    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Tikisika"</string>
+    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Mtetemo"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Mtetemo"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Mlio wa simu"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
-    <item msgid="468237575962916558">"Kila wakati"</item>
+    <item msgid="468237575962916558">"Daima"</item>
     <item msgid="1595097872875714252">"Ikiwa kimya tu"</item>
-    <item msgid="1458182414036878616">"Katu"</item>
+    <item msgid="1458182414036878616">"Kamwe"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Mlio wa simu"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Tetema wakati wa kuita"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Toni za mguso wa pedi ya kupiga"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Mlio wa simu"</string>
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index b076cd1a8..5430184fd 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"หมายเลขส่วนตัว"</string>
     <string name="payphone" msgid="1931775086311769314">"โทรศัพท์สาธารณะ"</string>
     <string name="onHold" msgid="9035493194749959955">"พักสาย"</string>
-    <string name="ongoing" msgid="8300874342848721367">"สายปัจจุบัน"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"สายไม่ว่าง"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"เครือข่ายไม่ว่าง"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"ไม่มีการตอบกลับ หมดเวลา"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"ไม่สามารถเข้าถึงเซิร์ฟเวอร์ได้"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"ไม่สามารถติดต่อเลขหมายนี้ได้"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"โทรจากนอกเครือข่าย"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"โทรจากนอกเครือข่าย"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"ข้อผิดพลาดของเซิร์ฟเวอร์ โปรดลองอีกครั้งในภายหลัง"</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"ไม่มีสัญญาณ"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"เกินจำนวนสูงสุดของ ACM แล้ว"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"ปิดวิทยุ"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"ไม่มีซิมหรือเกิดข้อผิดพลาดกับซิม"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"ไม่มีซิมหรือเกิดข้อผิดพลาดกับซิม"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"นอกพื้นที่ให้บริการ"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"การโทรออกถูกจำกัดโดย FDN"</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"โทรออกไม่ได้เมื่อระงับการโทรไว้"</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"โทรออกไม่ได้เมื่อระงับการโทรไว้"</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"การโทรทั้งหมดถูกจำกัดโดยการควบคุมการเข้าถึง"</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"การโทรฉุกเฉินถูกจำกัดโดยการควบคุมการเข้าถึง"</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"การโทรปกติถูกจำกัดโดยการควบคุมการเข้าถึง"</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: โทรศัพท์ถูกล็อกจนกว่าจะเปิดเครื่องครั้งถัดไป"</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: สายหลุด"</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: สายถูกขัดจังหวะ"</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: ลำดับใหม่"</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: ตัวเลือกบริการถูกปฏิเสธ"</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: ลองลำดับใหม่"</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: การเข้าใช้ไม่สำเร็จ"</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: ถูกจองใช้งานไว้"</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"ได้เฉพาะโทรฉุกเฉินเท่านั้น"</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"หมายเลขไม่ถูกต้อง"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"หมายเลขไม่ถูกต้อง"</string>
     <string name="confCall" msgid="1904840547188336828">"การประชุมสาย"</string>
     <string name="call_lost" msgid="317670617901479594">"สายหลุดไป"</string>
-    <string name="retry" msgid="8462986804300767852">"ลองอีกครั้ง"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"สายหลุด"</string>
     <string name="ok" msgid="3811371167865772377">"ตกลง"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"เริ่มรหัส MMI แล้ว"</string>
     <string name="ussdRunning" msgid="485588686340541690">"กำลังรันรหัส USSD..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"ชุดหูฟังแบบมีสาย"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"บลูทูธ"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"ส่งโทนเสียงต่อไปนี้หรือไม่ "\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"กำลังส่งโทนเสียง "\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"กำลังส่งโทนเสียง"\n</string>
     <string name="send_button" msgid="4106860097497818751">"ส่ง"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"ใช่"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"ไม่"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"แทนที่อักขระแทนด้วย"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"แทนที่อักขระแทนด้วย"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"ไม่มีหมายเลขข้อความเสียง"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"ไม่มีหมายเลขข้อความเสียงจัดเก็บอยู่ในซิมการ์ด"</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"เพิ่มหมายเลข"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"กำลังโหลด…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"พิมพ์รหัส PIN เพื่อปลดล็อdซิมการ์ด"</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"ปลดล็อกซิมแล้ว"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"รหัส PIN ของซิมใหม่"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"พิมพ์รหัส PIN ใหม่ของซิมอีกครั้งเพื่อยืนยัน"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"PIN ของซิมที่คุณพิมพ์ไม่ตรง โปรดลองอีกครั้ง"</string>
-    <string name="enterPuk" msgid="6144749655582862324">"พิมพ์รหัส PUK เพื่อปลดล็อกซิมการ์ด"</string>
-    <string name="badPuk" msgid="3213017898690275965">"รหัส PUK ไม่ถูกต้อง!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"ดำเนินการต่อ"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"ยกเลิกการปิดกั้นซิมการ์ดแล้ว กำลังปลดล็อกโทรศัพท์ของคุณ..."</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN ปลดล็อกเครือข่ายซิม"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"ปลดล็อก"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"กำลังขอปลดล็อกเครือข่าย..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"คำขอปลดล็อกเครือข่ายไม่สำเร็จ"</string>
     <string name="unlock_success" msgid="6770085622238180152">"ปลดล็อกเครือข่ายไม่สำเร็จ"</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"การตั้งค่าการโทร GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"การตั้งค่าการโทร CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"ชื่อจุดเข้าใช้งาน"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"การตั้งค่าการโทรเฉพาะ CDMA เพิ่มเติม"</string>
     <string name="labelNwService" msgid="4699970172021870983">"การตั้งค่าบริการเครือข่าย"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"หมายเลขผู้โทร"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"กำลังโหลดการตั้งค่า…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"หมายเลขที่ซ่อนในสายโทรออก"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"หมายเลขที่แสดงในสายโทรออก"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"ใช้การตั้งค่าเริ่มต้นของผู้ให้บริการเพื่อแสดงหมายเลขของฉันขณะโทรออก"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"หมายเลขเมื่อสายไม่ว่าง"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"โอนสายไปที่ <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"ถูกปิดใช้งาน"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"ผู้ให้บริการของคุณไม่สนับสนุนการปิดใช้งานการโอนสายเมื่อสายไม่ว่าง"</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"ผู้ให้บริการของคุณไม่สนับสนุนการปิดใช้งานการโอนสายเมื่อสายไม่ว่าง"</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"โอนสายเมื่อไม่มีผู้รับ"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"หมายเลขเมื่อไม่ได้รับสาย"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"โอนสายไปที่ <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"ถูกปิดใช้งาน"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"ผู้ให้บริการของคุณไม่สนับสนุนการปิดใช้งานการโอนสายเมื่อไม่มีผู้รับสาย"</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"ผู้ให้บริการของคุณไม่สนับสนุนการปิดใช้งานการโอนสายเมื่อไม่มีผู้รับสาย"</string>
     <string name="labelCFNRc" msgid="47183615370850000">"โอนสายเมื่อติดต่อไม่ได้"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"หมายเลขเมื่อติดต่อไม่ได้"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"โอนสายไปที่ <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"ถูกปิดใช้งาน"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"ผู้ให้บริการของคุณไม่สนับสนุนการปิดใช้งานการโอนสายเมื่อติดต่อไม่ได้"</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"ผู้ให้บริการของคุณไม่สนับสนุนการปิดใช้งานการโอนสายเมื่อติดต่อไม่ได้"</string>
     <string name="updating_title" msgid="6146755386174019046">"การตั้งค่าการโทร"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"ข้อผิดพลาดในการตั้งค่าการโทร"</string>
     <string name="reading_settings" msgid="1920291699287055284">"กำลังอ่านการตั้งค่า…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"กำลังย้อนกลับการตั้งค่า…"</string>
     <string name="response_error" msgid="6674110501330139405">"พบการตอบกลับที่ไม่คาดหมายจากเครือข่าย"</string>
     <string name="exception_error" msgid="7027667130619518211">"ข้อผิดพลาดของเครือข่ายหรือซิมการ์ด"</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"การดำเนินการนี้อนุญาตให้ทำได้ตามการจำกัดหมายเลขโทรออกเท่านั้น"</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"โปรดเปิดวิทยุก่อนดูการตั้งค่าเหล่านี้"</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"เนื่องจากมีการเปิดใช้การตั้งค่าการจำกัดหมายเลขโทรออกของแอปโทรศัพท์ จึงเป็นผลให้คุณลักษณะที่เกี่ยวกับการโทรบางอย่างไม่ทำงาน"</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"เปิดวิทยุก่อนดูการตั้งค่าเหล่านี้"</string>
     <string name="close_dialog" msgid="2365884406356986917">"ตกลง"</string>
     <string name="enable" msgid="1059008390636773574">"ใช้งาน"</string>
     <string name="disable" msgid="7274240979164762320">"ปิดการใช้งาน"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"ซ่อนหมายเลข"</item>
     <item msgid="1108394741608734023">"แสดงหมายเลข"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"บันทึกหมายเลขข้อความเสียง"</string>
     <string name="vm_changed" msgid="380744030726254139">"เปลี่ยนหมายเลขข้อความเสียงแล้ว"</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"เปลี่ยนหมายเลขข้อความเสียงไม่สำเร็จ "\n"โปรดติดต่อผู้ให้บริการของคุณหากยังพบปัญหานี้อยู่"</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"เปลี่ยนหมายเลขโอนสายไม่สำเร็จ "\n"โปรดติดต่อผู้ให้บริการของคุณหากยังพบปัญหานี้อยู่"</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"ไม่สามารถเปลี่ยนหมายเลขข้อความเสียง"\n"ติดต่อผู้ให้บริการของคุณหากปัญหานี้ยังคงอยู่"</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"ไม่สามารถเปลี่ยนหมายเลขที่จะโอน"\n"ติดต่อผู้ให้บริการของคุณหากปัญหานี้ยังคงอยู่"</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"ไม่สามารถดึงและบันทึกการตั้งค่าจำนวนการส่งต่อในปัจจุบัน "\n"ยังคงต้องการสลับไปยังผู้ให้บริการใหม่หรือไม่"</string>
     <string name="no_change" msgid="3186040086622435212">"ไม่มีการเปลี่ยนแปลง"</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"เลือกบริการข้อความเสียง"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"ค้นหาเครือข่าย"</string>
     <string name="network_query_error" msgid="6828516148953325006">"พบข้อผิดพลาดขณะค้นหาเครือข่าย"</string>
     <string name="register_on_network" msgid="9055203954040805084">"กำลังลงทะเบียนบน <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"ซิมการ์ดของคุณไม่อนุญาตให้เชื่อมต่อกับเครือข่ายนี้"</string>
-    <string name="connect_later" msgid="500090982903469816">"ไม่สามารถเชื่อมต่อกับเครือข่ายนี้ในขณะนี้ โปรดลองอีกครั้งในภายหลัง"</string>
+    <string name="not_allowed" msgid="5613353860205691579">"ซิมการ์ดของคุณไม่อนุญาตให้เชื่อมต่อกับเครือข่ายนี้"</string>
+    <string name="connect_later" msgid="2308119155752343975">"ไม่สามารถเชื่อมต่อเครือข่ายนี้ได้ในขณะนี้ ลองอีกครั้งในภายหลัง"</string>
     <string name="registration_done" msgid="495135664535876612">"ลงทะเบียนบนเครือข่ายแล้ว"</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"เลือกผู้ให้บริการเครือข่าย"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"เลือกผู้ให้บริการเครือข่าย"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"ค้นหาเครือข่ายทั้งหมดที่ใช้ได้"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"เลือกอัตโนมัติ"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"เลือกเครือข่ายที่ต้องการอัตโนมัติ"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"การลงทะเบียนอัตโนมัติ..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"เลือกโดยอัตโนมัติ"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"เลือกเครือข่ายที่ต้องการอัตโนมัติ"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"การลงทะเบียนอัตโนมัติ..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"โหมดเครือข่าย"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"เปลี่ยนโหมดปฏิบัติการของเครือข่าย"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"โหมดเครือข่ายที่ต้องการ"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"โหมดเครือข่ายที่ต้องการ: EvDo เท่านั้น"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"โหมดเครือข่ายที่ต้องการ: LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"EvDo เท่านั้น"</item>
     <item msgid="454610224530856274">"CDMA w/o EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA/EvDo อัตโนมัติ"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA อัตโนมัติ"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo อัตโนมัติ"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA อัตโนมัติ"</item>
     <item msgid="5189164180446264504">"WCDMA เท่านั้น"</item>
     <item msgid="5714714953966979187">"GSM เท่านั้น"</item>
-    <item msgid="4775796025725908913">"ต้องการ GSM/WCDMA"</item>
+    <item msgid="8508331239546115206">"ต้องการ GSM/WCDMA"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"เปิดใช้งานข้อมูลแล้ว"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"การโรมมิ่งข้อมูล"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"เชื่อมต่อบริการข้อมูลขณะโรมมิ่ง"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"เชื่อมต่อบริการข้อมูลขณะโรมมิ่ง"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"การเชื่อมต่อข้อมูลของคุณหายไปเนื่องจากคุณออกจากเครือข่ายที่บ้านโดยปิดการโรมมิ่งข้อมูลไว้"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"การเชื่อมต่อข้อมูลของคุณหายไปเนื่องจากคุณออกจากเครือข่ายที่บ้านโดยปิดการโรมมิ่งข้อมูลไว้"</string>
     <string name="roaming_warning" msgid="7820963598559553967">"การเปิดโรมมิ่งข้อมูลอาจทำให้คุณเสียค่าใช้จ่ายมาก!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"ตัวเลือก GSM//UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"ตัวเลือก CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"การใช้ข้อมูล"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"นโยบายข้อมูลของผู้ให้บริการ"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"ข้อมูลที่ใช้ในช่วงเวลาปัจจุบัน"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"ช่วงเวลาการใช้ข้อมูล"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"นโยบายอัตราการส่งข้อมูล"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ ของรอบผ่านไป "\n" ช่วงถัดไปจะเริ่มในอีก <xliff:g id="USED_1">%2$d</xliff:g> วัน (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"อัตราการส่งข้อมูลถูกลดเหลือ <xliff:g id="USED">%1$d</xliff:g> Kb/s เมื่อใช้ข้อมูลเกินขีดจำกัดแล้ว"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"ข้อมูลเพิ่มเติมเกี่ยวกับนโยบายการใช้ข้อมูลของเครือข่ายมือถือจากผู้ให้บริการของคุณ"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS แจ้งเครือข่ายที่ใช้งาน"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS แจ้งเครือข่ายที่ใช้งาน"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS แจ้งเครือข่ายที่ใช้งาน"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"เปิดการใช้งาน SMS แจ้งเครือข่ายที่ใช้งานแล้ว"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"เกาหลี"</item>
     <item msgid="1933212028684529632">"จีน"</item>
     <item msgid="1908428006803639064">"ฮีบรู"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"ภาษา"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"พยากรณ์อากาศท้องถิ่น"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"โอกาสการจ้างงาน"</string>
     <string name="eo_enable" msgid="8623559062015685813">"เปิดใช้งานโอกาสการจ้างงานแล้ว"</string>
     <string name="eo_disable" msgid="3863812478090907609">"ปิดใช้งานโอกาสการจ้างงาน"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"การแพทย์ สุขภาพ และโรงพยาบาล"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"เปิดใช้งานการแพทย์ สุขภาพ และโรงพยาบาลแล้ว"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"การแพทย์ สุขภาพ และโรงพยาบาลถูกปิดใช้งาน"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"การแพทย์ สุขภาพ และโรงพยาบาล"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"เปิดใช้งานการแพทย์ สุขภาพ และโรงพยาบาลแล้ว"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"การแพทย์ สุขภาพ และโรงพยาบาลถูกปิดใช้งาน"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"ข่าวเทคโนโลยี"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"เปิดใช้งานข่าวเทคโนโลยีแล้ว"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"ปิดใช้งานข่าวเทคโนโลยี"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"WCDMA เท่านั้น"</item>
     <item msgid="8776934131146642662">"GSM เท่านั้น"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (ต้องการ WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"ใช้เฉพาะเครือข่าย 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"ประหยัดแบตเตอรี่"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"การเลือกระบบ"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"เปลี่ยนโหมดการเชื่อมต่อกับเครือข่าย CDMA อื่น"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"เปลี่ยนโหมดการเชื่อมต่อกับเครือข่าย CDMA อื่น"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"การเลือกระบบ"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"โทรกลับบ้านเท่านั้น"</item>
     <item msgid="1205664026446156265">"อัตโนมัติ"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"โหมดการเชื่อมต่อกับเครือข่าย CDMA อื่น"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"เปลี่ยนโหมดการเชื่อมต่อกับเครือข่าย CDMA อื่น"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"โหมดการเชื่อมต่อกับเครือข่าย CDMA อื่น"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"เครือข่ายในบ้านเท่านั้น"</item>
-    <item msgid="8174642753290624634">"เครือข่ายที่เชื่อมโยงไว้"</item>
-    <item msgid="2241951431403168661">"เครือข่ายใดก็ได้"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"การสมัครรับข้อมูล CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"ค่ากำหนดเครือข่าย CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"ยังไม่ได้ใช้งาน!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"ค่ากำหนดเครือข่าย CDMA"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"CDMA เท่านั้น"</item>
     <item msgid="2683555124647197574">"EvDo เท่านั้น"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"การสมัครรับข้อมูล CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"เปลี่ยนระหว่าง RUIM/SIM และ NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"การสมัครรับข้อมูล"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"เปิดใช้งานอุปกรณ์"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"ตั้งค่าบริการข้อมูล"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"จัดการการกำจัดหมายเลขโทรออก"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"เปลี่ยน PIN สำหรับการเข้าถึง FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"จัดการรายการหมายเลขโทรศัพท์"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"ความเป็นส่วนตัวในการโทรด้วยเสียง"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"ความเป็นส่วนตัวในการโทรด้วยเสียง"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"เปิดใช้งานโหมดเพิ่มความเป็นส่วนตัว"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"โหมด TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"เปิดใช้งานโหมด TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"โหมด TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"ตั้งค่าโหมด TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"ลองซ้ำอัตโนมัติ"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"เปิดใช้งานการลองซ้ำอัตโนมัติ"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"ลองซ้ำอัตโนมัติ"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"เปิดใช้งานโหมดลองซ้ำอัตโนมัติ"</string>
     <string name="menu_add" msgid="1882023737425114762">"เพิ่มที่อยู่ติดต่อ"</string>
     <string name="menu_edit" msgid="7143003705504672374">"แก้ไขที่อยู่ติดต่อ"</string>
     <string name="menu_delete" msgid="3977150783449642851">"ลบที่อยู่ติดต่อ"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"ป้อน PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"พิมพ์ PIN2"</string>
     <string name="name" msgid="7329028332786872378">"ชื่อ"</string>
     <string name="number" msgid="7905950798349903858">"หมายเลข"</string>
     <string name="save" msgid="4094274636321939086">"บันทึก"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"ลบการจำกัดหมายเลขโทรออก"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"กำลังลบการจำกัดหมายเลขโทรออก…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"ลบการจำกัดหมายเลขโทรออกแล้ว"</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN ไม่อัปเดต: คุณป้อน PIN ไม่ถูกต้อง"</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN ไม่อัปเดต: ตัวเลขต้องไม่เกิน 20 หลัก"</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN ไม่อัปเดตเพราะคุณป้อน PIN ไม่ถูกต้อง"</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN ไม่อัปเดตเพราะหมายเลขจะมีจำนวนเกิน 20 หลักไม่ได้"</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"ไม่ได้อัปเดต FDN เพราะ PIN2 ไม่ถูกต้องหรือหมายเลขโทรศัพท์ถูกปฏิเสธ"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"กำลังอ่านจากซิมการ์ด…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"ไม่มีที่อยู่ติดต่อบนซิมการ์ดของคุณ"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"เลือกสมุดโทรศัพท์ที่จะนำเข้า"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"โปรดปิดโหมดใช้งานบนเครื่องบินเพื่อนำเข้าผู้ติดต่อจากซิมการ์ด"</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"ในการนำเข้าผู้ติดต่อจากซิมการ์ด ให้ปิดโหมดบนเครื่องบินก่อน"</string>
     <string name="enable_pin" msgid="5422767284133234860">"เปิด/ปิดใช้งาน PIN ของซิม"</string>
     <string name="change_pin" msgid="9174186126330785343">"เปลี่ยน PIN ของซิม"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN ของซิม:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"PIN เก่า"</string>
     <string name="newPinLabel" msgid="207488227285336897">"PIN ใหม่"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"ยืนยัน PIN ใหม่"</string>
-    <string name="badPin" msgid="4154316827946559447">"PIN เก่าที่คุณพิมพ์ไม่ถูกต้อง โปรดลองอีกครั้ง"</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"PIN ของซิมที่คุณพิมพ์ไม่ตรง โปรดลองอีกครั้ง"</string>
+    <string name="badPin" msgid="8955102849303984935">"PIN เก่าที่คุณพิมพ์ไม่ถูกต้อง โปรดลองอีกครั้ง"</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"PIN ที่คุณพิมพ์ไม่ตรงกัน โปรดลองอีกครั้ง"</string>
     <string name="invalidPin" msgid="5981171102258684792">"พิมพ์ PIN ซึ่งเป็นเลข 4-8 หลัก"</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"ปิดใช้งานรหัส PIN ของซิม"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"เปิดใช้งาน PIN ของซิม"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"โปรดรอสักครู่..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"เปิดการใช้งาน PIN ของซิมแล้ว"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"ปิดใช้งาน PIN ของซิม"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"PIN ที่คุณพิมพ์ไม่ถูกต้อง"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"เปลี่ยน PIN ของซิมสำเร็จแล้ว"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"เปิดใช้งาน PIN ของซิมแล้ว"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"ปิดใช้งาน PIN ของซิมแล้ว"</string>
+    <string name="pin_failed" msgid="2298841192582192277">"PIN ที่คุณพิมพ์ไม่ถูกต้อง"</string>
+    <string name="pin_changed" msgid="4365538014588501049">"เปลี่ยน PIN ของซิมสำเร็จแล้ว"</string>
     <string name="puk_requested" msgid="3898394204193202803">"รหัสผ่านไม่ถูกต้อง ซิมถูกล็อก! ขอ PUK2"</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"PIN2 เก่า"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"PIN2 ใหม่"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"ยืนยัน PIN2 ใหม่"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"PUK2 ที่คุณพิมพ์ไม่ถูกต้อง โปรดลองอีกครั้ง"</string>
-    <string name="badPin2" msgid="515218795152422178">"PIN2 เก่าที่คุณพิมพ์ไม่ถูกต้อง โปรดลองอีกครั้ง"</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"PIN2 ที่คุณป้อนไม่ตรงกัน โปรดลองอีกครั้ง"</string>
+    <string name="badPuk2" msgid="4851734468010000418">"PUK2 ที่คุณพิมพ์ไม่ถูกต้อง โปรดลองอีกครั้ง"</string>
+    <string name="badPin2" msgid="1041576234483629991">"PIN2 เก่าที่คุณพิมพ์ไม่ถูกต้อง โปรดลองอีกครั้ง"</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"PIN2 ที่คุณพิมพ์ไม่ตรงกัน โปรดลองอีกครั้ง"</string>
     <string name="invalidPin2" msgid="8237110107480395938">"พิมพ์ PIN2 ซึ่งเป็นเลข 4-8 หลัก"</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"พิมพ์ PUK2 ซึ่งเป็นเลข 8 หลัก"</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"เปลี่ยน PIN2 เรียบร้อยแล้ว"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"เปลี่ยน PIN2 เรียบร้อยแล้ว"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"พิมพ์รหัส PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"รหัสผ่านไม่ถูกต้อง โปรดเปลี่ยน PIN2 แล้วลองอีกครั้ง!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"รหัสผ่านไม่ถูกต้อง ซิมถูกล็อก! ขอ PUK2 แล้ว"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"รหัสผ่านไม่ถูกต้อง เปลี่ยน PIN2 แล้วลองอีกครั้ง"</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"รหัสผ่านไม่ถูกต้อง ซิมถูกล็อก ขอ PUK2"</string>
     <string name="doneButton" msgid="2859593360997984240">"เสร็จสิ้น"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"การประชุมสาย <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"กลับไปที่การโทร"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"ทำงานต่อโดยไม่มีซิมการ์ด"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"ไม่พบซิมการ์ด โปรดใส่ซิมการ์ดลงในโทรศัพท์"</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"เลิกแสดง"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"ปลดล็อก"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"กำลังตรวจสอบสิทธิ์ PIN…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"หมายเลขข้อความเสียง"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"กำลังโทรออก"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"กำลังทดลองซ้ำ"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"การประชุมสาย"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"สายเข้า"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"สายเรียกซ้อน Cdma"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"วางสายแล้ว"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"พักสาย"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"กำลังวางสาย"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"สายที่ไม่ได้รับ"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> สายที่ไม่ได้รับ"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"สายที่ไม่ได้รับจาก <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"สายปัจจุบัน (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"โทรต่อเนื่อง"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"พักสาย"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"สายเรียกเข้า"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"ข้อความเสียงใหม่"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"ไม่ทราบหมายเลขข้อความเสียง"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"ไม่มีบริการ"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"เครือข่ายที่เลือกไว้ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) ใช้งานไม่ได้"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"วางสาย"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"โทรกลับ"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"ข้อความ"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"หากต้องการโทรออก ให้ปิดโหมดใช้งานบนเครื่องบินก่อน"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"ยังไม่ได้ลงทะเบียนบนเครือข่าย"</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"เครือข่ายมือถือใช้งานไม่ได้"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"ไม่ได้โทรออก ไม่ได้ป้อนหมายเลขที่ถูกต้อง"</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"ไม่ได้โทรออก"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"กำลังเริ่มต้นลำดับ MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"กำลังเริ่มต้นลำดับของรหัสคุณลักษณะ..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"บริการไม่ได้รับการสนับสนุน"</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"สลับสายไม่ได้"</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"แยกสายไม่ได้"</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"หมายเลขฉุกเฉิน"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"กำลังเปิดวิทยุ…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"นอกพื้นที่ให้บริการ กำลังลองซ้ำ..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"ไม่ได้โทรออก <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ไม่ใช่หมายเลขฉุกเฉิน!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"ไม่ได้โทรออก โปรดหมุนหมายเลขฉุกเฉิน!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"ไม่ได้โทรออก <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> ไม่ใช่หมายเลขฉุกเฉิน!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"ไม่ได้โทรออก หมุนหมายเลขฉุกเฉิน!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ใช้แป้นพิมพ์กดหมายเลขโทรศัพท์"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"แตะปุ่มกดสัญญาณเสียง"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"พักสาย"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"เลิกพักสาย"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"สิ้นสุด"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"แป้นหมายเลข"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"ซ่อน"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"ลำโพง"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"ปิดเสียง"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"บลูทูธ"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"เพิ่มการโทร"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"รวมสาย"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"สลับ"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ข้อความ ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"เสียงสัญญาณ DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"เสียงสัญญาณ DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"ตั้งค่าความยาวเสียงสัญญาณ DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"ปกติ"</item>
     <item msgid="2883365539347850535">"ยาว"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"ข้อความจากเครือข่าย"</string>
+    <string name="network_message" msgid="4483886461245213802">"ข้อความจากเครือข่าย"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"เปิดการใช้งานโทรศัพท์ของคุณ"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"ต้องทำการโทรพิเศษเพื่อเปิดใช้บริการโทรศัพท์ของคุณ "\n\n"หลังจากกด “เปิดการใช้งาน” ให้ฟังคำแนะนำเพื่อเปิดใช้บริการโทรศัพท์ของคุณ"</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"แตะ \"เปิดการใช้งาน\" เพื่อทำการโทรพิเศษซึ่งจะเปิดการใช้งานโทรศัพท์ของคุณบนเครือข่ายผู้ให้บริการมือถือคุณ เพื่อให้คุณโทรออกและเชื่อมต่อกับเครือข่ายข้อมูลมือถือได้"</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"ข้ามการเปิดใช้งานหรือไม่"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"หากคุณข้ามการเปิดใช้งาน คุณจะโทรออกหรือเชื่อมต่อเครือข่ายข้อมูลมือถือไม่ได้ (แม้จะเชื่อมต่อเครือข่าย Wi-Fi ได้ก็ตาม) และระบบจะขอให้คุณเปิดใช้งานทุกครั้งที่คุณเปิดเครื่องจนกว่าคุณจะเปิดใช้งานโทรศัพท์"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"ข้าม"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"เปิดการใช้งาน"</string>
     <string name="ota_activate" msgid="1368528132525626264">"เปิดการใช้งาน"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"เปิดใช้งานโทรศัพท์แล้ว!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"เปิดใช้งานโทรศัพท์แล้ว"</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"พบปัญหาในการเปิดใช้งาน"</string>
     <string name="ota_listen" msgid="162923839877584937">"ทำตามคำแนะนำที่ได้ยินจนกว่าคุณจะได้ยินว่าการเปิดใช้งานเสร็จสมบูรณ์แล้ว"</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"ปุ่มกด"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"ลำโพง"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"โปรดรอสักครู่ขณะที่กำลังตั้งโปรแกรมโทรศัพท์ของคุณ"</string>
-    <string name="ota_failure" msgid="8600027551822478181">"ตั้งโปรแกรมไม่สำเร็จ"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"รอสักครู่ขณะที่กำลังตั้งโปรแกรมโทรศัพท์ของคุณ"</string>
+    <string name="ota_failure" msgid="4311299546379674378">"ตั้งโปรแกรมไม่สำเร็จ"</string>
     <string name="ota_successful" msgid="1880780692887077407">"เปิดการใช้งานโทรศัพท์ของคุณแล้ว คุณอาจต้องรอไม่เกิน 15 นาทีเพื่อให้บริการเริ่มทำงาน"</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"โทรศัพท์ของคุณไม่เปิดการใช้งาน"\n"คุณอาจต้องหาพื้นที่ที่มีสัญญาณดีกว่านี้ (ใกล้หน้าต่างหรือออกไปข้างนอก)"\n\n"ลองใหม่อีกครั้งหรือติดต่อศูนย์บริการลูกค้าเพื่อรับฟังตัวเลือกเพิ่มเติม"</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"โทรศัพท์ของคุณไม่เปิดใช้งาน"\n"คุณอาจต้องหาพื้นที่ที่มีสัญญาณดีกว่านี้ (ใกล้หน้าต่างหรือออกไปข้างนอก)"\n\n"ลองใหม่อีกครั้งหรือติดต่อศูนย์บริการลูกค้าเพื่อรับฟังตัวเลือกเพิ่มเติม"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"SPC ส่วนเกินล้มเหลว"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"ย้อนกลับ"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"ลองใหม่อีกครั้ง"</string>
     <string name="ota_next" msgid="3904945374358235910">"ถัดไป"</string>
-    <string name="ota_back" msgid="2190038043403850052">"ย้อนกลับ"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"เข้าสู่โหมดติดต่อกลับฉุกเฉิน"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"โหมดติดต่อกลับฉุกเฉิน"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"ไม่มีการเชื่อมต่อข้อมูลนาน <xliff:g id="COUNT">%s</xliff:g> นาที"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"โทรศัพท์จะอยู่ในโหมดติดต่อกลับฉุกเฉินเป็นเวลา <xliff:g id="COUNT">%s</xliff:g> นาที ในระหว่างนี้จะไม่สามารถใช้แอปพลิเคชันใดที่ต้องมีการเชื่อมต่อข้อมูล คุณต้องการจบการทำงานตอนนี้เลยหรือไม่"</item>
-    <item quantity="other" msgid="3231879566243957821">"โทรศัพท์จะอยู่ในโหมดติดต่อกลับฉุกเฉินเป็นเวลา <xliff:g id="COUNT">%s</xliff:g> นาที ในระหว่างนี้จะไม่สามารถใช้แอปพลิเคชันใดที่ต้องมีการเชื่อมต่อข้อมูล คุณต้องการจบการทำงานตอนนี้เลยหรือไม่"</item>
+    <item quantity="one" msgid="8060210887681426682">"โทรศัพท์จะอยู่ในโหมดติดต่อกลับฉุกเฉินเป็นเวลา <xliff:g id="COUNT">%s</xliff:g> นาที ในระหว่างที่อยู่ในโหมดนี้ จะไม่สามารถใช้แอปพลิเคชันที่ใช้การเชื่อมต่อข้อมูลได้ คุณต้องการจะออกเดี๋ยวนี้หรือไม่"</item>
+    <item quantity="other" msgid="8617116564023933114">"โทรศัพท์จะอยู่ในโหมดติดต่อกลับฉุกเฉินเป็นเวลา <xliff:g id="COUNT">%s</xliff:g> นาที ในระหว่างที่อยู่ในโหมดนี้ จะไม่สามารถใช้แอปพลิเคชันที่ใช้การเชื่อมต่อข้อมูลได้ คุณต้องการจะออกเดี๋ยวนี้หรือไม่"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"การทำงานที่เลือกใช้ไม่ได้ขณะอยู่ในโหมดติดต่อกลับฉุกเฉิน โทรศัพท์จะอยู่ในโหมดนี้เป็นเวลา <xliff:g id="COUNT">%s</xliff:g> นาที คุณต้องการจบการทำงานตอนนี้เลยหรือไม่"</item>
-    <item quantity="other" msgid="3489076611710869904">"การทำงานที่เลือกใช้ไม่ได้ขณะอยู่ในโหมดติดต่อกลับฉุกเฉิน โทรศัพท์จะอยู่ในโหมดนี้เป็นเวลา <xliff:g id="COUNT">%s</xliff:g> นาที คุณต้องการจบการทำงานตอนนี้เลยหรือไม่"</item>
+    <item quantity="one" msgid="2585506997024726599">"การทำงานที่เลือกจะไม่สามารถใช้ได้เมื่ออยู่ในโหมดติดต่อกลับฉุกเฉิน โทรศัพท์จะอยู่ในโหมดนี้เป็นเวลา <xliff:g id="COUNT">%s</xliff:g> นาที คุณต้องการจะออกเดี๋ยวนี้หรือไม่"</item>
+    <item quantity="other" msgid="6115622137771382224">"การทำงานที่เลือกจะไม่สามารถใช้ได้เมื่ออยู่ในโหมดติดต่อกลับฉุกเฉิน โทรศัพท์จะอยู่ในโหมดนี้เป็นเวลา <xliff:g id="COUNT">%s</xliff:g> นาที คุณต้องการจะออกเดี๋ยวนี้หรือไม่"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"การทำงานที่เลือกใช้ไม่ได้ในระหว่างโทรฉุกเฉิน"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"กำลังออกจากโหมดติดต่อกลับฉุกเฉิน"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"การทำงานที่เลือกใช้ไม่ได้ในระหว่างโทรฉุกเฉิน"</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"กำลังออกจากโหมดติดต่อกลับฉุกเฉิน"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"ใช่"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"ไม่"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"เลิกแสดง"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"การตั้งค่าข้อความเสียง"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&amp;ltไม่ได้ตั้งค่า&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"บริการข้อความเสียง"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"การตั้งค่าสำหรับ <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"บริการ"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"การตั้งค่า"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;ไม่ได้ตั้งค่า&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"การตั้งค่าการโทรอื่นๆ"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"หมุนหมายเลข"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"กำลังโทรผ่าน ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"ลากไปทางขวาเพื่อตอบ"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"ลากไปทางซ้ายเพื่อปิดเสียงเรียกเข้า"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"ลากไปทางซ้ายเพื่อปฏิเสธ"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"ลากไปทางขวาเพื่อตอบและ"\n"พักสายที่โทรอยู่"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"ลากไปทางขวาเพื่อตอบและ"\n"วางสายที่โทรอยู่"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"ลากไปทางขวาเพื่อตอบและ"\n"วางสายที่พักไว้"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"รับสาย"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"ปฏิเสธ"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"โทรผ่าน <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"ภาพของรายชื่อติดต่อ"</string>
     <string name="goPrivate" msgid="865837794424530980">"เข้าสู่โหมดส่วนตัว"</string>
     <string name="selectContact" msgid="781975788478987237">"เลือกรายชื่อติดต่อ"</string>
     <string name="sip_settings" msgid="6699045718560859691">"การตั้งค่าการโทรทางอินเทอร์เน็ต"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"บัญชีการโทรทางอินเทอร์เน็ต (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"บัญชี"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"จัดการบัญชีการโทรทางอินเทอร์เน็ต (SIP) และสถานะ"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"รับสายเรียกเข้า"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"ลดอายุการใช้งานแบตเตอรี่"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"กำหนดค่าตัวเลือกการโทร"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"ใช้การโทรทางอินเทอร์เน็ต"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"ใช้การโทรทางอินเทอร์เน็ต (Wi-Fi เท่านั้น)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"สำหรับทุกสายเมื่อเครือข่ายข้อมูลใช้งานได้"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"สำหรับการโทรทางอินเทอร์เน็ตเท่านั้น"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"ถามทุกครั้งที่โทรออก"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"สำหรับการโทรออกทั้งหมด"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"การลงทะเบียนอัตโนมัติ"</string>
-    <string name="call_priority" msgid="8374917577270504387">"การโทรออกผ่าน VIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"โทรออก"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"ใช้บัญชีการโทรทางอินเทอร์เน็ต:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"ใช้ทุกครั้งที่โทรออกทางอินเทอร์เน็ต"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"คุณสามารถใช้การตั้งค่าการโทรเพื่อเปลี่ยนว่าจะใช้บัญชีการโทรทางอินเทอร์เน็ตบัญชีใดโดยค่าเริ่มต้นเมื่อโทรออก โดยการเลือกบัญชีอื่นภายใต้การตั้งค่าการโทรทางอินเทอร์เน็ต"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"คุณสามารถเปลี่ยนบัญชีการโทรทางอินเทอร์เน็ตที่จะใช้เป็นค่าเริ่มต้นได้จากหน้าจอโทรศัพท์ &gt; ตั้งค่า &gt; การตั้งค่าการโทรทางอินเทอร์เน็ต &gt; บัญชี"</string>
     <string name="pstn_phone" msgid="8782554491484326429">"โทรออกด้วยโทรศัพท์มือถือ"</string>
     <string name="internet_phone" msgid="1147922660195095810">"การโทรทางอินเทอร์เน็ต"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"ไม่มีบัญชีการโทรทางอินเทอร์เน็ต"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"ไม่มีบัญชีการโทรทางอินเทอร์เน็ตบนโทรศัพท์เครื่องนี้ เพิ่มบัญชีเดี๋ยวนี้หรือไม่"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"ไม่มีบัญชีการโทรทางอินเทอร์เน็ตบนโทรศัพท์นี้ คุณต้องการเพิ่มบัญชีตอนนี้หรือไม่"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"เพิ่ม"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"เพิ่มบัญชี"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"นำบัญชีออก"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"บัญชี SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"กำลังบันทึกบัญชี..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"กำลังเอาบัญชีออก..."</string>
+    <string name="saving_account" msgid="52903398217017954">"กำลังบันทึกบัญชี..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"กำลังนำบัญชีออก..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"บันทึก"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"ยกเลิก"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"ปิดโปรไฟล์"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"ตกลง"</string>
     <string name="close_profile" msgid="6886968271423155284">"ปิด"</string>
-    <string name="primary_account" msgid="2229538308291934245">"หลัก"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"กำหนดให้บัญชีนี้เป็นบัญชีหลักของฉัน"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"ใช้สำหรับการโทรออก"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"การตั้งค่าขั้นสูง"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"บัญชีหลัก <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"กำลังตรวจสอบสถานะ..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"กำลังลงทะเบียน..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"กำลังพยายามอยู่..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"ไม่รับสาย"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"การลงทะเบียนบัญชีหยุดทำงานเนื่องจากไม่มีการเชื่อมต่ออินเทอร์เน็ต"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"การลงทะเบียนบัญชีหยุดทำงานเนื่องจากไม่มีการเชื่อมต่อ Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"การลงทะเบียนบัญชีไม่สำเร็จ"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"รับสาย"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"กำลังลงทะเบียน..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"กำลังพยายามอยู่..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"ไม่รับสาย"</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"การลงทะเบียนบัญชีหยุดทำงานเนื่องจากไม่มีการเชื่อมต่ออินเทอร์เน็ต"</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"การลงทะเบียนบัญชีหยุดทำงานเนื่องจากไม่มีการเชื่อมต่อ WiFi"</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"การลงทะเบียนบัญชีไม่สำเร็จ"</string>
+    <string name="registration_status_done" msgid="884630717456439280">"รับสาย"</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"การลงทะเบียนบัญชีไม่สำเร็จ: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>) จะลองใหม่ในภายหลัง"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"การลงทะเบียนบัญชีไม่สำเร็จ: ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"การลงทะเบียนบัญชีไม่สำเร็จ: ตรวจสอบชื่อเซิร์ฟเวอร์"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"ขณะนี้บัญชีนี้ถูกใช้งานอยู่โดยแอปพลิเคชัน <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"การลงทะเบียนบัญชีไม่สำเร็จ: ชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง"</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"การลงทะเบียนบัญชีไม่สำเร็จ: ตรวจสอบชื่อเซิร์ฟเวอร์"</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"ขณะนี้บัญชีนี้ถูกใช้งานอยู่โดยแอปพลิเคชัน <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
     <string name="sip_edit_title" msgid="489288416435014385">"รายละเอียดบัญชี SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"รายละเอียดบัญชี SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"เซิร์ฟเวอร์"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"หมายเลขพอร์ต"</string>
     <string name="transport_title" msgid="8253139511847746640">"ประเภทการส่งผ่านข้อมูล"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"ส่งแบบ keep-alive"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"ส่งข้อความ SIP แบบ keep-alive"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"การลงทะเบียนอัตโนมัติ"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"ลงทะเบียนโปรไฟล์โดยอัตโนมัติ"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"ตั้งค่าเป็นบัญชีหลัก"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"ใช้สำหรับการโทรออก"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"การตั้งค่าที่เป็นตัวเลือก"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;ตัวเลือก&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ แตะเพื่อแสดงทั้งหมด"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ แตะเพื่อซ่อนทั้งหมด"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> ต้องระบุ ไม่สามารถปล่อยว่างไว้ได้"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"หมายเลขพอร์ตควรอยู่ระหว่าง 1000 ถึง 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"ต้องระบุ <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> และไม่สามารถปล่อยว่างได้"</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"หมายเลขพอร์ตควรอยู่ระหว่าง 1000 ถึง 65534"</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"ไม่มีการเชื่อมต่ออินเทอร์เน็ต"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"ไม่มีการเชื่อมต่อ Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"หากต้องการโทรออกทางอินเทอร์เน็ต ให้ตรวจสอบการเชื่อมต่ออินเทอร์เน็ตของคุณก่อน"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"คุณต้องเชื่อมต่อกับเครือข่าย Wi-Fi สำหรับการโทรทางอินเทอร์เน็ต (ใช้การตั้งค่าระบบไร้สายและเครือข่าย)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"หากต้องการโทรออกทางอินเทอร์เน็ต ให้ตรวจสอบการเชื่อมต่ออินเทอร์เน็ตของคุณก่อน"</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"คุณจำเป็นต้องเชื่อมต่อกับเครือข่าย WiFi สำหรับการโทรทางอินเทอร์เน็ต (ใช้การตั้งค่าระบบไร้สายและเครือข่าย)"</string>
     <string name="no_voip" msgid="8901474054537199865">"ไม่สนับสนุนการโทรทางอินเทอร์เน็ต"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"อัตโนมัติ"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"ส่งเสมอ"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"เดี๋ยวจะโทรกลับทันที"</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"เดี๋ยวจะโทรหาทีหลัง"</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"ตอนนี้คุยไม่ได้ โทรมาใหม่ได้ไหม"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"ข้อความที่กำหนดเอง..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"ข้อความที่กำหนดเอง"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"คำตอบด่วน"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"แก้ไขคำตอบด่วน"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"ดาว"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"ศูนย์"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"ปอนด์"</string>
-    <string name="description_search_button" msgid="239929880630534731">"ค้นหา"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"หมุนหมายเลข"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"ถอยหลัง"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"เปิดใช้งานลำโพงแล้ว"</string>
@@ -715,9 +615,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"ปฏิเสธ"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"สั่น"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"สั่น"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"เสียงเรียกเข้า"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
-    <item msgid="468237575962916558">"ทุกครั้ง"</item>
+    <item msgid="468237575962916558">"เปิดใช้งานเสมอ"</item>
     <item msgid="1595097872875714252">"เฉพาะเมื่อปิดเสียง"</item>
-    <item msgid="1458182414036878616">"ไม่ใช้"</item>
+    <item msgid="1458182414036878616">"ไม่เปิดใช้งานเลย"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"เสียงเรียกเข้าโทรศัพท์"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"สั่นเมื่อมีสายเข้า"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"เสียงแตะแป้นหมายเลข"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"เสียงเรียกเข้า"</string>
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index bcec0bdf1..2cd1e06e3 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Pribadong numero"</string>
     <string name="payphone" msgid="1931775086311769314">"Pay phone"</string>
     <string name="onHold" msgid="9035493194749959955">"Naka-hold"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Kasalukuyang tawag"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Abala ang linya"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Abala ang network"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Walang pagtugon, na-time out"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Hindi maabot ang server"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Hindi maabot ang numero"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Maling username o password"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Tumawag mula sa labas ng network"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Tumawag mula sa labas ng metwork"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Error sa server. Pakisubukang muli sa ibang pagkakataon."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Walang signal"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Lumagpas na sa limitasyon ng ACM"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Naka-off ang radyo"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Walang SIM, o error sa SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Walang SIM, o error sa SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Lugar na Hindi Nagseserbisyo"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Pinaghihigpitan ng FDN ang mga papalabas na tawag."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Hindi ka makakagawa ng mga papalabas na tawag habang naka-on ang pag-bar ng tawag."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Hindi ka makakagawa ng mga papalabas na tawag habang naka-on ang pag-bar ng tawag."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Pinaghihigpitan ang lahat ng mga tawag ng kontrol sa access."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Pinaghihigpitan ang mga pang-emergency na tawag ng kontrol sa access."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Pinaghihigpitan ang mga normal na tawag ng kontrol sa access."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Naka-lock ang telepono hanggang sa power cycle."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Ibinaba ang tawag."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Nasagap ang tawag."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: muling pagsunud-sunurin."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Hindi Tinanggap na Pagpipiliian sa Serbisyo."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: subukang muli ang pagkakasunud-sunod."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Nabigo ang access."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Napigilan."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Tanging mga Pang-emergency na tawag ang posible."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Di-wastong numero"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Hindi wastong numero"</string>
     <string name="confCall" msgid="1904840547188336828">"Conference na tawag"</string>
     <string name="call_lost" msgid="317670617901479594">"Nawala ang tawag."</string>
-    <string name="retry" msgid="8462986804300767852">"Subukang muli"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Nawala ang Tawag"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Sinimulan ang MMI code"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Tumatakbo ang USSD code…"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Wired na headset"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Ipadala ang mga sumusunod na tone?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Nagpapadala ng Mga Tone"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Nagpapadala ng mga tono"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Ipadala"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Oo"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Hindi"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Palitan ang wild character ng"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Palitan ang wild character ng"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Nawawala ang numero ng voicemail"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Walang nakaimbak na numero ng voicemail sa SIM card."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Magdagdag ng numero"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Naglo-load…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"I-type ang PIN code upang i-unlock ang SIM card."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"Na-unlock ang SIM"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Bagong PIN code ng SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Mag-type muli ng bagong PIN code ng SIM upang kumpirmahin"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Hindi nagtugma ang mga PIN ng SIM na iyong na-type. Pakisubukang muli."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"I-type ang PUK code upang i-unlock ang SIM card"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Maling PUK code!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Magpatuloy"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Naalis sa pagkaka-block ang iyong SIM card. Nag-a-unlock ang iyong telepono…"</string>
     <string name="label_ndp" msgid="780479633159517250">"PIN na pang-unlock ng SIM network"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"I-unlock"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Humihiling ng pag-unlock sa network…"</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Hindi matagumpay ang kahilingan na i-unlock ang network."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Matagumpay ang pag-unlock ng network."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Mga setting ng tawag ng GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Mga setting ng CDMA na tawag"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Mga Pangalan ng Lugar ng Access"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Mga karagdagang setting ng tawag na CDMA lang"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Mga setting ng serbisyo ng network"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Caller ID"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Nilo-load ang mga setting…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Nakatago ang numero sa mga papalabas na tawag"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Ipinapakitang numero sa mga papalabas na tawag"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Gamitin ang mga default na setting ng operator upang ipakita ang aking numero sa mga papalabas na tawag"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Numero kapag abala"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Pinapasa sa <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Hindi pinagana"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Hindi sinusuportahan ng iyong carrier ang hindi pagpapagana sa pagpasa ng tawag kapag abala ang iyong telepono."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Hindi sinusuportahan ng iyong operator ang hindi pagpapagana sa pagpasa ng tawag kapag abala ang iyong telepono."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Ipasa kapag hindi nasagot"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Numero kapag hindi nasagot"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Pinapasa sa <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Hindi pinagana"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Hindi sinusuportahan ng iyong carrier ang hindi pagpapagana sa pagpasa ng tawag kapag hindi sumasagot ang iyong telepono."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Hindi sinusuportahan ng iyong operator ang hindi pagpapagana sa pagpasa ng tawag kapag hindi sumasagot ang iyong telepono."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Ipasa kapag hindi maabot"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Numero kapag hindi maabot"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Pinapasa sa <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Hindi pinagana"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Hindi sinusuportahan ng iyong carrier ang hindi pagpapagana ng pagpasa ng tawag kapag hindi maabot ang iyong telepono."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Hindi sinusuportahan ng iyong carrier ang hindi pagpapagana ng pagpasa ng tawag kapag hindi maabot ang iyong telepono."</string>
     <string name="updating_title" msgid="6146755386174019046">"Mga setting ng tawag"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Error sa mga setting ng tawag"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Binabasa ang mga setting…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Ibinabalik ang mga setting…"</string>
     <string name="response_error" msgid="6674110501330139405">"Hindi inaasahang tugon mula sa network."</string>
     <string name="exception_error" msgid="7027667130619518211">"Error sa Network o SIM card."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Pinapayagan lang ang mga pagpapatakbo sa mga nakapirming numero sa pag-dial."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Paki-on ang radyo bago tingnan ang mga setting na ito."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Naka-on ang setting ng mga Fixed Dialing Number ng iyong app ng Telepono. Bilang resulta, hindi gumagana ang ilang tampok na nauugnay sa pagtawag."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Mangyaring i-on ang radyo bago tingnan ang mga setting na ito."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Paganahin"</string>
     <string name="disable" msgid="7274240979164762320">"Huwag Paganahin"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Itago ang numero"</item>
     <item msgid="1108394741608734023">"Ipakita ang numero"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"I-save ang numero ng voicemail"</string>
     <string name="vm_changed" msgid="380744030726254139">"Binago ang numero ng voicemail."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Hindi tagumpay ang pagbago ng numero ng voicemail."\n"Mangyaring makipag-ugnay sa iyong carrier kung nagpatuloy ang problemang ito."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Hindi matagumpay ang numero sa pagpapasa."\n"Mangyaring makipag-ugnay sa iyong carrier kapag nagpatuloy ang problemang ito."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Hindi mabago ang numero ng voicemail."\n"Makipag-ugnay sa iyong carrier kung magpapatuloy ang ganitong problema."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Hindi mabago ang pagpapasahang numero."\n"Makipag-ugnay sa iyong carrier kung magpapatuloy ang ganitong problema."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Hindi mabawi at ma-save ang mga setting ng kasalukuyang numero sa pagpapasa."\n"Lumipat sa bagong provider?"</string>
     <string name="no_change" msgid="3186040086622435212">"Walang ginawang mga pagbabago."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Piliin ang serbisyo ng voicemail"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Maghanap ng mga network"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Error habang naghahanap ng mga network."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Nirerehistro sa <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Hindi pinapayagan ng iyong SIM card ang koneksyon sa network na ito."</string>
-    <string name="connect_later" msgid="500090982903469816">"Hindi nagawang kumonekta ngayon sa iyong network. Pakisubukang muli sa ibang pagkakataon."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Hindi pinapayagan ng iyong SIM card ang koneksyon sa network na ito."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Hindi makakonekta sa network na ito sa ngayon. Subukang muli sa ibang pagkakataon."</string>
     <string name="registration_done" msgid="495135664535876612">"Nakarehistro sa network."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Pumili ng network operator"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Pumili ng network operator"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Hanapin ang lahat ng mga available na network"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Awtomatikong pumili"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Awtomatikong pumili ng ninanais na network"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Awtomatikong pagpaparehistro..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Awtomatikong pumili"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Awtomatikong pumili ng ninanais na network"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Awtomatikong pagpaparehistro..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Network Mode"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Baguhin ang network operating mode"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Ninanais na network mode"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Mas gustong mode ng network: EvDo lamang"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Mas gustong mode ng network: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"EvDo lang"</item>
     <item msgid="454610224530856274">"CDMA na walang EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo auto"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA auto"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo auto"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA auto"</item>
     <item msgid="5189164180446264504">"WCDMA lang"</item>
     <item msgid="5714714953966979187">"GSM lang"</item>
-    <item msgid="4775796025725908913">"Ninanais ang GSM / WCDMA"</item>
+    <item msgid="8508331239546115206">"Ninanais ng GSM/WCDMA"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Pinagana ang data"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Roaming ng data"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Kumonekta sa mga serbisyo ng data kapag nagro-roam"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Kumonekta sa mga serbisyo ng data kapag nagro-roam"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Nawalan ka ng pagkonekta sa data dahil iniwan mong naka-off ang iyong home network na may roaming ng data."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Nawalan ka ng pagkonekta sa data dahil iniwan mo ang iyong home network na naka-off ang roaming ng data."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Payagan ang roaming ng data? Maaari kang makakuha ng malaking pagsingil sa roaming!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Mga pagpipilian sa GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Mga pagpipiliian sa CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Paggamit ng data"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Patakaran sa data ng carrier"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Ginamit na data sa kasalukuyang panahon"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Panahon ng paggamit ng data"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Patakaran ng rate ng data"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ ng cycle ay lumagpas sa"\n"Magsisimula ang susunod na tagal ng panahon sa loob ng <xliff:g id="USED_1">%2$d</xliff:g> (na) araw (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Ibinaba ang rate ng data sa <xliff:g id="USED">%1$d</xliff:g> Kb/s kung nalagpasan ang limitasyon sa paggamit ng data"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Higit pang impormasyon tungkol sa patakaran sa paggamit ng data sa mobile network ng iyong carrier"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Cell Broadcast SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Cell Broadcast SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Cell Broadcast SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Pinagana ang Cell Broadcast SMS"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Korean"</item>
     <item msgid="1933212028684529632">"Chinese"</item>
     <item msgid="1908428006803639064">"Hebrew"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Mga Wika"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Lokal na Panahon"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Mga Pagkakataon sa Pagtatrabaho"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Pinagana ang Mga Pagkakataon sa Pagtatrabaho"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Hindi pinagana ang Mga Pagkakataon sa Pagtatrabaho"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Medikal, Kalusugan at Ospital"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Pinagana ang Medikal, Kalusugan at Ospital"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Hindi pinagana ang Medikal, Kalusugan at Ospital"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Medikal, Kalusugan at Ospital"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Pinagana ang Medikal, Kalusugan at Ospital"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Hindi pinagana ang Medikal, Kalusugan at Ospital"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Balita sa Teknolohiya"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Pinagana ang Balita sa Teknolohiya"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Hindi pinagana ang Balita sa Teknolohiya"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"WCDMA lang"</item>
     <item msgid="8776934131146642662">"GSM lang"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (Ninanais ang WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Gumamit lang ng mga 2G network"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Nakakatipid ng baterya"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Pagpili ng system"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Baguhin ang cdma roaming mode"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Baguhin ang mode ng pag-roam ng CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Pagpili ng system"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Home lang"</item>
     <item msgid="1205664026446156265">"Awtomatiko"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA Roaming Mode"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Baguhin ang cdma roaming mode"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA roaming mode"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Mga Home Network lang"</item>
-    <item msgid="8174642753290624634">"Mga Naka-affiliate na Network"</item>
-    <item msgid="2241951431403168661">"Anumang Network"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Subscription ng CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Mga Kagustuhan ng CDMA Network"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Hindi pa ipinatupad!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Mga kagustuhan ng CDMA network"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"CDMA lang"</item>
     <item msgid="2683555124647197574">"EvDo lang"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA Subscription"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Palitan sa pagitan ng RUIM/SIM at NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"subscription"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"I-activate ang device"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"I-set up ang serbisyo ng data"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Pamahalaan ang Mga Fixed Dialing Number"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Palitan ang PIN para sa access sa FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Pamahalaan ang listahan ng numero ng telepono"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Privacy ng Voice"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Privacy ng Voice"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Paganahin ang pinahusay na privacy mode"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY mode"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Paganahin ang TTY mode"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY mode"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Itakda ang TTY mode"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Awtomatikong Muling Pagsubok"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Paganahin ang Auto Retry mode"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Awtomatikong Muling Pagsubok"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Paganahin ang mode ng Awtomatikong muling pagsubok"</string>
     <string name="menu_add" msgid="1882023737425114762">"Magdagdag ng contact"</string>
     <string name="menu_edit" msgid="7143003705504672374">"I-edit ang contact"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Tanggalin ang contact"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Ipasok ang PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"I-type ang PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Pangalan"</string>
     <string name="number" msgid="7905950798349903858">"Numero"</string>
     <string name="save" msgid="4094274636321939086">"I-save"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Tanggalin ang fixed dialing number"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Tinatanggal ang fixed dialing number…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Tinanggal ang fixed dialing number."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"Hindi pa na-update ang FDN: maling PIN ang iyong ipinasok."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"Hindi na-update ang FDN: hindi maaaring lumagpas sa 20 digit ang numero."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Hindi na-update ang FDN dahil maling PIN ang iyong na-type."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Hindi pa na-update ang FDN dahil hindi maaaring humigit sa 20 digit ang numero."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Hindi na-update ang FDN. Hindi wasto ang PIN2, o tinanggihan ang numero ng telepono."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Nagbabasa mula sa SIM card…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Walang mga contact sa iyong SIM card."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Piliin ang mga contact upang i-import"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Upang mag-import ng mga contact mula sa SIM card, paki-off ang Airplane mode."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Upang mag-import ng mga contact mula sa SIM card, i-turn off muna ang mode ng Airplane."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Paganahin/huwag paganahin ang PIN ng SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Baguhin ang PIN ng SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN ng SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Lumang PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Bagong PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Kumpirmahin ang bagong PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Mali ang na-type mong lumang PIN. Pakisubukang muli."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Hindi nagtugma ang mga PIN na iyong ipinasok. Pakisubukang muli."</string>
+    <string name="badPin" msgid="8955102849303984935">"Mali ang na-type mong lumang PIN. Subukang muli."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Hindi tumugma ang na-type mong mga PIN. Subukang muli."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Mag-type ng PIN na 4 hanggang 8 numero."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Huwag paganahin ang PIN ng SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Paganahin ang PIN ng SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Pakihintay…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"Pinagana ang PIN ng SIM"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"Hindi pinagana ang PIN ng SIM"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Mali ang na-type mong PIN"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"Matagumpay na nabago ang PIN ng SIM"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"Pinagana ang PIN ng SIM."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"Hindi pinagana ang PIN ng SIM."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Mali ang na-type mong PIN."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"Matagumpay na nabago ang PIN ng SIM."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Mali ang password, na-lock ang SIM! hinihiling ang PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Lumang PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Bagong PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Kumpirmahin ang bagong PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Mali ang na-type mong PUK2. Pakisubukang muli."</string>
-    <string name="badPin2" msgid="515218795152422178">"Mali ang na-type mong lumang PIN2. Pakisubukang muli."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Hindi nagtugma ang mga PIN2 na ipinasok mo. Pakisubukang muli."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Mali ang na-type mong PUK2. Subukang muli."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Mali ang na-type mong lumang PIN2. Pakisubukang muli."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Hindi tumugma ang na-type mong mga PIN2. Subukang muli."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Mag-type ng PIN2 na 4 hanggang 8 numero."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Mag-type ng PUK2 na 8 numero."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"Matagumpay na napalitan ang PIN2"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"Matagumpay na napalitan ang PIN2."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"I-type ang PUK2 code"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Mali ang password, pakibago ang PIN2 at subukang muli!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Mali ang password, na-lock ang SIM! hinihiling ang PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Mali ang password. Pakibago ang PIN2 at subukang muli."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Mali ang password, na-lock ang SIM. Hinihiling ang PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Tapos na"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Conference na tawag <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Bumalik sa tawag"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Magpatuloy nang walang SIM card"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Walang nakitang SIM card. Mangyaring magpasok ng SIM card sa telepono."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Balewalain"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"I-unlock"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Pinapatotohanan ang PIN…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Numero ng voicemail"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Dina-dial"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Sinusubukang muli"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Conference na tawag"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Papasok na tawag"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Cdma callwaiting"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Winakasan ang Tawag"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Naka-hold"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Binababa"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Mga hindi nasagot na tawag"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> (na) hindi nasagot na tawag"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Hindi nasagot na tawag mula kay <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Kasalukuhang tawag (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Kasalukuyang tawag"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Naka-hold"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Papasok na tawag"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Bagong voicemail"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Hindi kilala ang numero ng voicemail"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Walang serbisyo"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Hindi available ang mga piniling network (<xliff:g id="OPERATOR_NAME">%s</xliff:g>)"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Ibaba"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Tawagan"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Padalhan ng mensahe"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Upang tumawag, paki-off ang Airplane mode."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Hindi nakarehistro sa network."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Hindi available ang mobile network."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Hindi naipadala ang tawag, walang ipinasok na wastong numero."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Hindi naipadala ang tawag."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Sinisimulan ang pagkakasunud-sunod ng MMI…"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Sinisimulan ang pagkakasunud-sunod ng tampok na code…"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Hindi suportadong serbisyo."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Hindi nagawang maglipat ng mga tawag."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Hindi nagawang ihiwalay ang tawag."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Emergency na tawag"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ino-on ang radyo…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Lugar na hindi nagseserbisyo, sinusubukang muli…"</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Hindi naipadala ang tawag, hindi pang-emergency na numero ang <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Hindi naipadala ang tawag, mangyaring mag-dial ng pang-emergency na numero!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Hindi naipadala ang tawag. hindi pang-emergency na numero ang <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g>!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Hindi naipadala ang tawag. Mag-dial ng pang-emergency na numero!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Gamitin ang keyboard upang mag-dial"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Touch tone na keypad"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"I-hold"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"I-unhold"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Wakasan"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Dialpad"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Itago"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Speaker"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"I-mute"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Magdagdag ng tawag"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Pagsamahin ang mga tawag"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Pagpalitin"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI na teksto"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Mga DTMF Tone"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Mga tone ng DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Itakda ang haba ng mga DTMF tone"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Mahaba"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Mensahe ng Network"</string>
+    <string name="network_message" msgid="4483886461245213802">"Mensahe ng network"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"I-activate ang iyong telepono"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Kailangang maisagawa ang isang espesyal na tawag upang i-activate ang iyong serbisyo ng telepono. "\n\n"Pagkatapos pindutin ang “I-activate”, makinig sa mga ibinigay na tagubilin upang i-activate ang iyong telepono."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Galawin ang “I-activate” upang gumawa ng espesyal na tawag na nag-a-activate sa iyong telepono sa mobile network ng iyong telepono, upang magsagawa ka ng mga tawag at makakonekta sa mga mobile data network."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Laktawan ang pag-activate?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Kung lalaktawan mo ang pag-activate, hindi ka makakagawa ng mga tawag o makakakonekta sa mga mobile data network (ngunit makakakonekta ka sa mga Wi-Fi network). Hanggang sa i-activate mo ang iyong telepono, hihilingin sa iyong i-activate ito sa bawat pagkakataon na i-on mo ito."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Laktawan"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"I-activate"</string>
     <string name="ota_activate" msgid="1368528132525626264">"I-activate"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Na-activate ang telepono!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Na-activate na ang telepono."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Problema sa pag-activate"</string>
     <string name="ota_listen" msgid="162923839877584937">"Sundin ang mga isinalitang tagubilin hanggang sa marinig mo na kumpleto na ang pag-activate."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Keypad"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Speaker"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Pakihintay habang pino-program ang iyong telepono."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Hindi matagumpay ang programming"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Maghintay habang pino-program ang iyong telepono."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Hindi matagumpay ang Pag-program"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Na-activate na ang iyong telepono. Maaaring tumagal nang hanggang 15 minuto upang magsimula ang serbisyo."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Hindi na-activate ang iyong telepono. "\n"Maaaring kailanganin mong maghanap ng lugar na may mas mahusay na sakop (malapit sa bintana, o sa labas). "\n\n"Subukang muli o tumawag sa serbisyo sa customer para sa higit pang pagpipilian."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Hindi na-activate ang iyong telepono. "\n"Maaaring kailanganin mong maghanap ng lugar na may mas mahusay na sakop (malapit sa bintana, o sa labas). "\n\n"Subukang muli o tumawag sa serbisyo sa customer para sa higit pang pagpipilian."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"MGA SOBRANG PAGKABIGO NG SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Bumalik"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Subukan muli"</string>
     <string name="ota_next" msgid="3904945374358235910">"Susunod"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Bumalik"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Ipinasok na Emergency Callback Mode"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Emergency Callback Mode"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"Walang koneksyon ng data sa loob ng <xliff:g id="COUNT">%s</xliff:g> (na) minuto"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Mapupunta sa emergency callback mode ang teleponong ito sa loob ng <xliff:g id="COUNT">%s</xliff:g> (na) minuto. Habang nasa mode na ito walang mga application na gumagamit ng koneksyon ng data ang magagamit. Gusto mo bang lumabas ngayon?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Mapupunta sa emergency callback mode ang telepono sa loob ng <xliff:g id="COUNT">%s</xliff:g> (na) minuto. Habang walang magagamit na application na gumagamit ng koneksyon ng data sa mode na ito. Gusto mo bang lumabas ngayon?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Magiging nasa mode ng Emergency Callback ang telepono sa <xliff:g id="COUNT">%s</xliff:g> (a) minuto. Habang nasa mode na ito walang magagamit na apps na gumagamit ng koneksyon ng data. Gusto mo bang umalis ngayon?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Magiging nasa mode ng Emergency Callback ang telepono sa <xliff:g id="COUNT">%s</xliff:g> (na) minuto. Habang nasa mode na ito walang magagamit na apps na gumagamit ng koneksyon ng data. Gusto mo bang umalis ngayon?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Hindi available ang napiling pagkilos habang nasa emergency callback mode. Mananatili sa mode na ito ang telepono sa loob ng <xliff:g id="COUNT">%s</xliff:g> (na) minuto. Gusto mo bang lumabas na ngayon?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Hindi available ang piniling pagkilos habang nasa emergency callback mode. Mapupunta sa mode na ito ang telepono sa loob ng <xliff:g id="COUNT">%s</xliff:g> (na) minuto. Gusto mo bang lumabas ngayon?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Hindi available ang napiling pagkilos habang nasa mode ng Emergency Callback. Magiging nasa ganitong mode ang telepono sa <xliff:g id="COUNT">%s</xliff:g> (na) minuto. Gusto mo bang umalis ngayon?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Hindi available ang napiling pagkilos habang nasa mode ng Emergency Callback. Magiging nasa ganitong mode ang telepono sa <xliff:g id="COUNT">%s</xliff:g> (na) minuto. Gusto mo bang umalis ngayon?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Hindi available ang piniling pagkilos habang nasa pang-emergency na tawag"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Lumalabas sa Emergency Callback Mode"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Hindi available ang piniling pagkilos habang nasa pang-emergency na tawag."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Lumalabas sa mode na Emergency Callback"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Oo"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Hindi"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Balewalain"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Mga setting ng voicemail"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;hindi nakatakda&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Serbisyong Voicemail"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Mga setting para sa <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Serbisyo"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Setup"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Hindi nakatakda&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Iba pang mga setting ng tawag"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"I-dial"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Tumatawag sa pamamagitan ng ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"I-drag pakanan upang sagutin"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"I-drag pakaliwa upang patahimikin ang ringer"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"I-drag pakaliwa upang tanggihan"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"I-drag pakanan upang sagutin at"\n"i-hold ang aktibong tawag"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"I-drag pakanan upang sagutin at"\n"wakasan ang aktibong tawag"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"I-drag pakanan upang sagutin at"\n"wakasan ang naka-hold na tawag"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Sagutin"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Tanggihan"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Tumatawag sa pamamagitan ng <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"larawan ng contact"</string>
     <string name="goPrivate" msgid="865837794424530980">"maging pribado"</string>
     <string name="selectContact" msgid="781975788478987237">"pumili ng contact"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Mga setting ng tawag sa Internet"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Mga account sa pagtawag sa Internet (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Mga Account"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Pamahalaan ang mga Internet calling (SIP) account at katayuan"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Tumanggap ng mga papasok na tawag"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Binabawasan ang buhay ng baterya"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"I-configure ang mga pagpipilian sa tawag"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Gumamit ng pagtawag sa Internet"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Gumamit ng pagtawag sa Internet (Wi-Fi lang)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Para sa lahat ng mga tawag kapag available ang data network"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Para sa mga tawag sa Internet lang"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Hingin ang bawat tawag"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Para sa lahat ng mga tawag"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Awtomatikong pagpaparehistro"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Papalabas na tawag sa pamamagitan ng SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Tumawag"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Gumamit ng account sa pagtawag sa Internet:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Palaging gamitin upang gumawa ng mga tawag sa Internet"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Magagamit mo ang Mga Setting ng Tawag upang baguhin bilang default ang Internet calling account na gagamitin sa pamamagitan ng pagpili ng ibang account sa ilalim ng mga setting ng tawag sa Internet"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Maaari mong baguhin kung anong account ng pagtawag sa Internet ang default na gagamitin mula sa Telepono &gt; Mga Setting &gt; Mga setting ng tawag sa internet &gt; screen ng Mga account."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Tawag sa cell phone"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Tawag sa internet"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Walang account sa pagtawag sa Internet"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Walang mga account sa pagtawag sa Internet sa teleponong ito. Magdagdag ng isa ngayon?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Walang mga account sa pagtawag sa Internet sa teleponong ito. Gusto mo bang magdagdag ng isa ngayon?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Idagdag"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Magdagdag ng account"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Alisin ang account"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Mga SIP account"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Sine-save ang account..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Inaalis ang account..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Sine-save ang account..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Inaalis ang account..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"I-save"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Itapon"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Isara ang profile"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Isara"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Pangunahin"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Gawin itong aking pangunahing account"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Ginagamit para sa mga papalabas na tawag"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Mga advanced na setting"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Pangunahing account. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Tinitingnan ang katayuan..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Nagrerehistro..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Sinusubukan pa rin..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Hindi tumatanggap ng mga tawag"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Ihininto ang pagpaparehistro ng account dahil walang koneksyon sa Internet"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Ihininto ang pagpaparehistro ng account dahil walang koneksyon sa Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Hindi matagumpay ang pagpaparehistro ng account"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Tumatanggap ng mga tawag"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Inirerehistro..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Sinusubukan pa rin..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Hindi tumatanggap ng mga tawag."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Nahinto ang pagpaparehistro ng account dahil walang koneksyon sa Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Nahinto ang pagpaparehistro ng account dahil walang koneksyon sa Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Hindi matagumpay ang pagpaparehistro ng account."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Tumatanggap ng mga tawag."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Nabigo ang pagpaparehistro ng account: Susubukan ng (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); sa ibang pagkakataon"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Nabigo ang pagpaparehistro sa account: maling username o password"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Nabigo ang pagpaparehistro sa account: tingnan ang pangalan ng server"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Kasalukuyang ginagamit ang account na ito ng <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> application"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Nabigo ang pagpaparehistro ng account: Maling username o password."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Nabigo ang pagpaparehistro sa account: Tingnan ang pangalan ng server."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Kasalukuyang ginagamit ang account na ito ng app ng <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Mga detalye ng SIP account"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Mga detalye ng SIP account"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Server"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Numero ng port"</string>
     <string name="transport_title" msgid="8253139511847746640">"Uri ng paglilipat"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Magpadala ng keep-alive"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Magpadala ng mga keep-alive na mensahe"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Awtomatikong pagpaparehistro"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Awtomatikong irehistro ang profile"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Itakda bilang pangunahing account"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Ginagamit para sa mga papalabas na tawag"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Mga opsyonal na setting"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Opsyonal&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Pindutin upang ipakita lahat"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Pindutin upang itago ang lahat"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"Kinakailangan ang <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>, hindi maaaring iwanang blangko"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Dapat na nasa pagitan ng 1000 at 65534 ang numero ng port"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Kinakailangan ang <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>, hindi maaaring iwanang blangko."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Dapat na nasa pagitan ng 1000 at 65534 ang numero ng port."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Walang koneksyon sa Internet"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Walang koneksyon sa Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Upang gumawa ng tawag sa Internet, suriin muna ang iyong koneksyon sa Internet"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Dapat na konektado ka sa isang Wi-Fi network para sa mga tawag sa Internet (gamitin ang mga setting ng Wireless &amp; Network)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Upang tumawag sa Internet, suriin muna ang iyong koneksyon sa Internet."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Kailangan mong maging konektado sa isang Wi-Fi network para sa mga tawag sa Internet (gamitin ang mga setting ng Wireless &amp; Network)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Hindi suportado ang pagtawag sa Internet"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Awtomatiko"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Palaging ipadala"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Tawagan kita ulit."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Tawagan kita mamaya."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Di masagot ngayon. Tawag ka mamaya?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Custom na mensahe..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Custom na mensahe"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Mga mabilisang tugon"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"I-edit ang mga mabilisang tugon"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"star"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"zero"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"pound"</string>
-    <string name="description_search_button" msgid="239929880630534731">"maghanap"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"Mag-dial"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Pinapagana ang speakerphone."</string>
@@ -713,11 +613,16 @@
     <string name="description_target_answer" msgid="7205604197797472471">"Sagutin"</string>
     <string name="description_target_send_sms" msgid="2098326025587950144">"Magpadala ng SMS"</string>
     <string name="description_target_decline" msgid="4789834364389731957">"Tanggihan"</string>
-    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"I-vibrate"</string>
-    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"I-vibrate"</string>
+    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Mag-vibrate"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Mag-vibrate"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ringtone"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Palagi"</item>
-    <item msgid="1595097872875714252">"Kapag tahimik lang"</item>
-    <item msgid="1458182414036878616">"Hindi kailanman"</item>
+    <item msgid="1595097872875714252">"Kapag lamang walang tunog"</item>
+    <item msgid="1458182414036878616">"Hindi Kailanman"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Ringtone ng telepono"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"I-vibrate kapag nagri-ring"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Mga tone ng pagpindot sa dial pad"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ringtone"</string>
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index fedc35c03..497d7568b 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Özel numara"</string>
     <string name="payphone" msgid="1931775086311769314">"Ankesörlü telefon"</string>
     <string name="onHold" msgid="9035493194749959955">"Beklemede"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Geçerli çağrı"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Hat meşgul"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Ağ meşgul"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Yanıt yok, zaman aşımı oluştu"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Sunucuya ulaşılamıyor"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Numaraya ulaşılamıyor"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Hatalı kullanıcı adı veya şifre"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Çağrı, ağın dışından yapıldı"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Çağrı, ağın dışından yapıldı"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Sunucu hatası. Daha sonra tekrar deneyin."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Sinyal yok"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM sınırı aşıldı"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Radyo kapalı"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"SIM kart yok veya SIM hatası"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"SIM kart yok veya SIM hatası"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Hizmet alanı dışında"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Giden çağrılar SAN tarafından kısıtlandı."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Çağrı engelleme açıkken giden çağrı yapamazsınız."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Çağrı engelleme açıkken arama yapamazsınız"</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Tüm çağrılar erişim denetimi tarafından kısıtlandı."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Acil durum çağrıları erişim denetimi tarafından kısıtlandı."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Normal çağrılar erişim denetimi tarafından kısıtlanmış."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Telefon kapatılıp açılana kadar kilitlendi."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Çağrı kesildi."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Çağrı yakalandı."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: yeniden sırala."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Hizmet Seçeneği Reddi."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: tekrar deneme sırası."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Erişim başarısız oldu."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Değiştirildi."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Yalnızca acil çağrı yapılabilir."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Geçersiz Numara"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Geçersiz numara"</string>
     <string name="confCall" msgid="1904840547188336828">"Konferans görüşmesi"</string>
     <string name="call_lost" msgid="317670617901479594">"Çağrı istemeden sonlandırıldı."</string>
-    <string name="retry" msgid="8462986804300767852">"Tekrar Dene"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Çağrı İstemeden Sonlandırıldı"</string>
     <string name="ok" msgid="3811371167865772377">"Tamam"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI kodu başlatıldı"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD kodu çalışıyor…"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Kablolu kulaklık"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Şu zil sesleri gönderilsin mi?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Zil Sesleri Gönderiliyor"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Sayı tonları gönderiliyor"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Gönder"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Evet"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Hayır"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Joker karakteri şununla değiştir:"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Joker karakteri şununla değiştir:"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Eksik sesli mesaj numarası"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"SIM kartta depolanan sesli mesaj numarası yok."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Numara ekle"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Yükleniyor..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"SIM kart kilidini açmak için PIN kodunu yazın."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM kilidi açıldı"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Yeni SIM PIN kodu"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Doğrulamak için yeni SIM PIN kodunu tekrar girin"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Yazdığınız SIM PIN kodları eşleşmiyor. Lütfen tekrar deneyin."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"SIM kart kilidini açmak için PUK kodunu yazın"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Hatalı PUK kodu!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Devam"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"SIM kartınızın engellemesi kaldırıldı. Telefonunuzun kilidi açılıyor..."</string>
     <string name="label_ndp" msgid="780479633159517250">"SIM ağı kilit açma PIN kodu"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Kilit Aç"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Ağ kilidini açma isteği yapılıyor..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Ağ kilidi açma isteği başarısız."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Ağ kilidi açılamadı."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM çağrı ayarları"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA çağrı ayarları"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Erişim Noktası Adları"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Yalnızca CDMA çağrısı ek ayarları"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Ağ hizmeti ayarları"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Arayan Kimliği"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Ayarlar yükleniyor..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Giden çağrılarda numara gizli"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Giden çağrılarda numara görüntüleniyor"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Giden çağrılarda numaramı görüntülemek için varsayılan operatör ayarlarını kullan"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Meşgulken kullanılacak numara"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Şuraya yönlendiriliyor: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Devre dışı"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Operatörünüz, telefonunuz meşgul olduğunda çağrı yönlendirmenin devre dışı bırakılmasını desteklemiyor."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Operatörünüz, telefonunuz meşgul olduğunda çağrı yönlendirmenin devre dışı bırakılmasını desteklemiyor."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Yanıtlanmadığında yönlendir"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Yanıtlanmadığında kullanılacak numara"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Şuraya yönlendiriliyor: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Devre dışı"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Operatörünüz, telefonunuz yanıt vermediğinde çağrı yönlendirmenin devre dışı bırakılmasını desteklemiyor."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Operatörünüz, telefonunuz yanıt vermediğinde çağrı yönlendirmenin devre dışı bırakılmasını desteklemiyor."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Ulaşılamadığında yönlendir"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Ulaşılamadığında kullanılacak numara"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Şuraya yönlendiriliyor: <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Devre dışı"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Operatörünüz, telefonunuza ulaşılamadığında çağrı yönlendirmenin devre dışı bırakılmasını desteklemiyor."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Operatörünüz, telefonunuza ulaşılamadığında çağrı yönlendirmenin devre dışı bırakılmasını desteklemiyor."</string>
     <string name="updating_title" msgid="6146755386174019046">"Çağrı ayarları"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Çağrı ayarları hatası"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Ayarlar okunuyor..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Ayarlar geri alınıyor..."</string>
     <string name="response_error" msgid="6674110501330139405">"Ağdan beklenmeyen yanıt."</string>
     <string name="exception_error" msgid="7027667130619518211">"Ağ veya SIM kart hatası."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"İşlemlere sadece sabit arama numaralarında izin verilir."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Bu ayarları görüntülemeden önce lütfen radyoyu açın."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Telefon uygulamanızın Sabit Arama Numaraları ayarı açık. Bu nedenle çağrıyla ilgili bazı özellikler çalışmıyor."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Bu ayarları görüntülemeden önce radyoyu açın."</string>
     <string name="close_dialog" msgid="2365884406356986917">"Tamam"</string>
     <string name="enable" msgid="1059008390636773574">"Etkinleştir"</string>
     <string name="disable" msgid="7274240979164762320">"Devre Dışı Bırak"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Numarayı gizle"</item>
     <item msgid="1108394741608734023">"Numarayı göster"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Sesli mesaj numarasını kaydet"</string>
     <string name="vm_changed" msgid="380744030726254139">"Sesli mesaj numarası değiştirildi."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Sesli mesaj numarası değiştirilemedi."\n"Sorun devam ederse lütfen operatörünüze başvurun."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Yönlendirme numarası değiştirilemedi."\n"Bu sorun devam ederse lütfen operatörünüze başvurun."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Sesli mesaj numarası değiştirilemedi."\n"Bu sorun devam ederse operatörünüzle bağlantı kurun."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Yönlendirme numarası değiştirilemedi."\n"Bu sorun devam ederse operatörünüzle bağlantı kurun."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Mevcut yönlendirme numarası ayarları alınıp kaydedilemedi."\n"Yine de yeni sağlayıcıya geçilsin mi?"</string>
     <string name="no_change" msgid="3186040086622435212">"Hiçbir değişiklik yapılmadı."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Sesli mesaj hizmetini seç"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Ağları ara"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Ağlar aranırken hata oluştu."</string>
     <string name="register_on_network" msgid="9055203954040805084">"<xliff:g id="NETWORK">%s</xliff:g> ağına kaydediliyor..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"SIM kartınız bu ağa bağlanmaya izin vermiyor."</string>
-    <string name="connect_later" msgid="500090982903469816">"Şu anda bu ağa bağlanılamıyor. Lütfen daha sonra tekrar deneyin."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"SIM kartınız bu ağa bağlanmaya izin vermiyor."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Şu an bu ağa bağlanılamıyor. Daha sonra tekrar deneyin."</string>
     <string name="registration_done" msgid="495135664535876612">"Ağa kaydedildi."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Bir ağ operatörü seçin"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Bir ağ operatörü seçin"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Kullanılabilen tüm ağları ara"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Otomatik olarak seç"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Tercih edilen ağı otomatik olarak seç"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Otomatik kayıt..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Otomatik olarak seç"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Tercih edilen ağı otomatik olarak seç"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Otomatik kayıt..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Ağ Modu"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Ağın çalışma modunu değiştir"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Tercih edilen ağ modu"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Tercih edilen ağ modu: Yalnızca EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Tercih edilen ağ modu: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Yalnızca EvDo"</item>
     <item msgid="454610224530856274">"EvDo olmadan CDMA"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo otomatik"</item>
-    <item msgid="8595462903294812666">"Otomatik GSM / WCDMA"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo otomatik"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA otomatik"</item>
     <item msgid="5189164180446264504">"Yalnızca WCDMA"</item>
     <item msgid="5714714953966979187">"Yalnızca GSM"</item>
-    <item msgid="4775796025725908913">"Tercih edilen GSM / WCDMA"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA tercih edilen"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Veri etkin"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Veri dolaşımı"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Dolaşırken veri hizmetlerine bağlan"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Dolaşırken veri hizmetlerine bağlan"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Veri dolaşımı kapalıyken ana ağınızdan ayrıldığınız için veri bağlantısını kaybettiniz."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Veri dolaşımı kapalıyken ev ağınızdan ayrıldığınız için veri bağlantısını kaybettiniz."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Veri dolaşımına izin verilsin mi? Kayda değer dolaşım ücretleri ödeyebilirsiniz!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS Seçenekleri"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA Seçenekleri"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Veri kullanımı"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Operatörün veri politikası"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Geçerli dönemde kullanılan veri"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Veri kullanım dönemi"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Veri hızı politikası"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"Dönemin tamamlanan bölümü:٪ <xliff:g id="USED_0">%1$d</xliff:g>"\n"Bir sonraki dönem <xliff:g id="USED_1">%2$d</xliff:g> gün sonra başlıyor (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Veri kullanım sınırı aşılırsa veri hızı <xliff:g id="USED">%1$d</xliff:g> Kb/s\'ye düşürülür"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Operatörünüzün mobil ağ üzerinden veri kullanımı politikası hakkında daha fazla bilgi edinin"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Hücre Yayını SMS\'si"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Hücre Yayını SMS\'i"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Hücre Yayını SMS\'i"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Hücre Yayını SMS\'si etkinleştirildi"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Korece"</item>
     <item msgid="1933212028684529632">"Çince"</item>
     <item msgid="1908428006803639064">"İbranice"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Diller"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Yerel Hava Durumu"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"İş İmkanları"</string>
     <string name="eo_enable" msgid="8623559062015685813">"İş İmkanları etkinleştirildi"</string>
     <string name="eo_disable" msgid="3863812478090907609">"İş İmkanları devre dışı bırakıldı"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Tıp, Sağlık ve Hastane"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Tıp, Sağlık ve Hastane seçenekleri etkinleştirildi"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Tıp, Sağlık ve Hastane seçeneği devre dışı bırakıldı"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Tıp, Sağlık ve Hastane"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Tıp, Sağlık ve Hastane seçenekleri etkinleştirildi"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Tıp, Sağlık ve Hastane seçeneği devre dışı bırakıldı"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Teknoloji Haberleri"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Teknoloji Haberleri etkinleştirildi"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Teknoloji Haberleri devre dışı bırakıldı"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"Yalnızca WCDMA"</item>
     <item msgid="8776934131146642662">"Yalnızca GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA tercihli)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Yalnızca 2G ağlarını kullan"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Pil tasarrufu sağlar"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Sistem seç"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Cdma dolaşım modunu değiştir"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"CDMA dolaşım modunu değiştir"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Sistem seçin"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Yalnızca ev"</item>
     <item msgid="1205664026446156265">"Otomatik"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA Dolaşım Modu"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Cdma dolaşım modunu değiştir"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA dolaşım modu"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Yalnızca Ana Ağlar"</item>
-    <item msgid="8174642753290624634">"Bağlı Ağlar"</item>
-    <item msgid="2241951431403168661">"Tüm Ağlar"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA aboneliği"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA Ağ Tercihleri"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Henüz uygulanmadı!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA ağ tercihleri"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"Yalnızca CDMA"</item>
     <item msgid="2683555124647197574">"Yalnızca EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA Aboneliği"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"RUIM/SIM ve NV arasında değiştir"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"abonelik"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Cihazı etkinleştir"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Veri hizmetini ayarla"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Sabit Arama Numaralarını Yönet"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"SAN erişimi için PIN kodunu değiştir"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Telefon numarası listesini yönet"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Ses Gizliliği"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Ses gizliliği"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Gelişmiş gizlilik modunu etkinleştir"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY modu"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"TTY modunu etkinleştir"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY modu"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY modunu ayarla"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Otomatik Yeniden Deneme"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Otomatik Yeniden Deneme modunu etkinleştir"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Otomatik yeniden deneme"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Otomatik Yeniden Deneme modunu etkinleştir"</string>
     <string name="menu_add" msgid="1882023737425114762">"Kişi ekle"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Kişiyi düzenle"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Kişiyi sil"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"PIN2 kodunu girin"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"PIN2\'yi yazın"</string>
     <string name="name" msgid="7329028332786872378">"Ad"</string>
     <string name="number" msgid="7905950798349903858">"Numara"</string>
     <string name="save" msgid="4094274636321939086">"Kaydet"</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Sabit arama numarasını sil"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Sabit arama numarası siliniyor..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Sabit arama numarası silindi."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN güncellenmedi: yanlış PIN girdiniz."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN güncellenmedi: sayı 20 basamağı aşamaz."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Yanlış PIN girdiğiniz için FDN güncellenmedi."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Sayı 20 basamaktan uzun olamayacağından FDN güncellenmedi."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN güncellenmedi. PIN2 doğru değildi veya telefon numarası reddedildi."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM karttan okunuyor..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM kartınızda hiçbir kişi yok."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"İçe aktarılacak kişileri seçin"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Kişileri SIM karttan içe aktarmak için lütfen Uçak modunu kapatın."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Kişileri SIM karttan içe aktarmak için, önce Uçak modunu kapatın."</string>
     <string name="enable_pin" msgid="5422767284133234860">"SIM PIN Kodunu Etkinleştir/Devre Dışı Bırak"</string>
     <string name="change_pin" msgid="9174186126330785343">"SIM PIN Kodunu Değiştir"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN kodu:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Eski PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Yeni PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Yeni PIN kodunu doğrula"</string>
-    <string name="badPin" msgid="4154316827946559447">"Yazdığınız eski PIN doğru değil. Lütfen tekrar deneyin."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Girdiğiniz PIN kodları eşleşmiyor. Lütfen tekrar deneyin."</string>
+    <string name="badPin" msgid="8955102849303984935">"Yazdığınız eski PIN doğru değil. Tekrar deneyin."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Yazdığınız PIN\'ler eşleşmiyor. Tekrar deneyin."</string>
     <string name="invalidPin" msgid="5981171102258684792">"4 ila 8 haneli bir PIN yazın."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"SIM PIN kodunu devre dışı bırak"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"SIM PIN Kodunu Etkinleştir"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Lütfen bekleyin..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"SIM PIN kodu etkin"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM PIN kodu devre dışı"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Yazdığınız PIN hatalı"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"SIM PIN kodu başarıyla değiştirildi"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM PIN kodu etkin."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM PIN kodu devre dışı."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Yazdığınız PIN hatalı."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"SIM PIN kodu başarıyla değiştirildi."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Şifre hatalı, SIM kilitlendi! PUK2 isteniyor."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Eski PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Yeni PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Yeni PIN2 kodunu doğrula"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Yazdığınız PUK2 doğru değil. Lütfen tekrar deneyin."</string>
-    <string name="badPin2" msgid="515218795152422178">"Yazdığınız eski PIN2 doğru değil. Lütfen tekrar deneyin."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Girdiğiniz PIN2 kodları eşleşmiyor. Lütfen tekrar deneyin."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Yazdığınız PUK2 doğru değil. Tekrar deneyin."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Yazdığınız eski PIN2 doğru değil. Tekrar deneyin."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Yazdığınız PIN2 kodları eşleşmiyor. Tekrar deneyin."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"4 ila 8 haneli bir PIN2 kodu yazın."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"8 haneli bir PUK2 yazın."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 başarıyla değiştirildi"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2 başarıyla değiştirildi."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"PUK2 kodunu yazın"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Şifre hatalı, lütfen PIN2 kodunu değiştirin ve tekrar deneyin!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Şifre hatalı, SIM kilitlendi! PUK2 isteniyor."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Şifre hatalı. PIN2 kodunu değiştirin ve tekrar deneyin."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Şifre hatalı, SIM kilitlendi! PUK2 isteniyor."</string>
     <string name="doneButton" msgid="2859593360997984240">"Bitti"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Konferans görüşmesi <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Çağrıya dön"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"SIM kart olmadan devam et"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"SIM kart bulunamadı. Lütfen telefona bir SIM kart takın."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Kapat"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Kilit Aç"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"PIN kimlik denetimi yapılıyor..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Sesli mesaj numarası"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Çevriliyor"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Tekrar deniyor"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Konferans görüşmesi"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Gelen çağrı"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Cdma çağrısı beklemede"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Çağrı sonlandırıldı"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Beklemede"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Sonlandırılıyor"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Cevapsız çağrılar"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> cevapsız çağrı"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Cevapsız çağrı: <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Geçerli çağrı (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Devam eden çağrılar"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Beklemede"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Gelen çağrı"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Yeni sesli mesaj"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Sesli mesaj numarası bilinmiyor"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Hizmet yok"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Seçili ağ (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) kullanılamıyor"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Kapat"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Geri ara"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Mesaj gönder"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Bir çağrı yapmak için öncelikle Uçak modunu kapatın."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ağda kayıtlı değil."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mobil ağ kullanılamıyor."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Çağrı gönderilmedi. Geçerli numara girilmedi."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Çağrı gönderilmedi."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI dizisi başlatılıyor..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Özellik kodu dizisi başlatılıyor..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Desteklenmeyen hizmet."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Çağrılar arasında geçiş yapılamıyor."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Çağrı ayrılamıyor."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Acil durum çağrısı"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Radyo açılıyor..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Hizmet alanı dışında, tekrar deneniyor..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Çağrı gönderilmedi. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bir acil durum numarası değil!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Çağrı gönderilmedi. Lütfen bir acil durum numarası çevirin!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Çağrı gönderilmedi, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> bir acil durum numarası değil!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Çağrı gönderilmedi. Bir acil durum numarası çevirin!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Çevirmek için klavyeyi kullan"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Telefon tuş takımı"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Beklet"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Devam Et"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Sonlandır"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Tuş takımı"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Gizle"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Hoparlör"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Sesi Kapat"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Çağrı ekle"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Çağrıları birleştir"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Değiştir"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI metni"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF Zil Sesleri"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF tonları"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"DTMF seslerinin uzunluğunu ayarla"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Normal"</item>
     <item msgid="2883365539347850535">"Uzun"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Ağ İletisi"</string>
+    <string name="network_message" msgid="4483886461245213802">"Ağ mesajı"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Telefonunuzu aktive edin"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Telefon hizmetinizin aktive edilmesi için özel bir çağrı yapılması gerekiyor. "\n\n"“Aktive Et”e bastıktan sonra, telefonunuzun aktive edilmesi için sağlanan talimatları dinleyin."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Telefonunuzu operatörünüzün mobil ağında etkinleştirecek, böylece arama yapabilmenizi ve mobil veri ağlarına bağlanabilmenizi sağlayacak özel bir arama yapmak için \"Etkinleştir\"e dokunun."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Etkinleştirme atlansın mı?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Etkinleştirmeyi atlarsanız, arama yapamaz veya mobil veri ağlarına bağlanamazsınız (yine de Kablosuz ağlara bağlanabilirsiniz). Telefonunuzu etkinleştirinceye kadar, telefonu her açışınızda ürünü etkinleştirip etkinleştirmeyeceğiniz sorulur."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Atla"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Etkinleştir"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Etkinleştir"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Telefon aktive edildi!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Telefon etkinleştirildi."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Aktivasyon sorunu"</string>
     <string name="ota_listen" msgid="162923839877584937">"Etkinleştirmenin tamamlandığını duyuncaya kadar söylenen talimatları izleyin."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Tuş takımı"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Hoparlör"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Telefonunuz programlanırken lütfen bekleyin."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Programlama Başarısız"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Telefonunuz programlanırken lütfen bekleyin."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Programlama başarısız"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Telefonunuz şimdi aktive edildi. Hizmetin başlaması 15 dakika sürebilir."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Telefonunuz aktive edilmedi. "\n"Daha iyi çeken bir yer (pencere kenarı veya dış mekan) bulmanız gerekebilir. "\n\n"Tekrar deneyin veya daha fazla seçenek için müşteri hizmetlerini arayın."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Telefonunuz etkinleştirilemedi. "\n"Daha iyi çeken bir yer (pencere kenarı veya dış mekan) bulmanız gerekebilir. "\n\n"Tekrar deneyin veya daha fazla seçenek için müşteri hizmetlerini arayın."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"AŞIRI SPC HATASI"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Geri"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Tekrar dene"</string>
     <string name="ota_next" msgid="3904945374358235910">"İleri"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Geri"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Acil Geri Arama Moduna Girildi"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Acil Geri Arama Modu"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"<xliff:g id="COUNT">%s</xliff:g> dakika boyunca veri bağlantısı yok"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Telefonunuz <xliff:g id="COUNT">%s</xliff:g> dakika boyunca acil durumda geri arama modunda olacaktır. Bu moddayken veri bağlantısı kullanan hiçbir uygulama kullanılamaz. Şimdi çıkmak istiyor musunuz?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Telefonunuz <xliff:g id="COUNT">%s</xliff:g> dakika boyunca acil durumda geri arama modunda olacaktır. Bu moddayken veri bağlantısı kullanan hiçbir uygulama kullanılamaz. Şimdi çıkmak istiyor musunuz?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Telefon <xliff:g id="COUNT">%s</xliff:g> dakika boyunca Acil Geri Arama modunda olacaktır. Bu moddayken, veri bağlantısı kullanan uygulamalar kullanılamaz. Şimdi çıkmak istiyor musunuz?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Telefon <xliff:g id="COUNT">%s</xliff:g> dakika boyunca Acil Geri Arama modunda olacaktır. Bu moddayken, veri bağlantısı kullanan uygulamalar kullanılamaz. Şimdi çıkmak istiyor musunuz?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Seçilen işlem, acil durumda geri arama modundayken kullanılamıyor. Telefon <xliff:g id="COUNT">%s</xliff:g> dakika boyunca bu modda kalacak. Şimdi çıkmak istiyor musunuz?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Seçilen işlem, acil durumda geri arama modundayken kullanılamıyor. Telefon <xliff:g id="COUNT">%s</xliff:g> dakika boyunca bu modda kalacak. Şimdi çıkmak istiyor musunuz?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Seçilen işlem Acil Geri Arama modunda kullanılamaz. Telefon <xliff:g id="COUNT">%s</xliff:g> dakika boyunca bu modda kalacak. Şimdi çıkmak istiyor musunuz?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Seçilen işlem Acil Geri Arama modunda kullanılamaz. Telefon <xliff:g id="COUNT">%s</xliff:g> dakika boyunca bu modda kalacak. Şimdi çıkmak istiyor musunuz?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Seçili işlem, acil durum çağrısında kullanılamaz"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Acil Geri Arama Modundan Çıkılıyor"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Seçilen işlem, acil durum çağrısında kullanılamaz."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Acil Geri Arama Modundan çıkılıyor"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Evet"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Hayır"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Kapat"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Sesli mesaj ayarları"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;ayarlanmadı&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Sesli mesaj hizmeti"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> için ayarlar"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Hizmet"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Kurulum"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ayarlanmadı&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Diğer çağrı ayarları"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Çevir"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"^1"\n<b>"^2"</b>" aracılığıyla aranıyor"</string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Yanıtlamak için sağa sürükleyin"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Zil programını susturmak için sola sürükleyin"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Reddetmek için sola sürükleyin"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Yanıtlamak ve"\n"etkin çağrıyı beklemeye almak için sağa sürükleyin"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Yanıtlamak ve"\n"etkin çağrıyı sonlandırmak için sağa sürükleyin"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Yanıtlamak ve"\n"beklemedeki çağrıyı sonlandırmak için sağa sürükleyin"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Yanıtla"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Reddet"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"<xliff:g id="PROVIDER_NAME">%s</xliff:g> üzerinden çağrı yapılıyor"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"kişi fotoğrafı"</string>
     <string name="goPrivate" msgid="865837794424530980">"özele git"</string>
     <string name="selectContact" msgid="781975788478987237">"kişi seçin"</string>
     <string name="sip_settings" msgid="6699045718560859691">"İnternet üzerinden çağrı ayarları"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"İnternet çağrısı (SIP) hesapları"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Hesaplar"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"İnternet çağrısı (SIP) hesaplarını ve durumunu yönet"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Gelen çağrıları al"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Pil ömrünü kısaltır"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Çağrı seçeneklerini yapılandır"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"İnternet çağrısını kullan"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"İnternet çağrısı kullan (yalnızca kablosuz)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Veri ağı uygun durumdayken yapılan tüm çağrılar için"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Yalnızca İnternet numaraları için"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Her çağrı için sor"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Tüm çağrılar için"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Otomatik kayıt"</string>
-    <string name="call_priority" msgid="8374917577270504387">"SIP üzerinden giden çağrı"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Çağrı yap"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"İnternet çağrısı hesabını kullan:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Her zaman İnternet çağrıları yapmak için kullan"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Çağrı yaparken varsayılan olarak kullanılacak İnternet çağrısı hesabını, İnternet çağrısı ayarları altında farklı bir hesap seçerek değiştirmek için Çağrı Ayarları\'nı kullanın"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Varsayılan olarak hangi İnternet çağrısı hesabının kullanılacağını Telefon &gt; Ayarlar &gt; İnternet çağrısı ayarları &gt; Hesaplar ekranını kullanarak değiştirebilirsiniz."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Cep telefonu çağrısı"</string>
     <string name="internet_phone" msgid="1147922660195095810">"İnternet çağrısı"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"İnternet çağrısı hesabı yok"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Bu telefonda herhangi bir İnternet çağrısı hesabı yok. Şimdi eklensin mi?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Bu telefonda hiç İnternet çağrısı hesabı yok. Şimdi eklemek ister misiniz?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Ekle"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Hesap ekle"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Hesabı kaldır"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP hesapları"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Hesap kaydediliyor..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Hesap kaldırılıyor..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Hesap kaydediliyor..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Hesap kaldırılıyor..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Kaydet"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Sil"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Profili kapat"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"Tamam"</string>
     <string name="close_profile" msgid="6886968271423155284">"Kapat"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Birincil"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Bunu birincil hesabım yap"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Giden çağrılar için kullanılır"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Gelişmiş ayarlar"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Birincil hesap. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Durum denetleniyor..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Kaydettiriliyor..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Denemeye devam ediliyor..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Çağrıları almıyor"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"İnternet bağlantısı olmadığı için hesap kaydı durduruldu"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Kablosuz bağlantı hesap kayıt işlemi durduruldu"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Hesap kaydı başarısız oldu"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Çağrıları alıyor"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Kayıt olunuyor..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Denemeye devam ediliyor..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Çağrıları almıyor."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"İnternet bağlantısı olmadığı için hesap kaydı durduruldu."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Kablosuz bağlantı olmadığından hesap kayıt işlemi durduruldu."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Hesap kaydı başarısız oldu."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Çağrıları alıyor."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Hesap kaydı başarısız oldu: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); daha sonra tekrar denenecek"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Hesap kaydı başarısız oldu: yanlış kullanıcı adı veya şifre"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Hesap kaydı başarısız oldu: sunucu adını kontrol edin"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Bu hesap şu anda <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> uygulaması tarafından kullanılıyor"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Hesap kaydı başarısız oldu: Yanlış kullanıcı adı veya şifre."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Hesap kaydı başarısız oldu: Sunucu adını kontrol edin."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Bu hesap şu anda <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> uygulaması tarafından kullanılıyor."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIP hesabı ayrıntıları"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP hesabı ayrıntıları"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Sunucu"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Bağlantı noktası numarası"</string>
     <string name="transport_title" msgid="8253139511847746640">"Aktarım türü"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Canlı tutma mesajı gönder"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"SIP canlı tutma mesajları gönder"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Otomatik kayıt"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Profili otomatik olarak kaydet"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Birincil hesap olarak ayarla"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Giden çağrılar için kullanılır"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"İsteğe bağlı ayarlar"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;İsteğe bağlı&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Tümünü göstermek için dokunun"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Tümünü gizlemek için dokunun"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> gerekli, bu alan boş bırakılamaz"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Bağlantı noktası numarası 1000 ile 65534 arasında olmalıdır"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> gerekli, bu alan boş bırakılamaz."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Bağlantı noktası numarası 1000 ile 65534 arasında olmalıdır."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"İnternet bağlantısı yok"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Kablosuz bağlantı yok"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"İnternet çağrısı yapmak için öncelikle İnternet bağlantınızı denetleyin"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"İnternet çağrıları için bir Kablosuz ağa bağlı olmalısınız (Kablosuz ve Ağ ayarlarını kullanın)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"İnternet çağrısı yapmak için öncelikle İnternet bağlantınızı denetleyin."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"İnternet çağrıları için bir Kablosuz ağa bağlı olmalısınız (Kablosuz ve Ağ ayarlarını kullanın)."</string>
     <string name="no_voip" msgid="8901474054537199865">"İnternet çağrısı desteklenmiyor"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Otomatik"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Her zaman gönder"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Seni hemen geri arayacağım."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Seni daha sonra ararım."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Şimdi konuşamam. Daha sonra arar mısın?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Özel mesaj..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Özel mesaj"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Hızlı yanıtlar"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Hızlı yanıtları düzenle"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"yıldız"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"sıfır"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"kare"</string>
-    <string name="description_search_button" msgid="239929880630534731">"ara"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"çevir"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"geri tuşu"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Hoparlör etkin."</string>
@@ -715,9 +615,22 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Reddet"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Titreşim"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Titreşim"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Zil sesi"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Her zaman"</item>
     <item msgid="1595097872875714252">"Yalnızca sessizken"</item>
     <item msgid="1458182414036878616">"Hiçbir zaman"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Telefon zil sesi"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Çalarken titret"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Tuş Takımı dokunmatik tonları"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Zil sesi"</string>
+    <string name="perm_change_mobile_network">Şebeke değiştir (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Bu ayar istediğiniz zaman 2G ve 3G arasında geçiş yapmanızı sağlar. 3G daha hızlıdır ama daha fazla pil tüketir ve ek olarak daha fazla ücret ödemenize sebep olabilir.</string>
+    <string name="advanced_setting">Gelişmiş Ayarlar</string>
+    <string name="vibrate_outgoing">Cevap verince titret</string>
+    <string name="vibrate_45">Her 45 saniyede titret</string>
+    <string name="vibrate_45_sum">Giden çağrı sırasında her 45 saniyede titret</string>
+    <string name="vibrate_hangup">Çağrı sonlanırsa titret</string>
+    <string name="vibrate_call_waiting">Çağrı bekletilirse titret</string>
 </resources>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
new file mode 100644
index 000000000..22a955ee4
--- /dev/null
+++ b/res/values-ug/strings.xml
@@ -0,0 +1,610 @@
+<?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="phoneAppLabel" product="tablet" msgid="8576272342240415145">"كۆچمە سانلىق مەلۇمات"</string>
+    <string name="phoneAppLabel" product="default" msgid="906161039445636857">"تېلېفون"</string>
+    <string name="emergencyDialerIconLabel" msgid="7812140032168171053">"جىددىي نومۇر بۇرىغۇچ"</string>
+    <string name="phoneIconLabel" msgid="2331230813161304895">"تېلېفون"</string>
+    <string name="fdnListLabel" msgid="8630418672279521003">"مۇقىم نومۇر بۇراش تىزىملىكى"</string>
+    <string name="unknown" msgid="6878797917991465859">"يوچۇن"</string>
+    <string name="private_num" msgid="6713286113000232309">"شەخسىي نومۇر"</string>
+    <string name="payphone" msgid="1931775086311769314">"ئاممىۋى تېلېفون"</string>
+    <string name="onHold" msgid="9035493194749959955">"كۈتۈپ تۇر"</string>
+    <string name="callFailed_userBusy" msgid="8851106999809294904">"لىنىيە ئالدىراش"</string>
+    <string name="callFailed_congestion" msgid="8737761615702718375">"تور ئالدىراش"</string>
+    <string name="callFailed_timedOut" msgid="7590961703135543346">"ئىنكاس يوق، ۋاقىت ھالقىدى"</string>
+    <string name="callFailed_server_unreachable" msgid="2133506577423869729">"مۇلازىمېتىرغا يېتەلمەيدۇ"</string>
+    <string name="callFailed_number_unreachable" msgid="7632566442515734778">"تېلېفون ئۇلانمىدى"</string>
+    <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"ئىشلەتكۈچى ئاتى ياكى ئىم خاتا"</string>
+    <string name="callFailed_out_of_network" msgid="6485167392133436262">"تور سىرتىدىن چاقىرىلغان"</string>
+    <string name="callFailed_server_error" msgid="5717915213586193217">"مۇلازىمېتىر خاتالىقى. سەل تۇرۇپ قايتا سىناڭ."</string>
+    <string name="callFailed_noSignal" msgid="1889803273616031933">"سىگنال يوق"</string>
+    <string name="callFailed_limitExceeded" msgid="4958065157970101491">"ACM چېكىدىن ئېشىپ كەتتى"</string>
+    <string name="callFailed_powerOff" msgid="2766035859391549713">"سىمسىز ئالاقە تاقاق"</string>
+    <string name="callFailed_simError" msgid="5652345589458834655">"SIM يوق ياكى SIM خاتا"</string>
+    <string name="callFailed_outOfService" msgid="4825791466557236225">"مۇلازىمەت دائىرىسىدىن ھالقىدى"</string>
+    <string name="callFailed_fdn_only" msgid="2850204579765430641">"سىرتقى چاقىرىش مۇقىم چاقىرىشنىڭ چەكلىمىسىگە ئۇچرايدۇ."</string>
+    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"سۆزلىشىش چەكلىمىسى قوزغىتىلغاندا سىرتقا تېلېفون ئۇرالمايسىز."</string>
+    <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"ھەممە چاقىرىش زىيارەت تىزگىنىنىڭ چەكلىمىسىگە ئۇچرايدۇ."</string>
+    <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"جىددىي چاقىرىش زىيارەت تىزگىنىنىڭ چەكلىمىسىگە ئۇچرايدۇ."</string>
+    <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"ئادەتتىكى چاقىرىش زىيارەت تىزگىنىنىڭ چەكلىمىسىگە ئۇچرايدۇ."</string>
+    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"ئىناۋەتسىز رەقەم"</string>
+    <string name="confCall" msgid="1904840547188336828">"تېلېفون يىغىنى"</string>
+    <string name="call_lost" msgid="317670617901479594">"چاقىرىش ئۈزۈلگەن."</string>
+    <string name="ok" msgid="3811371167865772377">"جەزملە"</string>
+    <string name="mmiStarted" msgid="6347869857061147003">"MMI كودى قوزغىتىلدى"</string>
+    <string name="ussdRunning" msgid="485588686340541690">"USSD كودى ئىجرا قىلىنىۋاتىدۇ…"</string>
+    <string name="mmiCancelled" msgid="2771923949751842276">"MMI كودى بىكار قىلىندى"</string>
+    <string name="cancel" msgid="5044513931633602634">"ۋاز كەچ"</string>
+    <string name="manageConferenceLabel" msgid="4691922394301969053">"تېلېفون يىغىنى باشقۇرۇش"</string>
+    <string name="audio_mode_speaker" msgid="27649582100085266">"ياڭراتقۇ"</string>
+    <string name="audio_mode_earpiece" msgid="4156527186373869107">"تېلېفون تىڭشىغۇچ"</string>
+    <string name="audio_mode_wired_headset" msgid="1465350758489175975">"سىملىق تىڭشىغۇچ"</string>
+    <string name="audio_mode_bluetooth" msgid="3047641300848211128">"كۆكچىش"</string>
+    <string name="wait_prompt_str" msgid="7601815427707856238">"تۆۋەندىكى ئۈننى يوللامدۇ؟"\n</string>
+    <string name="pause_prompt_str" msgid="341477243019906241">"ئۈن يوللاۋاتىدۇ"\n</string>
+    <string name="send_button" msgid="4106860097497818751">"يوللا"</string>
+    <string name="pause_prompt_yes" msgid="3564467212025151797">"ھەئە"</string>
+    <string name="pause_prompt_no" msgid="6686238803236884877">"ياق"</string>
+    <string name="wild_prompt_str" msgid="1585989144582892543">"ئورتاق بەلگە ئالماشتۇرىدىغىنى"</string>
+    <string name="no_vm_number" msgid="4164780423805688336">"ئۈنخەت نومۇرى كەم"</string>
+    <string name="no_vm_number_msg" msgid="1300729501030053828">" SIM كارتىغا ئۈنخەت نومۇرى يوق."</string>
+    <string name="add_vm_number_str" msgid="4676479471644687453">"نومۇر قوش"</string>
+    <string name="puk_unlocked" msgid="2284912838477558454">"SIM كارتا قۇلۇپىڭىز ئېچىلدى. تېلېفون قۇلۇپىنى ئېچىۋاتىدۇ…"</string>
+    <string name="label_ndp" msgid="780479633159517250">"SIM تورى PIN قۇلۇپىنى ئاچتى"</string>
+    <string name="sim_ndp_unlock_text" msgid="683628237760543009">"قۇلۇپ ئاچ"</string>
+    <string name="sim_ndp_dismiss_text" msgid="1604823375752456947">"تاقا"</string>
+    <string name="requesting_unlock" msgid="6412629401033249351">"تور قۇلۇپىنى ئېچىشنى ئىلتىماس قىلىۋاتىدۇ…"</string>
+    <string name="unlock_failed" msgid="6490531697031504225">"تور قۇلۇپىنى ئېچىش ئىلتىماسى مەغلۇپ بولدى."</string>
+    <string name="unlock_success" msgid="6770085622238180152">"تور قۇلۇپىنى ئېچىش  مۇۋەپپەقىيەتلىك."</string>
+    <string name="labelGSMMore" msgid="5930842194056092106">"GSM چاقىرىش تەڭشىكى"</string>
+    <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA چاقىرىش تەڭشىكى"</string>
+    <string name="apn_settings" msgid="9043423184895642077">"زىيارەت نۇقتا ئىسمى"</string>
+    <string name="settings_label" msgid="3876743539816984008">"تور تەڭشىكى"</string>
+    <string name="voicemail" msgid="8693759337917898954">"ئۈنخەت"</string>
+    <string name="voicemail_abbreviated" msgid="2215592488517217448">"VM:"</string>
+    <string name="networks" msgid="8873030692174541976">"تور مۇلازىمەت تەمىنلىگۈچى"</string>
+    <string name="call_settings" msgid="6112441768261754562">"چاقىرىش تەڭشىكى"</string>
+    <string name="additional_gsm_call_settings" msgid="1391795981938800617">"باشقا تەڭشەك"</string>
+    <string name="sum_gsm_call_settings" msgid="4076647190996778012">"باشقا GSM چاقىرىش ئۈچۈنلا ئىشلىتىلىدىغان تەڭشەك"</string>
+    <string name="additional_cdma_call_settings" msgid="8628958775721886909">"باشقا CDMA چاقىرىش  تەڭشىكى"</string>
+    <string name="sum_cdma_call_settings" msgid="284753265979035549">"باشقا CDMA چاقىرىش ئۈچۈنلا ئىشلىتىلىدىغان تەڭشەك"</string>
+    <string name="labelNwService" msgid="4699970172021870983">"تور مۇلازىمەت تەڭشىكى"</string>
+    <string name="labelCallerId" msgid="3888899447379069198">"تېلېفون نومۇر"</string>
+    <string name="sum_hide_caller_id" msgid="1071407020290873782">"سىرتتىكى نومۇرنى چاقىرغاندا تېلېفون نومۇرنى يوشۇر"</string>
+    <string name="sum_show_caller_id" msgid="6768534125447290401">"سىرتتىكى نومۇرنى چاقىرغاندا تېلېفون نومۇرنى كۆرسەت"</string>
+    <string name="sum_default_caller_id" msgid="1954518825510901365">"سىرتتىكى نومۇرنى چاقىرغاندا تېلېفون سودىگىرىنىڭ كۆڭۈلدىكى تەڭشىكى بويىچە تېلېفون نومۇرنى كۆرسەت"</string>
+    <string name="labelCW" msgid="6120513814915920200">"چاقىرىشنى كۈتۈش"</string>
+    <string name="sum_cw_enabled" msgid="8083061901633671397">"سۆزلىشىۋاتقاندا، باشقا تېلېفون كەلسە ماڭا ئۇقتۇر"</string>
+    <string name="sum_cw_disabled" msgid="3648693907300104575">"سۆزلىشىۋاتقاندا، باشقا تېلېفون كەلسە ماڭا ئۇقتۇر"</string>
+    <string name="call_forwarding_settings" msgid="3378927671091537173">"كەلگەن تېلېفوننى ئۇلاپ يەتكۈزۈش تەڭشەكلىرى"</string>
+    <string name="labelCF" msgid="2574386948026924737">"كەلگەن تېلېفوننى ئۇلاپ يەتكۈزۈش"</string>
+    <string name="labelCFU" msgid="8147177368148660600">"ھەمىشە ئۇلاپ يەتكۈز"</string>
+    <string name="messageCFU" msgid="3560082430662923687">"ھەمىشە بۇ نومۇرنى ئىشلەت"</string>
+    <string name="sum_cfu_enabled_indicator" msgid="4014187342724130197">"ھەممە چاقىرىشنى ئۇلاپ يەتكۈز"</string>
+    <string name="sum_cfu_enabled" msgid="2450052502198827927">"ھەممە چاقىرىشنى <xliff:g id="PHONENUMBER">{0}</xliff:g> غا ئۇلاپ يەتكۈز"</string>
+    <string name="sum_cfu_enabled_no_number" msgid="6591985777096823616">"نومۇر ئىناۋەتسىز"</string>
+    <string name="sum_cfu_disabled" msgid="3698472522160364904">"چەكلەنگەن"</string>
+    <string name="labelCFB" msgid="218938523102207587">"ئۇلاپ يەتكۈزۈش ئالدىراش"</string>
+    <string name="messageCFB" msgid="3711089705936187129">"نومۇر ئالدىراش"</string>
+    <string name="sum_cfb_enabled" msgid="5984198104833116690">"<xliff:g id="PHONENUMBER">{0}</xliff:g> غا ئۇلاپ يەتكۈز"</string>
+    <string name="sum_cfb_disabled" msgid="227440009979537651">"چەكلەنگەن"</string>
+    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"مۇلازىمەت تەمىنلىگۈچىڭىز تېلېفون لېنىيىسى ئالدىراش ۋاقىتتا چاقىرىشنى ئۇلاپ يەتكۈزۈش ئىقتىدارىنى توختىتالمايدۇ."</string>
+    <string name="labelCFNRy" msgid="3646316323834351390">"جاۋاب بولمىسا ئۇلاپ يەتكۈز"</string>
+    <string name="messageCFNRy" msgid="672317899884380374">"جاۋاب بولمىسا ئۇلاپ يەتكۈزىدىغان نومۇر"</string>
+    <string name="sum_cfnry_enabled" msgid="6955775691317662910">"<xliff:g id="PHONENUMBER">{0}</xliff:g> غا ئۇلاپ يەتكۈز"</string>
+    <string name="sum_cfnry_disabled" msgid="8422350929957344729">"چەكلەنگەن"</string>
+    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">     "مۇلازىمەت تەمىنلىگۈچىڭىز تېلېفونىڭىز جاۋاب قايتۇرمىغاندا چاقىرىشنى ئۇلاپ يەتكۈزۈش ئىقتىدارىنى توختىتالمايدۇ."</string>
+    <string name="labelCFNRc" msgid="47183615370850000">"تېلېفون ئۇلانمىغاندا ئۇلاپ يەتكۈز"</string>
+    <string name="messageCFNRc" msgid="6380695421020295119">"تېلېفون ئۇلانمىغاندا ئۇلاپ يەتكۈزىدىغان نومۇر"</string>
+    <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"<xliff:g id="PHONENUMBER">{0}</xliff:g> غا ئۇلاپ يەتكۈز"</string>
+    <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"چەكلەنگەن"</string>
+    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"مۇلازىمەت تەمىنلىگۈچىڭىز تېلېفونغا ئۇلىشالمىغان ۋاقىتتا چاقىرىشنى ئۇلاپ يەتكۈزۈش ئىقتىدارىنى توختىتالمايدۇ."</string>
+    <string name="updating_title" msgid="6146755386174019046">"چاقىرىش تەڭشىكى"</string>
+    <string name="error_updating_title" msgid="7970259216988931777">"چاقىرىش تەڭشىكىدىن خاتالىق كۆرۈلدى"</string>
+    <string name="reading_settings" msgid="1920291699287055284">"تەڭشەك ئوقۇۋاتىدۇ…"</string>
+    <string name="updating_settings" msgid="8171225533884883252">"تەڭشەك يېڭىلاۋاتىدۇ…"</string>
+    <string name="reverting_settings" msgid="4752151682666912828">"تەڭشەكنى ئەسلىگە كەلتۈرۈۋاتىدۇ…"</string>
+    <string name="response_error" msgid="6674110501330139405">"كۈتۈلمىگەن تور ئىنكاسى."</string>
+    <string name="exception_error" msgid="7027667130619518211">"تور ياكى SIM كارتا خاتا."</string>
+    <string name="radio_off_error" msgid="6717116288405111269">"ئالدى بىلەن سىمسىز ئالاقىنى ئېچىپ ئاندىن بۇ تەڭشەكلەرنى كۆرۈڭ."</string>
+    <string name="close_dialog" msgid="2365884406356986917">"جەزملە"</string>
+    <string name="enable" msgid="1059008390636773574">"قوزغات"</string>
+    <string name="disable" msgid="7274240979164762320">"چەكلە"</string>
+    <string name="change_num" msgid="239476305819844391">"يېڭىلا"</string>
+  <string-array name="clir_display_values">
+    <item msgid="5560134294467334594">"تور كۆڭۈلدىكى تەڭشىكى"</item>
+    <item msgid="7876195870037833661">"نومۇرنى يوشۇر"</item>
+    <item msgid="1108394741608734023">"نومۇرنى كۆرسەت"</item>
+  </string-array>
+    <string name="vm_changed" msgid="380744030726254139">"ئۈنخەت نومۇرى ئۆزگەردى."</string>
+    <string name="vm_change_failed" msgid="6912718596496220653">"ئۈنخەت نومۇرىنى ئۆزگەرتىش مەغلۇپ بولدى."\n"ئەگەر بۇ مەسىلە يەنە مەۋجۇد بولسا تېلېفون مۇلازىمەت سودىگىرى بىلەن ئالاقىلىشىڭ."</string>
+    <string name="fw_change_failed" msgid="4437005899675054038">"ئۇلاپ يەتكۈزۈش نومۇرىنى ئۆزگەرتەلمىدى."\n"ئەگەر بۇ مەسىلە يەنە مەۋجۇد بولسا تېلېفون مۇلازىمەت سودىگىرى بىلەن ئالاقىلىشىڭ."</string>
+    <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"نۆۋەتتىكى ئۇلاپ يەتكۈزۈش نومۇر تەڭشىكىنى ئىزدەپ ساقلىيالمايدۇ."\n"يەنىلا يېڭى تېلېفون مۇلازىمەت سودىگىرىگە ئالماشتۇرۇۋېرەمسىز؟"</string>
+    <string name="no_change" msgid="3186040086622435212">"ھېچقانداق ئۆزگىرىش بولمىدى."</string>
+    <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"ئۈنخەت مۇلازىمىتىنى تاللاڭ"</string>
+    <string name="voicemail_default" msgid="5902099213882352338">"مۇلازىمەت تەمىنلىگۈچۈم"</string>
+    <string name="mobile_networks" msgid="5540397602919106177">"كۆچمە تور تەڭشىكى"</string>
+    <string name="label_available" msgid="1181658289009300430">"ئىشلىتىلىشچان تورلار"</string>
+    <string name="load_networks_progress" msgid="5230707536168902952">"ئىزدەۋاتىدۇ…"</string>
+    <string name="empty_networks_list" msgid="4249426905018815316">"تور تېپىلمىدى."</string>
+    <string name="search_networks" msgid="1601136049300882441">"تور ئىزدە"</string>
+    <string name="network_query_error" msgid="6828516148953325006">"تور ئىزدەۋاتقاندا خاتالىق كۆرۈلدى."</string>
+    <string name="register_on_network" msgid="9055203954040805084">"<xliff:g id="NETWORK">%s</xliff:g>غا خەتلىتىۋاتىدۇ…"</string>
+    <string name="not_allowed" msgid="3540496123717833833">"SIM كارتىڭىز بۇ تورغا باغلىنىشقا يول قويمايدۇ."</string>
+    <string name="connect_later" msgid="500090982903469816">"نۆۋەتتە بۇ تورغا باغلىنالمايدۇ. سەل تۇرۇپ قايتا سىناڭ."</string>
+    <string name="registration_done" msgid="495135664535876612">"توردا خەتلەتتى."</string>
+    <string name="sum_carrier_select" msgid="6526225502314751575">"تور مۇلازىمەت تەمىنلىگۈچىنى تاللاڭ"</string>
+    <string name="sum_search_networks" msgid="2921092249873272715">"ئىشلەتكىلى بولىدىغان ھەممە تورنى ئىزدە"</string>
+    <string name="select_automatically" msgid="8615980695510888796">"ئۆزلۈكىدىن تاللا"</string>
+    <string name="sum_select_automatically" msgid="8460954604521755275">"ئالدىن بەلگىلەنگەن تورنى ئۆزلۈكىدىن تاللا"</string>
+    <string name="register_automatically" msgid="6272031189219101172">"ئۆزلۈكىدىن خەتلەش…"</string>
+    <string name="preferred_network_mode_title" msgid="8873246565334559308">"تور ھالىتى"</string>
+    <string name="preferred_network_mode_summary" msgid="1434820673166126609">"تور ئىجرا قىلىش ھالىتىنى ئۆزگەرت"</string>
+    <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"ئالدىن بەلگىلەنگەن تور ھالىتى"</string>
+    <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"ئالدىن بەلگىلەنگەن تور ھالىتى: WCDMA ئالدىن بەلگىلەنگەن"</string>
+    <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"ئالدىن بەلگىلەنگەن تور ھالىتى: GSM لا"</string>
+    <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"ئالدىن بەلگىلەنگەن تور ھالىتى: WCDMA لا"</string>
+    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"ئالدىن بەلگىلەنگەن تور ھالىتى: GSM / WCDMA"</string>
+    <string name="preferred_network_mode_cdma_summary" msgid="3175690187294334241">"ئالدىن بەلگىلەنگەن تور ھالىتى: CDMA"</string>
+    <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"ئالدىن بەلگىلەنگەن تور ھالىتى: CDMA / EvDo"</string>
+    <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"ئالدىن بەلگىلەنگەن تور ھالىتى: CDMA لا"</string>
+    <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"ئالدىن بەلگىلەنگەن تور ھالىتى: EvDo لا"</string>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"ئالدىن بەلگىلەنگەن تور ھالىتى: LTE / CDMA"</string>
+  <string-array name="preferred_network_mode_choices">
+    <item msgid="5886604709726177211">"LTE/CDMA"</item>
+    <item msgid="3273348576277144124">"EvDo لا"</item>
+    <item msgid="454610224530856274">"EvDo ئىقتىدارى يوق، CDMA"</item>
+    <item msgid="8928247118825616081">"CDMA/EvDo ئاپتوماتىك"</item>
+    <item msgid="8595462903294812666">"GSM/WCDMA ئاپتوماتىك"</item>
+    <item msgid="5189164180446264504">"WCDMA لا"</item>
+    <item msgid="5714714953966979187">"GSM لا"</item>
+    <item msgid="4775796025725908913">"ئالدىن بەلگىلەنگەن GSM/WCDMA"</item>
+  </string-array>
+  <string-array name="preferred_network_mode_choices_lte">
+    <item msgid="7345284701413565429">"LTE/CDMA"</item>
+    <item msgid="5541716989029928208">"CDMA"</item>
+  </string-array>
+    <string name="data_enabled" msgid="5972538663568715366">"سانلىق مەلۇمات قوزغىتىلدى"</string>
+    <string name="data_enable_summary" msgid="5022018967714633874">"كۆچمە تورنىڭ سانلىق مەلۇمات زىيارەت ئىقتىدارىنى قوزغات"</string>
+    <string name="roaming" msgid="8871412572928323707">"سانلىق مەلۇمات كەزمە"</string>
+    <string name="roaming_enable" msgid="7331106985174381987">"كەزمە ھالەتتە سانلىق مەلۇمات مۇلازىمىتىگە باغلىنىدۇ"</string>
+    <string name="roaming_disable" msgid="1843417228755568110">"كەزمە ھالەتتە سانلىق مەلۇمات مۇلازىمىتىگە باغلىنىدۇ"</string>
+    <string name="roaming_reenable_message" msgid="6973894869473170666">"سانلىق مەلۇمات باغلىنىش ئۈزۈلدى چۈنكى يەرلىك توردىن ئايرىلدىڭىز ھەمدە سانلىق مەلۇمات كەزمە ھالەتنى تاقىدىڭىز."</string>
+    <string name="roaming_warning" msgid="7820963598559553967">"سانلىق مەلۇمات كەزمە ھالەتكە يول قويامسىز؟ بۇنداق بولغان ناھايىتى كۆپ كەزمە پۇلى كېلىپ چىقىشى مۇمكىن!"</string>
+    <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS تاللانما"</string>
+    <string name="cdma_options" msgid="4016822858172249884">"CDMA تاللانما"</string>
+    <string name="throttle_data_usage" msgid="3715677828160555808">"سانلىق مەلۇمات ئىشلىتىلىشى"</string>
+    <string name="throttle_current_usage" msgid="8762280193043815361">"نۆۋەتتىكى ۋاقىتتا ئىشلەتكەن سانلىق مەلۇمات"</string>
+    <string name="throttle_time_frame" msgid="1915198770363734685">"سانلىق مەلۇمات ئىشلىتىش مۆھلىتى"</string>
+    <string name="throttle_rate" msgid="4710388992676803508">"سانلىق مەلۇمات يوللاش نىسبىتى تەدبىرى"</string>
+    <string name="throttle_help" msgid="243651091785169900">"تەپسىلات بىلدۈرگۈسى"</string>
+    <string name="throttle_status_subtext" msgid="1657318943142085170">"ۋاقىت بۆلىكى يۇقىرى چېكى <xliff:g id="USED_2">%3$s</xliff:g>، نۆۋەتتىكى قىممىتى<xliff:g id="USED_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>٪)"\n"كېيىنكى ۋاقىت بۆلىكى <xliff:g id="USED_3">%4$d</xliff:g> كۈندىن كېيىن (<xliff:g id="USED_4">%5$s</xliff:g>) باشلىنىدۇ"</string>
+    <string name="throttle_data_usage_subtext" msgid="6029276011123694701">"ۋاقىت بۆلىكى يۇقىرى چېكى <xliff:g id="USED_2">%3$s</xliff:g>، نۆۋەتتىكى قىممىتى <xliff:g id="USED_0">%1$s</xliff:g> (<xliff:g id="USED_1">%2$d</xliff:g>٪)"</string>
+    <string name="throttle_data_rate_reduced_subtext" msgid="7492763592720107737">"<xliff:g id="USED_0">%1$s</xliff:g> نىسبەت چېكىدىن ھالقىت كەتتى"\n"سانلىق مەلۇمات يوللاش نىسبىتى <xliff:g id="USED_1">%2$d</xliff:g> Kb/s غا تۆۋەنلىتىلدى."</string>
+    <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"بۇ مۇددەت <xliff:g id="USED_0">%1$d</xliff:g>٪ ئۆتتى"\n"كېيىنكى ۋاقىت بۆلىكى <xliff:g id="USED_1">%2$d</xliff:g> كۈندىن كېيىن (<xliff:g id="USED_2">%3$s</xliff:g>)باشلىنىدۇ"</string>
+    <string name="throttle_rate_subtext" msgid="2149102656120726855">"ئەگەر ئېقىم مىقدارى يۇقىرى چېكىدىن ئېشىپ كەتسە ئۇنداقتا سانلىق مەلۇمات يوللاش نىسبىتى <xliff:g id="USED">%1$d</xliff:g> Kb/s غا تۆۋەنلىتىلىدۇ."</string>
+    <string name="throttle_help_subtext" msgid="5217706521499010816">"تېلېفون مۇلازىمەت سودىگىرىنىڭ كۆچمە تور سانلىق مەلۇمات ئىشلىتىش تەدبىرىنىڭ تەپسىلاتى"</string>
+    <string name="cell_broadcast_sms" msgid="5584192824053625842">"ئىجتىمائى رايون تارقاتقان قىسقا ئۇچۇر"</string>
+    <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"ئىجتىمائى رايون تارقاتقان قىسقا ئۇچۇر"</string>
+    <string name="cell_bc_sms_enable" msgid="6441688565738921084">"ئىجتىمائى رايون تارقاتقان قىسقا ئۇچۇر قوزغىتىلدى"</string>
+    <string name="cell_bc_sms_disable" msgid="3398365088309408749">"ئىجتىمائى رايون تارقاتقان قىسقا ئۇچۇر چەكلەندى"</string>
+    <string name="cb_sms_settings" msgid="651715019785107312">"ئىجتىمائى رايون تارقاتقان قىسقا ئۇچۇر تەڭشىكى"</string>
+    <string name="enable_disable_emergency_broadcast" msgid="2157014609041245335">"جىددىي تارقىتىش"</string>
+    <string name="emergency_broadcast_enable" msgid="2645980025414010211">"جىددىي تارقىتىش قوزغىتىلدى"</string>
+    <string name="emergency_broadcast_disable" msgid="3665199821267569426">"جىددىي تارقىتىش چەكلەندى"</string>
+    <string name="enable_disable_administrative" msgid="6501582322182059412">"باشقۇرۇش"</string>
+    <string name="administrative_enable" msgid="1750086122962032235">"باشقۇرۇش قوزغىتىلدى"</string>
+    <string name="administrative_disable" msgid="8433273857248698539">"باشقۇرۇش چەكلەندى"</string>
+    <string name="enable_disable_maintenance" msgid="1819693083025106678">"ئاسراش"</string>
+    <string name="maintenance_enable" msgid="8566636458770971189">"ئاسراش قوزغىتىلدى"</string>
+    <string name="maintenance_disable" msgid="7340189100885066077">"ئاسراش چەكلەندى"</string>
+    <string name="general_news_settings" msgid="4968779723948432978">"ئادەتتىكى خەۋەرلەر"</string>
+    <string name="bf_news_settings" msgid="3935593091894685267">"سودا ۋە ئىقتىساد خەۋەرلىرى"</string>
+    <string name="sports_news_settings" msgid="7649399631270052835">"تەنتەربىيە خەۋەرلىرى"</string>
+    <string name="entertainment_news_settings" msgid="5051153952959405035">"كۆڭۈل ئېچىش خەۋەرلىرى"</string>
+    <string name="enable_disable_local" msgid="7890281063123416120">"يەرلىك"</string>
+    <string name="local_enable" msgid="6370463247609136359">"يەرلىك خەۋەرلەر قوزغىتىلدى"</string>
+    <string name="local_disable" msgid="4405691986943795798">"يەرلىك خەۋەرلەر چەكلەندى"</string>
+    <string name="enable_disable_regional" msgid="4905652414535565872">"رايونلۇق"</string>
+    <string name="regional_enable" msgid="4434680415437834759">"رايونلۇق خەۋەرلەر قوزغىتىلدى"</string>
+    <string name="regional_disable" msgid="5359325527213850077">"رايونلۇق خەۋەرلەر چەكلەندى"</string>
+    <string name="enable_disable_national" msgid="236278090206880734">"دۆلەت ئىچى"</string>
+    <string name="national_enable" msgid="1172443648912246952">"دۆلەت ئىچى خەۋەرلەر قوزغىتىلدى"</string>
+    <string name="national_disable" msgid="326018148178601166">"دۆلەت ئىچى خەۋەرلەر چەكلەندى"</string>
+    <string name="enable_disable_international" msgid="7535348799604565592">"خەلقئارا"</string>
+    <string name="international_enable" msgid="5855356769925044927">"خەلقئارا خەۋەرلەر قوزغىتىلدى"</string>
+    <string name="international_disable" msgid="2850648591041088931">"خەلقئارا خەۋەرلەر چەكلەندى"</string>
+    <string name="list_language_title" msgid="2841683501919760043">"تىل"</string>
+    <string name="list_language_summary" msgid="8109546531071241601">"خەۋەر تىلىنى تاللاڭ"</string>
+  <string-array name="list_language_entries">
+    <item msgid="6137851079727305485">"ئىنگلىزچە"</item>
+    <item msgid="1151988412809572526">"فىرانسۇزچە"</item>
+    <item msgid="577840534704312665">"ئىسپانچە"</item>
+    <item msgid="8385712091143148180">"ياپونچە"</item>
+    <item msgid="1858401628368130638">"كورىيەچە"</item>
+    <item msgid="1933212028684529632">"خەنزۇچە"</item>
+    <item msgid="1908428006803639064">"ئىبرانىچە"</item>
+  </string-array>
+  <string-array name="list_language_values">
+    <item msgid="1804908636436467150">"1"</item>
+    <item msgid="289708030346890334">"2"</item>
+    <item msgid="1121469729692402684">"3"</item>
+    <item msgid="2614093115912897722">"4"</item>
+    <item msgid="2411164639857960614">"5"</item>
+    <item msgid="5884448729274543324">"6"</item>
+    <item msgid="5511864807618312598">"7"</item>
+  </string-array>
+    <string name="list_language_dtitle" msgid="5442908726538951934">"تىللار"</string>
+    <string name="enable_disable_local_weather" msgid="986967454867219114">"يەرلىك ھاۋارايى"</string>
+    <string name="local_weather_enable" msgid="6199315114382448922">"يەرلىك ھاۋارايى قوزغىتىلدى"</string>
+    <string name="local_weather_disable" msgid="2510158089142626480">"يەرلىك ھاۋارايى چەكلەندى"</string>
+    <string name="enable_disable_atr" msgid="8339572391278872343">"دائىرە قاتناش مەلۇماتى"</string>
+    <string name="atr_enable" msgid="5541757457789181799">"دائىرە قاتناش مەلۇماتى قوزغىتىلدى"</string>
+    <string name="atr_disable" msgid="7085558154727596455">"دائىرە قاتناش مەلۇماتى چەكلەندى"</string>
+    <string name="enable_disable_lafs" msgid="668189073721277199">"يەرلىك ئايرودۇرۇم نۆۋەتچى ئايرۇپىلان ۋاقىت جەدۋىلى"</string>
+    <string name="lafs_enable" msgid="2791978667205137052">"يەرلىك ئايرودۇرۇم نۆۋەتچى ئايرۇپىلان ۋاقىت جەدۋىلى قوزغىتىلدى"</string>
+    <string name="lafs_disable" msgid="2391212397725495350">"يەرلىك ئايرودۇرۇم نۆۋەتچى ئايرۇپىلان ۋاقىت جەدۋىلى چەكلەندى"</string>
+    <string name="enable_disable_restaurants" msgid="6240381945336814024">"تاماقخانا"</string>
+    <string name="restaurants_enable" msgid="5137657479469118847">"تاماقخانا قوزغىتىلدى"</string>
+    <string name="restaurants_disable" msgid="3678480270938424092">"تاماقخانا چەكلەندى"</string>
+    <string name="enable_disable_lodgings" msgid="1822029172658551202">"ئىجارە ئۆي ئۇچۇرى"</string>
+    <string name="lodgings_enable" msgid="3230042508992850322">"ئىجارە ئۆي ئۇچۇرى قوزغىتىلدى"</string>
+    <string name="lodgings_disable" msgid="3387879742320682391">"ئىجارە ئۆي ئۇچۇرى چەكلەندى"</string>
+    <string name="enable_disable_retail_directory" msgid="1357809784475660303">"پارچە سېتىش مۇندەرىجىسى"</string>
+    <string name="retail_directory_enable" msgid="3280626290436111496">"پارچە سېتىش مۇندەرىجىسى قوزغىتىلدى"</string>
+    <string name="retail_directory_disable" msgid="6479739816662879027">"پارچە سېتىش مۇندەرىجىسى چەكلەندى"</string>
+    <string name="enable_disable_advertisements" msgid="5999495926176182128">"ئېلان"</string>
+    <string name="advertisements_enable" msgid="2050305021264683786">"ئېلان قوزغىتىلدى"</string>
+    <string name="advertisements_disable" msgid="8350985908788707935">"ئېلان چەكلەندى"</string>
+    <string name="enable_disable_stock_quotes" msgid="6397810445293533603">"پاي-چېكى ئەھۋالى"</string>
+    <string name="stock_quotes_enable" msgid="4384802470887170543">"پاي-چېكى ئەھۋالى قوزغىتىلدى"</string>
+    <string name="stock_quotes_disable" msgid="4781450084565594998">"پاي-چېكى ئەھۋالى چەكلەندى"</string>
+    <string name="enable_disable_eo" msgid="4863043263443942494">"خىزمەت پۇرسىتى ئۇچۇرى"</string>
+    <string name="eo_enable" msgid="8623559062015685813">"خىزمەت پۇرسىتى ئۇچۇرى قوزغىتىلدى"</string>
+    <string name="eo_disable" msgid="3863812478090907609">"خىزمەت پۇرسىتى ئۇچۇرى چەكلەندى"</string>
+    <string name="enable_disable_mhh" msgid="5698783743098373681">"داۋالاش، ساقلىق ساقلاغ ۋە دوختۇرخانا ئۇچۇرى"</string>
+    <string name="mhh_enable" msgid="3949276822735205799">"داۋالاش، ساقلىق ساقلاغ ۋە دوختۇرخانا ئۇچۇرى قوزغىتىلدى"</string>
+    <string name="mhh_disable" msgid="4834280270664925123">"داۋالاش، ساقلىق ساقلاغ ۋە دوختۇرخانا ئۇچۇرى چەكلەندى"</string>
+    <string name="enable_disable_technology_news" msgid="3517184627114999149">"تېخنىكىلىق خەۋەرلەر"</string>
+    <string name="technology_news_enable" msgid="7995209394210455181">"تېخنىكىلىق خەۋەرلەر قوزغىتىلدى"</string>
+    <string name="technology_news_disable" msgid="5483490380561851946">"تېخنىكىلىق خەۋەرلەر چەكلەندى"</string>
+    <string name="enable_disable_multi_category" msgid="626771003122899280">"كۆپ كاتېگورىيە"</string>
+    <string name="multi_category_enable" msgid="1179299804641721768">"كۆپ كاتېگورىيە قوزغىتىلدى"</string>
+    <string name="multi_category_disable" msgid="880104702904139505">"كۆپ كاتېگورىيە چەكلەندى"</string>
+    <string name="prefer_2g" msgid="8442550937280449639">"2G تورىنىلا ئىشلىتىش"</string>
+    <string name="prefer_2g_summary" msgid="1976491403210690759">"توك تېجەش"</string>
+    <string name="cdma_system_select_title" msgid="5757657769327732833">"سىستېما تاللاش"</string>
+    <string name="cdma_system_select_summary" msgid="2528661990595284707">"CDMA كەزمە ھالەتنى ئۆزگەرت"</string>
+    <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"سىستېما تاللاش"</string>
+  <string-array name="cdma_system_select_choices">
+    <item msgid="176474317493999285">"يەرلىك تورلا"</item>
+    <item msgid="1205664026446156265">"ئاپتوماتىك"</item>
+  </string-array>
+    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA مۇشتەرى"</string>
+    <string name="cdma_subscription_summary" msgid="2530890766115781140">"RUIM/SIM ۋە NV ئارىسىدا ئالماشتۇر"</string>
+    <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"مۇشتەرى بول"</string>
+  <string-array name="cdma_subscription_choices">
+    <item msgid="2258014151300708431">"RUIM/SIM"</item>
+    <item msgid="5127722015571873880">"NV"</item>
+  </string-array>
+  <string-array name="cdma_subscription_values">
+    <item msgid="7494167883478914080">"0"</item>
+    <item msgid="6043847456049107742">"1"</item>
+  </string-array>
+    <string name="cdma_activate_device" msgid="3793805892364814518">"ئۈسكۈنە ئاكتىپلا"</string>
+    <string name="cdma_lte_data_service" msgid="4255018217292548962">"سانلىق مەلۇمات مۇلازىمەت تەڭشىكى"</string>
+    <string name="fdn" msgid="7878832555095183202">"مۇقىم تېلېفون نومۇرلار"</string>
+    <string name="manage_fdn_list" msgid="8777755791892122369">"مۇقىم نومۇر بۇراش تىزىملىكى"</string>
+    <string name="fdn_activation" msgid="2156479741307463576">"مۇقىم نومۇر بۇراشنى قوزغىتىش"</string>
+    <string name="fdn_enabled" msgid="5238109009915521240">"مۇقىم نومۇر بۇراش قوزغىتىلدى"</string>
+    <string name="fdn_disabled" msgid="4700049736675368279">"مۇقىم نومۇر بۇراش چەكلەندى"</string>
+    <string name="enable_fdn" msgid="3740191529180493851">"مۇقىم نومۇر بۇراشنى قوزغات"</string>
+    <string name="disable_fdn" msgid="7944020890722540616">"مۇقىم نومۇر بۇراشنى چەكلە"</string>
+    <string name="change_pin2" msgid="2153563695382176676">"PIN2 ئۆزگەرت"</string>
+    <string name="enable_fdn_ok" msgid="7215588870329688132">"مۇقىم نومۇر بۇراشنى چەكلە"</string>
+    <string name="disable_fdn_ok" msgid="5727046928930740173">"مۇقىم نومۇر بۇراشنى قوزغات"</string>
+    <string name="sum_fdn" msgid="1959399454900272878">"مۇقىم نومۇر بۇراشنى باشقۇرۇش"</string>
+    <string name="sum_fdn_change_pin" msgid="6666549734792827932">"مۇقىم نومۇر بۇراشنى زىيارەت قىلىدىغان PIN نى ئۆزگەرت"</string>
+    <string name="sum_fdn_manage_list" msgid="8431088265332628316">"تېلېفون نومۇر تىزىملىكى باشقۇرۇش"</string>
+    <string name="voice_privacy" msgid="7803023024169078619">"ئاۋاز شەخسىيىتى"</string>
+    <string name="voice_privacy_summary" msgid="3159383389833516214">"كۈچەيتىلگەن شەخسىيەت ھالىتىنى قوزغات"</string>
+    <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY مودېلى"</string>
+    <string name="tty_mode_option_summary" msgid="1073835131534808732">"TTY مودېلى تەڭشىكى"</string>
+    <string name="auto_retry_mode_title" msgid="1478311108889330757">"ئۆزلۈكىدىن قايتا سىنا"</string>
+    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"ئۆزلۈكىدىن قايتا قوزغىتىشنى سىنا"</string>
+    <string name="menu_add" msgid="1882023737425114762">"ئالاقەداش قوش"</string>
+    <string name="menu_edit" msgid="7143003705504672374">"ئالاقەداش تەھرىر"</string>
+    <string name="menu_delete" msgid="3977150783449642851">"ئالاقەداش ئۆچۈر"</string>
+    <string name="get_pin2" msgid="1198225482542827652">"PIN2 كىرگۈزۈڭ"</string>
+    <string name="name" msgid="7329028332786872378">"ئاتى"</string>
+    <string name="number" msgid="7905950798349903858">"نومۇر"</string>
+    <string name="save" msgid="4094274636321939086">"ساقلا"</string>
+    <string name="add_fdn_contact" msgid="2481915899633353976">"مۇقىم نومۇر بۇراشنى قوش"</string>
+    <string name="adding_fdn_contact" msgid="7627379633721940991">"مۇقىم نومۇر بۇراشنى قوشۇۋاتىدۇ…"</string>
+    <string name="fdn_contact_added" msgid="7458335758501736665">"مۇقىم نومۇر بۇراش قوشۇلدى."</string>
+    <string name="edit_fdn_contact" msgid="7976936035587081480">"مۇقىم نومۇر بۇراش تەھرىر"</string>
+    <string name="updating_fdn_contact" msgid="8370929876849803600">"مۇقىم نومۇر بۇراشنى قوشۇۋاتىدۇ…"</string>
+    <string name="fdn_contact_updated" msgid="5497828782609005017">"مۇقىم نومۇر بۇراش يېڭىلاندى."</string>
+    <string name="delete_fdn_contact" msgid="6668958073074151717">"مۇقىم نومۇر بۇراش ئۆچۈر"</string>
+    <string name="deleting_fdn_contact" msgid="5669163206349319969">"مۇقىم نومۇر بۇراشنى ئۆچۈرۈۋاتىدۇ…"</string>
+    <string name="fdn_contact_deleted" msgid="7154162327112259569">"مۇقىم نومۇر بۇراش ئۆچۈرۈلدى."</string>
+    <string name="pin2_invalid" msgid="7176360264228076810">"مۇقىم نومۇر بۇراش يېڭىلانمىدى: سىز كىرگۈزگەن PIN خاتا."</string>
+    <string name="fdn_invalid_number" msgid="9193130794297997290">"مۇقىم نومۇر بۇراش يېڭىلانمىدى: نومۇر 20 خانىدىن ئاشمايدۇ."</string>
+    <string name="simContacts_emptyLoading" msgid="2203331234764498011">"SIM كارتىدىن ئوقۇۋاتىدۇ…"</string>
+    <string name="simContacts_empty" msgid="5270660846489561932">"SIM كارتىدا ئالاقەداشلار يوق."</string>
+    <string name="simContacts_title" msgid="1861472842524839921">"ئەكىرىدىغان ئالاقەداشلارنى تاللاڭ"</string>
+    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"SIM كارتىدىن ئالاقەداش ئەكىرمەكچى بولسىڭىز، ئايروپىلان ھالىتىنى تاقاڭ."</string>
+    <string name="enable_pin" msgid="5422767284133234860">"SIM كارتا PIN قوزغات/چەكلە"</string>
+    <string name="change_pin" msgid="9174186126330785343">"SIM كارتا PIN ئۆزگەرت"</string>
+    <string name="enter_pin_text" msgid="8532615714751931951">"SIM كارتا PIN:"</string>
+    <string name="oldPinLabel" msgid="5287773661246368314">"كونا PIN"</string>
+    <string name="newPinLabel" msgid="207488227285336897">"يېڭى PIN"</string>
+    <string name="confirmPinLabel" msgid="257597715098070206">"يېڭى PIN جەزملە"</string>
+    <string name="badPin" msgid="4154316827946559447">"سىز كىرگۈزگەن كونا PIN كودى خاتا. قايتا سىناڭ."</string>
+    <string name="mismatchPin" msgid="5974597541268042785">"سىز كىرگۈزگەن PIN كودى ماس كەلمىدى. قايتا سىناڭ."</string>
+    <string name="invalidPin" msgid="5981171102258684792">"4-8 خانىلىق PIN نى كىرگۈزۈڭ."</string>
+    <string name="disable_sim_pin" msgid="3992926931620188855">"SIM كارتا PIN نى چەكلە"</string>
+    <string name="enable_sim_pin" msgid="5803702443844458831">"SIM كارتا PIN نى قوزغات"</string>
+    <string name="enable_in_progress" msgid="3695303775100109650">"سەل كۈتۈڭ…"</string>
+    <string name="enable_pin_ok" msgid="8077439615296694284">"SIM كارتا PIN قوزغىتىلدى"</string>
+    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM كارتا PIN چەكلەندى"</string>
+    <string name="pin_failed" msgid="6597695909685242127">"سىز كىرگۈزگەن PIN خاتا"</string>
+    <string name="pin_changed" msgid="9000716792724195093">"SIM كارتا PIN مۇۋەپپەقىيەتلىك ئۆزگەردى"</string>
+    <string name="puk_requested" msgid="3898394204193202803">"ئىم خاتا؛ SIM قۇلۇپلاندى! PUK2 زۆرۈر."</string>
+    <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
+    <string name="oldPin2Label" msgid="8559146795026261502">"كونا PIN2"</string>
+    <string name="newPin2Label" msgid="4573956902204349054">"يېڭى PIN2"</string>
+    <string name="confirmPin2Label" msgid="8100319484454787708">"يېڭى PIN2 جەزملە"</string>
+    <string name="badPuk2" msgid="4072035207011308856">"سىز كىرگۈزگەن PUK2 خاتا. قايتا سىناڭ."</string>
+    <string name="badPin2" msgid="515218795152422178">"سىز كىرگۈزگەن كونا PIN2 خاتا. قايتا سىناڭ."</string>
+    <string name="mismatchPin2" msgid="4177060915600342718">"سىز كىرگۈزگەن PIN2 ماس كەلمىدى. قايتا سىناڭ."</string>
+    <string name="invalidPin2" msgid="8237110107480395938">"4-8 خانىلىق PIN2 نى كىرگۈزۈڭ."</string>
+    <string name="invalidPuk2" msgid="1290977391033057871">"8 خانىلىق PUK2 نى كىرگۈزۈڭ."</string>
+    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى"</string>
+    <string name="label_puk2_code" msgid="302845876240219560">"PUK2 كودىنى كىرگۈزۈڭ"</string>
+    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"ئىم خاتا، PIN2 نى ئۆزگەرتىپ قايتا سىناڭ!"</string>
+    <string name="puk2_requested" msgid="5863580927788820813">"ئىم خاتا؛ SIM قۇلۇپلاندى! PUK2 زۆرۈر."</string>
+    <string name="doneButton" msgid="2859593360997984240">"تامام"</string>
+    <string name="caller_manage_header" msgid="3231519674734638786">"تېلېفون يىغىنى <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
+    <string name="voicemail_settings_number_label" msgid="8524164258691887790">"ئۈنخەت نومۇرى"</string>
+    <string name="card_title_dialing" msgid="5769417478498348054">نومۇر بۇراۋاتىدۇ</string>
+    <string name="card_title_redialing" msgid="4831412164303596395">"قايتا سىناۋاتىدۇ"</string>
+    <string name="card_title_conf_call" msgid="1162980346189744501">"تېلېفون يىغىنى"</string>
+    <string name="card_title_incoming_call" msgid="7364539451234646909">"چاقىرىلىش"</string>
+    <string name="card_title_call_ended" msgid="5544730338889702298">"سۆزلىشىش تامام"</string>
+    <string name="card_title_on_hold" msgid="821463117892339942">"كۈتۈپ تۇر"</string>
+    <string name="card_title_hanging_up" msgid="3999101620995182450">"ئۈزۈۋاتىدۇ"</string>
+    <string name="card_title_in_call" msgid="6346543933068225205">"سۆزلىشىۋاتىدۇ"</string>
+    <string name="card_title_my_phone_number" msgid="112428362494434191">"نومۇرۇم <xliff:g id="MY_PHONE_NUMBER">%s</xliff:g>"</string>
+    <string name="notification_missedCallTitle" msgid="7554385905572364535">"سۆزلەشمىگەن چاقىرىش"</string>
+    <string name="notification_missedCallsTitle" msgid="1361677948941502522">"سۆزلەشمىگەن چاقىرىشلار"</string>
+    <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> سۆزلەشمىگەن چاقىرىش"</string>
+    <string name="notification_missedCallTicker" msgid="504686252427747209">"<xliff:g id="MISSED_CALL_FROM">%s</xliff:g> نىڭ سۆزلەشمىگەن چاقىرىشى"</string>
+    <string name="notification_on_hold" msgid="3480694969511790465">"كۈتۈپ تۇر"</string>
+    <string name="notification_incoming_call" msgid="2820429205043529642">"چاقىرىلىش"</string>
+    <string name="notification_voicemail_title" msgid="8933468752045550523">"يېڭى ئۈنخەت"</string>
+    <string name="notification_voicemail_title_count" msgid="4366360747660929916">"يېڭى ئۈنخەت (<xliff:g id="COUNT">%d</xliff:g>)"</string>
+    <string name="notification_voicemail_text_format" msgid="4447323569453981685">"<xliff:g id="VOICEMAIL_NUMBER">%s</xliff:g> نومۇر بۇرا"</string>
+    <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"ئۈنخەت نومۇرى نامەلۇم"</string>
+    <string name="notification_network_selection_title" msgid="4224455487793492772">"مۇلازىمەت يوق"</string>
+    <string name="notification_network_selection_text" msgid="2607085729661923269">"تاللانغان تور (<xliff:g id="OPERATOR_NAME">%s</xliff:g>)نى ئىشلەتكىلى بولمايدۇ"</string>
+    <string name="incall_error_power_off" msgid="6550191216405193368">"تېلېفون ئۇرماقچى بولسىڭىز، ئايروپىلان ھالىتىنى تاقاڭ."</string>
+    <string name="incall_error_emergency_only" msgid="4678640422710818317">"تورغا خەتلەتمىگەن."</string>
+    <string name="incall_error_out_of_service" msgid="8587993036435080418">"كۆچمە تورنى ئىشلەتكىلى بولمايدۇ."</string>
+    <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"چاقىرىش يوللانمىدى. كىرگۈزگەن نومۇر ئىناۋەتسىز."</string>
+    <string name="incall_error_call_failed" msgid="4313552620858880999">"چاقىرىش يوللانمىدى."</string>
+    <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"MMI تەرتىپىنى قوزغىتىۋاتىدۇ…"</string>
+    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"قوللىمايدىغان مۇلازىمەت."</string>
+    <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"سۆزلىشىشنى ئالماشتۇرالمايدۇ."</string>
+    <string name="incall_error_supp_service_separate" msgid="914362338192301746">"سۆزلىشىشنى ئايرىيالمايدۇ."</string>
+    <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"سۆزلىشىشنى ئۇلاپ يۆتكىيەلمەيدۇ."</string>
+    <string name="incall_error_supp_service_conference" msgid="2505727299596357312">"تېلېفون يىغىنى ئېلىپ بارالمايدۇ."</string>
+    <string name="incall_error_supp_service_reject" msgid="7055164130563826216">"چاقىرىشنى رەت قىلالمايدۇ."</string>
+    <string name="incall_error_supp_service_hangup" msgid="7417583238334762737">"چاقىرىشنى ئۈزۈۋېتەلمەيدۇ."</string>
+    <string name="incall_call_type_label_sip" msgid="2310958283037924371">"ئىنتېرنېت چاقىرىشى"</string>
+    <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"جىددىي چاقىرىش"</string>
+    <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"سىمسىز ئالاقىنى ئېچىۋاتىدۇ…"</string>
+    <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"مۇلازىمەت دائىرىسىدىن ھالقىدى، قايتا سىناۋاتىدۇ…"</string>
+    <string name="dial_emergency_error" msgid="8362624131726575194">"چاقىرىش يوللانمىدى. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> جىددىي چاقىرىش نومۇرى ئەمەس."</string>
+    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"چاقىرىش يوللانمىدى. جىددىي چاقىرىش نومۇرىنى بۇراڭ!"</string>
+    <string name="dialerKeyboardHintText" msgid="9192914825413747792">"ھەرپتاختىدا نومۇر بۇراش"</string>
+    <string name="onscreenHoldText" msgid="2285258239691145872">"كۈتۈش"</string>
+    <string name="onscreenEndCallText" msgid="4403855834875398585">"تامام"</string>
+    <string name="onscreenShowDialpadText" msgid="8561805492659639893">"نومۇر بۇراش تاختىسى"</string>
+    <string name="onscreenMuteText" msgid="5011369181754261374">"ئۈنسىز"</string>
+    <string name="onscreenAddCallText" msgid="5140385634712287403">"چاقىرىش قوش"</string>
+    <string name="onscreenMergeCallsText" msgid="6640195098064538950">"چاقىرىشنى بىرلەشتۈر"</string>
+    <string name="onscreenSwapCallsText" msgid="1602990689244030047">"ئالماشتۇر"</string>
+    <string name="onscreenManageCallsText" msgid="5473231160123254154">"چاقىرىش باشقۇرۇش"</string>
+    <string name="onscreenManageConferenceText" msgid="6485935856534311346">"تېلېفون يىغىنى باشقۇرۇش"</string>
+    <string name="onscreenAudioText" msgid="1710087112800041743">"ئۈن"</string>
+    <string name="importSimEntry" msgid="6614358325359736031">"ئەكىر"</string>
+    <string name="importAllSimEntries" msgid="1503181169636198673">"ھەممىنى ئەكىر"</string>
+    <string name="importingSimContacts" msgid="7374056215462575769">"SIM كارتىدىكى ئالاقەداشلارنى ئەكىرىۋاتىدۇ"</string>
+    <string name="importToFDNfromContacts" msgid="2130620207013368580">"ئالاقەداشتىن ئەكىر"</string>
+    <string name="hac_mode_title" msgid="8740268574688743289">"ئاڭلاتقۇ"</string>
+    <string name="hac_mode_summary" msgid="6833851160514929341">"ئاڭلاتقۇ ماسلىشىشچانلىقنى ئاچ"</string>
+  <string-array name="tty_mode_entries">
+    <item msgid="512950011423868021">"TTY تاقاق"</item>
+    <item msgid="3971695875449640648">"TTY لىق"</item>
+    <item msgid="1937509904407445684">"TTY HCO"</item>
+    <item msgid="5644925873488772224">"TTY VCO"</item>
+  </string-array>
+    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF ئۈن"</string>
+    <string name="dtmf_tones_summary" msgid="3351820372864020331">"DTMF ئۈن ئۇزۇنلۇق تەڭشىكى"</string>
+  <string-array name="dtmf_tone_entries">
+    <item msgid="899650777817315681">"ئادەتتىكى"</item>
+    <item msgid="2883365539347850535">"ئۇزۇن"</item>
+  </string-array>
+    <string name="network_message" msgid="5673682885938122239">"تور ئۇچۇرى"</string>
+    <string name="ota_title_activate" msgid="8616918561356194398">"تېلېفونىڭىزنى ئاكتىپلاڭ"</string>
+    <string name="ota_touch_activate" msgid="6553212803262586244">"ئالاھىدە نومۇرنى بۇرىسىڭىز ئاندىن تېلېفون مۇلازىمىتىڭىزنى ئاكتىپلىيالايسىز."\n\n"«ئاكتىپلا»نى باسقاندىن كېيىن ئاۋازلىق ئەسكەرتىش بويىچە تېلېفونىڭىزنى ئاكتىپلاڭ."</string>
+    <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"ئاكتىپلاشتىن ئاتلامدۇ؟"</string>
+    <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"ئەگەر ئاكتىپلاشتىن ئاتلاپ كەتسىڭىز، تېلېفون ئۇرالمايسىز ھەمدە كۆچمە سانلىق مەلۇمات تورى(ئەمما Wi-Fi تورىغا ئۇلىنالايسىز)غا باغلىنالمايسىز."</string>
+    <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"ئاتلا"</string>
+    <string name="ota_activate" msgid="1368528132525626264">"ئاكتىپلا"</string>
+    <string name="ota_title_activate_success" msgid="3344632328991980578">"تېلېفون ئاكتىپلاندى!"</string>
+    <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"ئاكتىپلاشتا مەسىلىگە يولۇقتى"</string>
+    <string name="ota_listen" msgid="162923839877584937">"ئاۋازلىق ئەسكەرتىشكە ئاساسەن مەشغۇلات قىلىپ، تېلېفون ئاكتىپلاش تاماملانغۇچە مەشغۇلات  قىلىڭ."</string>
+    <string name="ota_speaker" msgid="6904589278542719647">"ياڭراتقۇ"</string>
+    <string name="ota_progress" msgid="4644512049143969504">"تېلېفونىڭىزغا پىروگرامما يېزىۋاتىدۇ، سەل كۈتۈڭ."</string>
+    <string name="ota_failure" msgid="8600027551822478181">"پىروگرامما يېزىش مەغلۇپ بولدى"</string>
+    <string name="ota_successful" msgid="1880780692887077407">"تېلېفونىڭىز ئاكتىپلاندى. كۆپ بولغاندا 15 مىنۇتقىچە مۇلازىمەت ئىشلىتىشنى باشلىيالايسىز."</string>
+    <string name="ota_unsuccessful" msgid="623361244652068739">"تېلېفونىڭىز ئاكتىپلانمىدى"\n"سىز تېلېفون سىگنالى ياخشى جاي(دەرىزە يېنى ياكى تاشقىرىدا)نى تېپىڭ."\n\n"قايتا سىناڭ ياكى خېرىدار مۇلازىمەت مەركىزىنى چاقىرىپ تېخىمۇ كۆپ ھەل قىلىش ئۇسۇلىغا ئېرىشىڭ."</string>
+    <string name="ota_spc_failure" msgid="3909983542575030796">"SPC كاشىلىسى بەك كۆپ"</string>
+    <string name="ota_call_end" msgid="4537279738134612388">"قايت"</string>
+    <string name="ota_try_again" msgid="7685477206465902290">"قايتا سىنا"</string>
+    <string name="ota_next" msgid="3904945374358235910">"كېيىنكى"</string>
+    <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
+    <string name="phone_entered_ecm_text" msgid="6266424252578731203">"جىددىي چاقىرىش ھالىتىگە كىردى"</string>
+    <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"جىددىي چاقىرىش ھالىتى"</string>
+    <string name="phone_in_ecm_call_notification_text" msgid="4611608947314729773">"سانلىق مەلۇمات باغلىنىش چەكلەنگەن"</string>
+  <plurals name="phone_in_ecm_notification_time">
+    <item quantity="one" msgid="4866221796252472622">"<xliff:g id="COUNT">%s</xliff:g> مىنۇت سانلىق مەلۇمات باغلىنىشى يوق"</item>
+    <item quantity="other" msgid="3122217344579273583">"<xliff:g id="COUNT">%s</xliff:g> مىنۇت سانلىق مەلۇمات باغلىنىشى يوق"</item>
+  </plurals>
+  <plurals name="alert_dialog_exit_ecm">
+    <item quantity="one" msgid="2181569650640386253">"تېلېفون <xliff:g id="COUNT">%s</xliff:g> مىنۇت جىددىي چاقىرىش ھالىتىدە تۇرىدۇ. بۇ ھالەتتە، سانلىق مەلۇمات باغلىنىشى ئېلىپ بېرىلىۋاتقان ئەپنى ئىشلەتكىلى بولمايدۇ. دەرھال چېكىنەمسىز؟"</item>
+    <item quantity="other" msgid="3231879566243957821">"تېلېفون <xliff:g id="COUNT">%s</xliff:g> مىنۇت جىددىي چاقىرىش ھالىتىدە تۇرىدۇ. بۇ ھالەتتە، سانلىق مەلۇمات باغلىنىشى ئېلىپ بېرىلىۋاتقان ئەپنى ئىشلەتكىلى بولمايدۇ. دەرھال چېكىنەمسىز؟"</item>
+  </plurals>
+  <plurals name="alert_dialog_not_avaialble_in_ecm">
+    <item quantity="one" msgid="8939225905428421722">"جىددىي چاقىرىش ھالىتىدە تاللانغان مەشغۇلاتنى ئىجرا قىلالمايدۇ.تېلېفون بۇ ھالەتتە <xliff:g id="COUNT">%s</xliff:g> مىنۇت داۋاملىشىدۇ. دەرھال چېكىنەمسىز؟"</item>
+    <item quantity="other" msgid="3489076611710869904">"جىددىي چاقىرىش ھالىتىدە تاللانغان مەشغۇلاتنى ئىجرا قىلالمايدۇ.تېلېفون بۇ ھالەتتە <xliff:g id="COUNT">%s</xliff:g> مىنۇت داۋاملىشىدۇ. دەرھال چېكىنەمسىز؟"</item>
+  </plurals>
+    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"جىددىي چاقىرىش ھالىتىدە تاللانغان مەشغۇلاتنى ئىجرا قىلالمايدۇ."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"جىددىي چاقىرىش ھالىتىدىن چېكىنىۋاتىدۇ"</string>
+    <string name="alert_dialog_yes" msgid="6674268047820703974">"ھەئە"</string>
+    <string name="alert_dialog_no" msgid="1476091437797628703">"ياق"</string>
+    <string name="alert_dialog_dismiss" msgid="2491494287075907171">"تاقا"</string>
+    <string name="voicemail_settings" msgid="2288633492587133022">"ئۈنخەت تەڭشەك"</string>
+    <string name="voicemail_number_not_set" msgid="1604580506447265808">"‹تەڭشەلمىگەن›"</string>
+    <string name="voicemail_provider" msgid="6299679757491942924">"ئۈنخەت مۇلازىمىتى"</string>
+    <string name="other_settings" msgid="3672912580359716394">"باشقا چاقىرىش تەڭشىكى"</string>
+    <string name="calling_via_template" msgid="7374498518104190489">"^1 ئارقىلىق نومۇر بۇراۋاتىدۇ"\n<b>"^2"</b></string>
+    <string name="contactPhoto" msgid="4713193418046639466">"ئالاقەداش سۈرىتى"</string>
+    <string name="goPrivate" msgid="865837794424530980">"شەخسىي پاراڭ"</string>
+    <string name="selectContact" msgid="781975788478987237">"ئالاقەداش تاللاڭ"</string>
+    <string name="sip_settings" msgid="6699045718560859691">"ئىنتېرنېت چاقىرىش تەڭشىكى"</string>
+    <string name="sip_accounts" msgid="2097054001288457163">"ئىنتېرنېت چاقىرىش (SIP) ھېساباتى"</string>
+    <string name="sip_accounts_title" msgid="1212889069281054570">"ھېساباتلار"</string>
+    <string name="sip_receive_calls" msgid="5635685570889971559">"قوبۇللىغان چاقىرىلىشلار"</string>
+    <string name="sip_receive_calls_summary" msgid="8403613238633679184">"توكدان ۋاقتىنى ئازايتىدۇ"</string>
+    <string name="sip_call_options_title" msgid="27433718808839672">"ئىنتېرنېت چاقىرىش ئىشلەت"</string>
+    <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"ئىنتېرنېت چاقىرىش ئىشلەت (Wi-Fi لا)"</string>
+    <string name="sip_call_options_entry_1" msgid="6556668894178520760">"سانلىق مەلۇمات تورى ئۇلانغاندا ھەممە سۆزلىشىشكە ئىشلىتىلىدۇ"</string>
+    <string name="sip_call_options_entry_2" msgid="6789764029719494361">"ئىنتېرنېت چاقىرىشقىلا"</string>
+    <string name="sip_call_options_entry_3" msgid="7474809001402649185">"ھەر بىر چاقىرغاندا سور"</string>
+    <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"ھەممە چاقىرىش ئۈچۈن"</string>
+    <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"تېلېفون چاقىر"</string>
+    <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"ئىنتېرنېت چاقىرىش ھېساباتى ئىشلەت:"</string>
+    <string name="remember_my_choice" msgid="7058059586169290705">"ھەمىشە ئىنتېرنېت چاقىرىشنى ئىشلەت"</string>
+    <string name="reset_my_choice_hint" msgid="8522825056755061594">"سىز سۆزلىشىش تەڭشىكىدىن  تېلېفون ئۇرغاندا ئىشلىتىدىغان كۆڭۈلدىكى ئىنتېرنېت ھېساباتىڭىزنى ئۆزگەرتەلەيسىز، ئىنتېرنېت چاقىرىش تەڭشىكىدىن باشقا ھېساباتنى تاللىسىڭىزلا بولىدۇ."</string>
+    <string name="pstn_phone" msgid="8782554491484326429">"كۆچمە تېلېفوندا چاقىر"</string>
+    <string name="internet_phone" msgid="1147922660195095810">"ئىنتېرنېت چاقىرىشى"</string>
+    <string name="no_sip_account_found_title" msgid="6266249392379373628">"ئىنتېرنېت چاقىرىش ھېساباتى يوق"</string>
+    <string name="no_sip_account_found" msgid="8777818244108212791">"بۇ تېلېفوندا ئىنتېرنېت چاقىرىش ھېساباتى يوق. ھازىرلا بىرنى قوشامسىز؟"</string>
+    <string name="sip_menu_add" msgid="8757508498518881500">"قوش"</string>
+    <string name="add_sip_account" msgid="5904858426290097611">"ھېسابات قوش"</string>
+    <string name="remove_sip_account" msgid="7645900420385682570">"ھېساباتنى چىقىرىۋەت"</string>
+    <string name="sip_account_list" msgid="5480058210652194306">"SIP ھېسابات"</string>
+    <string name="saving_account" msgid="7468818916695729968">"ھېساباتنى ساقلاۋاتىدۇ…"</string>
+    <string name="removing_account" msgid="5569334415898924904">"ھېساباتنى چىقىرىۋېتىۋاتىدۇ…"</string>
+    <string name="sip_menu_save" msgid="5842531129356014943">"ساقلا"</string>
+    <string name="sip_menu_discard" msgid="524075892158789701">"تاشلىۋەت"</string>
+    <string name="alert_dialog_close" msgid="7759635137627626235">"سەپلىمە ھۆججەتنى ياپ"</string>
+    <string name="alert_dialog_ok" msgid="3580379406983564080">"جەزملە"</string>
+    <string name="close_profile" msgid="6886968271423155284">"ياپ"</string>
+    <string name="primary_account_summary_with" msgid="1633960536212343187">"باش ھېسابات. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
+    <string name="registration_status_checking_status" msgid="3381868307694056727">"ھالەتنى تەكشۈرۈۋاتىدۇ..."</string>
+    <string name="registration_status_registering" msgid="7115694971025999516">"خەتلەۋاتىدۇ..."</string>
+    <string name="registration_status_still_trying" msgid="1471733478935862864">"سىناۋاتىدۇ…"</string>
+    <string name="registration_status_not_receiving" msgid="5011399017106466965">"چاقىرىشنى قوبۇللىيالمايدۇ"</string>
+    <string name="registration_status_no_data" msgid="8279587001454092132">"ھېسابات خەتلەش توختىدى چۈنكى ئىنتېرنېت باغلىنىشى يوق"</string>
+    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"ھېسابات خەتلەش توختىدى چۈنكى Wi-Fi باغلىنىشى يوق"</string>
+    <string name="registration_status_not_running" msgid="3826034902272084289">"ھېسابات خەتلىتەلمىدى"</string>
+    <string name="registration_status_done" msgid="6434927607037752239">"چاقىرىش قوبۇللاۋاتىدۇ"</string>
+    <string name="registration_status_failed_try_later" msgid="5214474354451220581">"ھېسابات خەتلىتەلمىدى: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>)؛ سەل تۇرۇپ قايتا سىنايدۇ"</string>
+    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"ھېسابات خەتلىتەلمىدى: ئىشلەتكۈچى ئاتى ياكى ئىم خاتا"</string>
+    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"ھېسابات خەتلىتەلمىدى: مۇلازىمېتىر ئاتىنى تەكشۈرۈڭ"</string>
+    <string name="third_party_account_summary" msgid="1069915789382987226">"بۇ ھېساباتنى <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> ئەپ ئىشلىتىۋاتىدۇ"</string>
+    <string name="sip_edit_title" msgid="489288416435014385">"SIP  ھېساب تەپسىلاتى"</string>
+    <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP  ھېساب تەپسىلاتى"</string>
+    <string name="domain_address_title" msgid="9071787581316160480">"مۇلازىمېتىر"</string>
+    <string name="username_title" msgid="2479375923477682328">"ئىشلەتكۈچى ئاتى"</string>
+    <string name="password_title" msgid="3323555249068171531">"ئىم"</string>
+    <string name="display_name_title" msgid="2459768196312249937">"كۆرسىتىدىغان ئات"</string>
+    <string name="proxy_address_title" msgid="4828301345351614273">"سىرتقى ۋاكالەتچى ئادرېس"</string>
+    <string name="port_title" msgid="5952939408078626657">"ئېغىز نومۇرى"</string>
+    <string name="transport_title" msgid="8253139511847746640">"يوللاش تىپى"</string>
+    <string name="send_keepalive_title" msgid="7533342573918645113">"ئۇدا ھەرىكەتتە ئۇچۇرى يوللا"</string>
+    <string name="set_primary_title" msgid="5351892327447571451">"باش ھېساباتقا تەڭشە"</string>
+    <string name="set_primary_summary" msgid="2219064654523258577">"سىرتنى چاقىرىدىغانغا ئىشلىتىدۇ"</string>
+    <string name="advanced_settings" msgid="8350631795335495338">"تاللاشچان تەڭشەكلەر"</string>
+    <string name="auth_username_title" msgid="851473016307947120">"دەلىللەنگەن ئىشلەتكۈچى ئاتى"</string>
+    <string name="auth_username_summary" msgid="6782012405225938629">"سالاھىيەت دەلىللەشكە ئىشلىتىدىغان ئىشلەتكۈچى ئاتى"</string>
+    <string name="default_preference_summary" msgid="868766740121667450">"‹تەڭشەلمىگەن›"</string>
+    <string name="display_name_summary" msgid="8636377460518225523">"&lt;ئىشلەتكۈچى ئاتى بىلەن ئوخشاش&gt;"</string>
+    <string name="optional_summary" msgid="1464058793789832411">"&lt;تاللاشچان&gt;"</string>
+    <string name="advanced_settings_show" msgid="4668880308290857597">"▷ چېكىلسە ھەممىنى كۆرسىتىدۇ"</string>
+    <string name="advanced_settings_hide" msgid="217398292824758079">"▽ چېكىلسە ھەممىنى يوشۇرىدۇ"</string>
+    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> نى تولدۇرۇش زۆرۈر؛ بوش قالدۇرۇلمايدۇ"</string>
+    <string name="not_a_valid_port" msgid="5750410768271782606">"ئېغىز نومۇرى 1000 بىلەن 65534 نىڭ ئارىلىقىدا"</string>
+    <string name="no_internet_available_title" msgid="3327109242858406165">"ئىنتېرنېت باغلىنىشى يوق"</string>
+    <string name="no_wifi_available_title" msgid="747881033089378758">"Wi-Fi باغلىنىشى يوق"</string>
+    <string name="no_internet_available" msgid="1100564991026313234">"ئىنتېرنېتتا چاقىرغاندا ئالدى بىلەن ئىنتېرنېت باغلىنىشىنى تەكشۈرۈڭ"</string>
+    <string name="no_wifi_available" msgid="3389743006886634541">"ئىنتېرنېتتا چاقىرىغاندا چوقۇم Wi-Fi باغلىنىشى بولۇشى لازىم (سىسمسىز تور ۋە تور تەڭشىكىنى ئىشلىتىڭ)"</string>
+    <string name="no_voip" msgid="8901474054537199865">"ئىنتېرنېتتا چاقىرىشنى قوللىمايدۇ"</string>
+    <string name="sip_system_decide" msgid="368030746310423471">"ئاپتوماتىك"</string>
+    <string name="sip_always_send_keepalive" msgid="8192080724632877132">"ھەمىشە يوللا"</string>
+    <string name="not_voice_capable" msgid="2739898841461577811">"ئاۋازلىق چاقىرىشنى قوللىمايدۇ"</string>
+    <string name="respond_via_sms_canned_response_1" msgid="2461606462788380215">"ھازىر سۆزلىشىش بىئەپ. نېمە ئىش بولدى؟"</string>
+    <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"ھازىرلا سىزگە تېلېفون قايتۇرىمەن."</string>
+    <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"سەل تۇرۇپ تېلېفون قايتۇرىمەن."</string>
+    <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"ھازىر سۆزلىشىش بىئەپ. سەل تۇرۇپ تېلېفون قىلامسىز؟"</string>
+    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"ئىختىيارى ئۇچۇر..."</string>
+    <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"تېز جاۋابلار"</string>
+    <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"تېز جاۋاب تەھرىر"</string>
+    <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"/>
+    <string name="respond_via_sms_edittext_dialog_title" msgid="20379890418289778">"تېز جاۋاب"</string>
+    <string name="respond_via_sms_confirmation_format" msgid="7229149977515784269">"ئۇچۇر <xliff:g id="PHONE_NUMBER">%s</xliff:g> غا يوللاندى."</string>
+    <string name="description_image_button_one" msgid="5502718871331943463">"بىر"</string>
+    <string name="description_image_button_two" msgid="4903738528222924522">"ئىككى"</string>
+    <string name="description_image_button_three" msgid="5570985408463782329">"ئۈچ"</string>
+    <string name="description_image_button_four" msgid="1697520001239289074">"تۆت"</string>
+    <string name="description_image_button_five" msgid="3450276493026943454">"بەش"</string>
+    <string name="description_image_button_six" msgid="2070376172268675300">"ئالتە"</string>
+    <string name="description_image_button_seven" msgid="1757351311199993371">"يەتتە"</string>
+    <string name="description_image_button_eight" msgid="4734693919020613227">"سەككىز"</string>
+    <string name="description_image_button_nine" msgid="5568534122590597040">"توققۇز"</string>
+    <string name="description_image_button_star" msgid="1976280813017254462">"يۇلتۇز"</string>
+    <string name="description_image_button_zero" msgid="4211255756866893605">"نۆل"</string>
+    <string name="description_image_button_pound" msgid="1716041284529917866">"چارچاپ"</string>
+    <string name="description_dial_button" msgid="7459705245418435351">"نومۇر بۇراش"</string>
+    <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
+    <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"ياڭراتقۇ قوزغىتىلدى"</string>
+    <string name="accessibility_call_muted" msgid="2776111226185342220">"چاقىرىش ئۈنسىز."</string>
+    <string name="description_target_answer" msgid="7205604197797472471">"جاۋاب "</string>
+    <string name="description_target_send_sms" msgid="2098326025587950144">"قىسقا ئۇچۇر يوللا"</string>
+    <string name="description_target_decline" msgid="4789834364389731957">"قوشۇلما"</string>
+    <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"تىترەت"</string>
+    <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"تىترەت"</string>
+  <string-array name="voicemail_notification_vibrate_when_entries">
+    <item msgid="468237575962916558">"ھەمىشە"</item>
+    <item msgid="1595097872875714252">"ئۈنسىز ھالەتتىلا"</item>
+    <item msgid="1458182414036878616">"ھەرگىز"</item>
+  </string-array>
+</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 9787edeea..d79c53059 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Приватний номер"</string>
     <string name="payphone" msgid="1931775086311769314">"Таксофон"</string>
     <string name="onHold" msgid="9035493194749959955">"Очікує"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Поточний виклик"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Лінія зайнята"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Мережа зайнята"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Нема відп., час очік.мин."</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Сервер недоступний"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Номер недоступний"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Неправ. ім\'я корист-ча чи пароль"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Дзвінок із-за меж мережі"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Виклик із-поза меж мережі"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Помилка сервера. Спроб. пізніше."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Немає сигналу"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Перевищено ліміт ACM"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Вимк. радіо"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Нема SIM або помилка SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Помилка SIM-карти або SIM-карта відсутня"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Поза межами дії служби"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Вихідні дзвінки обмежено FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Неможл. робити вих. дзвінки, коли увімк. заборона виклику."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Ви не можете здійснювати вихідні виклики, коли ввімкнено заборону викликів."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Усі дзвінки обмежено контролем доступу."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Аварійні виклики обмежено контролем доступу."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Звичайні виклики обмежено контролем доступу."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: тел. заблоковано до енергет. циклу."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: дзвін. роз\'єдн."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: виклик перехоплено"</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: переупорядк."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: відмова опції служби."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: порядок повтор."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: доступ не отримано."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: перервано."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Дозволені лише аварійні дзвінки"</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Недійсний номер"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Недійсний номер"</string>
     <string name="confCall" msgid="1904840547188336828">"Конференц-виклик"</string>
     <string name="call_lost" msgid="317670617901479594">"Виклик утрачено."</string>
-    <string name="retry" msgid="8462986804300767852">"Повтор."</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Викл. пропущ."</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Код MMI запущено"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Запуск. код USSD..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Дротова гарнітура"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Надісл. наступні сигнали?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Надсил. сигналів"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Надсилання сигналів"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Надісл."</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Так"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Ні"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Замінити символ-джокер на"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Замінити довільний символ на"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Відстун. номер голос. пошти"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"На SIM-карті немає збереж. номерів голос. пошти."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Додати номер"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Завант-ня…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Введ. PIN -код, щоб розбл. SIM-карту."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM-карту розбл."</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Нов. PIN-код SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Знову введ. новий PIN-код SIM, щоб підтв."</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Введені PIN-коди SIM не збігаються. Спробуйте ще."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Введ. PUK-код, щоб розбл. SIM-карту"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Неправильний PUK-код!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Продовжити"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Вашу SIM-карту розблоковано. Ваш телефон розблоковується..."</string>
     <string name="label_ndp" msgid="780479633159517250">"Розбл. PIN-код мережі SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Розблок."</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Запитув. розблок. мережі..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Не здійсн. запит розблокування мережі"</string>
     <string name="unlock_success" msgid="6770085622238180152">"Мережу успішно розблоковано."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Налашт. виклику GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Налашт. викл. в CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Назва точки доступу"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Лише додат. налашт-ння виклику в CDMA"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Налашт-ня мережевої служби"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Ідент. абон."</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Завантаження налаштувань…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Номер приховано у вихідних дзвінках"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Номер відображ. у вихідних дзвінках"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Викор. налашт. оператора за умовч. для показу мого номеру у вих. дзвінк."</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Номер., коли зайн."</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Пересилання на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Вимкнено"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Ваш оператор не підтримує вимкн. пересил. викликів, коли ваш телефон зайнятий."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Ваш оператор не підтримує вимкнення переадресації викликів, коли телефон зайнятий."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Пересилати, якщо не відпов."</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Номер., якщо не відпов."</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Пересилання на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Вимкнено"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Ваш оператор не підтримує вимкн. пересил. викликів, коли ваш телефон не відповідає."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Ваш оператор не підтримує вимкнення переадресації викликів, коли телефон не відповідає."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Пересилати, коли недоступ."</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Номер., якщо недосяжн."</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Пересилання на <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Вимкнено"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Ваш оператор не підтримує вимкнення пересилання викликів, коли ваш телефон недосяжний."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Ваш оператор не підтримує вимкнення переадресації викликів, коли телефон недосяжний."</string>
     <string name="updating_title" msgid="6146755386174019046">"Налашт. виклику"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Помилка налашт. виклику"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Налашт-ння читання…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Відновл. налашт-нь…"</string>
     <string name="response_error" msgid="6674110501330139405">"Неочікувана відповідь від мережі"</string>
     <string name="exception_error" msgid="7027667130619518211">"Помилка мережі чи SIM-карти."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Операції дозволено лише для номерів фіксованого набору."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Увімкніть радіо перед переглядом цих налаштувань."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Налаштування номерів фіксованого набору програми \"Телефон\" увімкнено. Унаслідок цього деякі функції, пов’язані з викликами, не працюють."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Увімкніть радіо, перш ніж переглядати ці налаштування."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Увімкнути"</string>
     <string name="disable" msgid="7274240979164762320">"Вимкнути"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Сховати номер"</item>
     <item msgid="1108394741608734023">"Показ. номер"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Збер. номер голос. пошти"</string>
     <string name="vm_changed" msgid="380744030726254139">"Номер голос. пошти змінено."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Не вдалося змінити номер голос. пошти."\n"Зв\'яж. з операт. послуг моб. зв., якщо проб. не зникне."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Не вдалося змінити номер пересилання."\n"Зв\'яж. з операт. послуг моб. зв., якщо проб. не зникне."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Не вдалося змінити номер голосової пошти."\n"Зв’яжіться зі своїм оператором, якщо проблема не зникне."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Не вдалося змінити номер переадресації."\n"Зв’яжіться зі своїм оператором, якщо проблема не зникне."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Не вдалося отримати та зберегти поточні налаштування номера переадресації."\n"Усе одно переключитися на нового оператора?"</string>
     <string name="no_change" msgid="3186040086622435212">"Не здійсн. жодних змін."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Вибер. службу голос. пошти"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Пошук мереж"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Помилка під час пошуку мереж."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Реєстрування у <xliff:g id="NETWORK">%s</xliff:g>…"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Ваша SIM-карта не дозволяє підключення до цієї мережі."</string>
-    <string name="connect_later" msgid="500090982903469816">"Неможливо наразі підключитися до цієї мережі. Спробуйте пізніше."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Ваша SIM-карта не дозволяє під’єднання до цієї мережі."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Зараз неможливо під’єднатися до цієї мережі. Повторіть спробу пізніше."</string>
     <string name="registration_done" msgid="495135664535876612">"Зареєстровано у мережі"</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Виберіть оператора мережі"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Вибрати оператора мережі"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Пошук усіх доступних мереж"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Вибирати автоматично"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Автоматично вибирати основну мережу"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Автоматична реєстрація..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Вибирати автоматично"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Автоматично вибирати основну мережу"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Автоматична реєстрація..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Режим мережі"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Змінити режим роботи мережі"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Рекоменд. режим мережі"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Рекомендований режим мереж: лише EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Рекомендований режим мереж: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Лише EvDo"</item>
     <item msgid="454610224530856274">"CDMA без EvDo"</item>
-    <item msgid="8928247118825616081">"Авто CDMA / EvDo"</item>
-    <item msgid="8595462903294812666">"Авто GSM / WCDMA"</item>
+    <item msgid="648505122852496166">"Авто CDMA/EvDo"</item>
+    <item msgid="7148247646407324800">"Авто GSM/WCDMA"</item>
     <item msgid="5189164180446264504">"Лише WCDMA"</item>
     <item msgid="5714714953966979187">"Лише GSM"</item>
-    <item msgid="4775796025725908913">"Рекоменд. GSM / WCDMA"</item>
+    <item msgid="8508331239546115206">"Бажано GSM/WCDMA"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Дані увімкнено"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Роумінг даних"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Підключ. до служб даних під час роумінгу"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Підключ. до служб даних під час роумінгу"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Доступ до даних утрачено, оскільки ви залишили домашню мережу з вимкненим роумінгом даних."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Доступ до даних утрачено, оскільки ви вийшли з домашньої мережі з вимкненим роумінгом даних."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Дозвол. роумінг даних? З вас можуть стягн. значну плату за нього!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Параметри GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Параметри CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Викор. даних"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Політика даних оператора"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Дані, вик. під час поточ. пер."</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Період викор. даних"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Пол. шв. перед. дан."</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ з циклу здійсн."\n"Наст. період почин. через <xliff:g id="USED_1">%2$d</xliff:g> дн. (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Шв. перед. скор. до <xliff:g id="USED">%1$d</xliff:g> КБ/сек, якщо перев. ліміт викор. даних"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Докладніше про політику викор. даних мобільної мережі вашого оператора"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"Ф-ц. Cell Broadcast SMS"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"Ф-ц. Cell Broadcast SMS"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"Ф-ц. Cell Broadcast SMS"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Ф-ц/ Cell Broadcast SMS увімк."</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Корейська"</item>
     <item msgid="1933212028684529632">"Китайська"</item>
     <item msgid="1908428006803639064">"Іврит"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Мови"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Місцева погода"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Кар\'єрні можливості"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Кар\'єрні можливості увімкнено"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Кар\'єрні можливості вимкнено"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Медицина, здоров\'я та лікарні"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Медицина, здоров\'я та лікарні -увімк."</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Медицина, здоров\'я та лікарні - вимк."</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Медицина, здоров’я та лікарні"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Медицина, здоров’я та лікарні – увімкнено"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Медицина, здоров’я та лікарні – вимкнено"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Новини технології"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Новини техніки увімкнено"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Новини технологій"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"Лише WCDMA"</item>
     <item msgid="8776934131146642662">"Лише GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (рекоменд. WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Викор. лише мережі 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Економ. батарею"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Вибір системи"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Змінити режим CDMA-роумінгу"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Змінити режим CDMA-роумінгу"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Вибір системи"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Лише Головна"</item>
     <item msgid="1205664026446156265">"Автоматично"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Режим CDMA-роумінгу"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Змінити режим CDMA-роумінгу"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Режим CDMA-роумінгу"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Лише домашні мережі"</item>
-    <item msgid="8174642753290624634">"Пов\'язані мережі"</item>
-    <item msgid="2241951431403168661">"Будь-яка мережа"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Підписка CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Мережеві параметри CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Ще не впроваджено!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Мережеві параметри CDMA"</string>
@@ -359,21 +307,11 @@
     <item msgid="6143696847467859795">"Лише CDMA"</item>
     <item msgid="2683555124647197574">"Лише EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Підписка CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Змінити RUIM/SIM-карту на NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"підписка"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Активувати пристрій"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Налашт. службу пересил. даних"</string>
@@ -390,18 +328,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Керув. номерами фікс. набору"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Змінити PIN-код для доступу FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Керув. списком номерів тел."</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Конфіденц. Voice"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Конфіденційність Voice"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Увімкн. режим розшир. конфіденц."</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Режим TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Увімк. режим TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Режим TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Устан. режим TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Автоповтор"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Увімк. режим автоповтору"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Автоповтор"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Увімкнути режим автоповтору"</string>
     <string name="menu_add" msgid="1882023737425114762">"Додати контакт"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Змінити контакт"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Видалити контакт"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Введіть PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Введіть PIN2-код"</string>
     <string name="name" msgid="7329028332786872378">"Ім\'я"</string>
     <string name="number" msgid="7905950798349903858">"Номер"</string>
     <string name="save" msgid="4094274636321939086">"Зберег."</string>
@@ -414,56 +350,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Видалити номер фікс. набору"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Видалення номеру фікс. набору…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Номер фікс. набору видалено."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN не оновлено: введено неправильний PIN-код."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN не оновлено: к-ість не може перевищ. 20 цифр."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"Фіксований номер (FDN) не оновлено, оскільки введено неправильний PIN-код."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"Фіксований номер (FDN) не оновлено, оскільки кількість цифр не може перевищувати 20."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"Фіксований номер (FDN) не оновлено. PIN2-код неправильний або номер телефону відхилено."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Читання з SIM-карти…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"У SIM-карті немає контактів."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Виберіть контакти для імпорту"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Щоб імпортувати контакти із SIM-карти, вимкніть режим польоту."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Щоб імпортувати контакти із SIM-карти, спершу вимкніть режим польоту."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Увімк./вимк. PIN-код SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Змін. PIN-код SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"PIN-код SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Старий PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Новий PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Підтверд. новий PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"Введений попередній PIN-код неправильний. Спробуйте ще."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Введені PIN-коди не збігаються. Спробуйте ще."</string>
+    <string name="badPin" msgid="8955102849303984935">"Введений попередній PIN-код не правильний. Повторіть спробу."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"Введені PIN-коди не збігаються. Повторіть спробу."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Введіть PIN-код з цифр від 4 до 8."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Вимк. PIN-код SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Вимк. PIN-код SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Зачекайте…"</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"PIN-код SIM увімк."</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"PIN-код SIM вимкнено"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Введений PIN-код неправильний"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"PIN-код SIM-карти змінено"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"PIN-код SIM-карти ввімкнено."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"PIN-код SIM-карти вимкнено."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Введений PIN-код не правильний."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"PIN-код SIM-карти змінено."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Пароль неправильний, SIM-картку заблок! Необх. PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Старий PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Новий PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Підтверд. новий PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Введений PUK2 неправильний. Спробуйте ще."</string>
-    <string name="badPin2" msgid="515218795152422178">"Введений попередній PIN2 неправильний. Спробуйте ще."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Введені PIN2 не збігаються. Спробуйте ще."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Введений PUK2 не правильний. Повторіть спробу."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Введений попередній PIN2-код не правильний. Повторіть спробу."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Введені PIN2-коди не збігаються. Повторіть спробу."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Введіть PIN2-код з цифр від 4 до 8."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Введіть PUK2 з 8 чисел."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"PIN2 змінено"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"PIN2-код змінено."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Введіть PUK2-код"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Пароль неправильний, змініть PIN2 і спробуйте ще!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Пароль неправильний, SIM-картку заблок! Необх. PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Пароль не правильний. Змініть PIN2-код і повторіть спробу."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Пароль не правильний. SIM-карту заблоковано. Потрібен PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Готово"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Конференц-виклик <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Назад до дзвінка"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Продовжити без SIM-карти"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Не знайдено SIM-карту. Вставте SIM-карту в телефон."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Відхилити"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Розблок."</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Автентифікація PIN…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Номер голос. пошти"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Набір"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Повт. підкл."</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Конференц-виклик"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Вхідний дзвінок"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Очікув. виклику Cdma"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Виклик заверш."</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Очікує"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Класти слухавку"</string>
@@ -473,7 +403,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Пропущ. дзвінки"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"Пропущ. дзвінк: <xliff:g id="NUM_MISSED_CALLS">%s</xliff:g>"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Пропущ. виклик від <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Поточний виклик (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Поточний виклик"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Очікує"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Вхідний дзвінок"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Нова голос. пошта"</string>
@@ -482,13 +412,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Невідомий номер голос. пошти"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Нема служби"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Вибрана мережа (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) недоступна"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Завершити виклик"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Передзвонити"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Повідомлення"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Щоб установ. з\'єднання, споч. вимк. режим польоту."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Не зареєстровано в мережі."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Мобільна мережа недоступна."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Виклик не надіслано, не збережено дійсний номер."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Виклик не надісл."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Запуск ряду MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Запуск послідовності коду ф-ції..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Непідтримувана служба"</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Неможл. переключ. виклики."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Неможл. розділити дзвінок."</string>
@@ -500,18 +432,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Аварійний виклик"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Увімкнення радіо…"</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Поза межами дії служби, повтор..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Виклик не надісл., <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не є ном. екстренних служб!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Виклик не надіслано, наберіть аварійний номер!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Виклик не надіслано. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> не є екстреним номером!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Виклик не надіслано. Наберіть екстрений номер!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Викор. клав. для набору"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Нат. звук. цифр. клав."</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Утрим."</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Не утрим."</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Закінч."</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Цифр. клав."</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Сховати"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Промовець"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Вимк. зв."</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Дод. виклик"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Об’єдн. дзвінки"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Поміняти"</string>
@@ -530,36 +457,31 @@
     <item msgid="1937509904407445684">"HCO TTY"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Текст ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Сигнали DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Сигнали DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Установити довжину сигналів DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Звичайний"</item>
     <item msgid="2883365539347850535">"Довгий"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Повідомлення мережі"</string>
+    <string name="network_message" msgid="4483886461245213802">"Повідомлення мережі"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Активуйте свій телефон"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Щоб активувати службу вашого тел., треба зробити спеціальний дзвінок. "\n\n"Натиснувши \"Активувати\", прослухайте інструкції, надані для активації телефону."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Натисн. &amp;quot;Активувати&amp;quot;, щоб поміст. спец. виклик, який активує телефон у мобіл. мережі вашого оператора, щоб ви могли розміщ. виклики і підключ. до даних моб. мереж."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Пропуст. активацію?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Якщо ви пропустите активацію, то не зможете розміщ. виклик чи підключ. до даних моб. мереж (хоча можете підключ. до мереж Wi-Fi). Вас проситимуть активувати тел. щоразу, коли ви його вмикаєте, поки це не викон."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Пропуст."</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Активувати"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Активувати"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Телефон активовано!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Телефон активовано."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Проблема з активацією"</string>
     <string name="ota_listen" msgid="162923839877584937">"Виконайте голосові інструкції доки не почуєте, що активацію не буде завершено."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Цифр. клав."</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Промовець"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Зачекайте, поки ваш телефон буде запрограмовано."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Помилка програмування"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Зачекайте, поки ваш телефон програмується."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Помилка програмування"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Телефон тепер активовано. Для запуску сервісу може знадобитися до 15 хвилин."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Ваш телефон не активовано. "\n"Можливо, треба знайти місц. з кращим покриттям (коло вікна чи надворі). "\n\n"Спробуйте ще або подзвон. до служби обслуг. для ін. варіантів."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Ваш телефон не активовано. "\n"Можливо, потрібно знайти місце з кращим покриттям (біля вікна чи надворі). "\n\n"Повторіть спробу чи подзвоніть у службу обслуговування, щоб дізнатися про інші варіанти."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"ПОМИЛКИ НАДЛИШКУ SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Назад"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Повтор."</string>
     <string name="ota_next" msgid="3904945374358235910">"Далі"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Назад"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Увійд. в реж. авар. зворот. виклику"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Реж. авар. зворот. виклику"</string>
@@ -569,87 +491,69 @@
     <item quantity="other" msgid="3122217344579273583">"Немає передав. даних протягом <xliff:g id="COUNT">%s</xliff:g> хв."</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Телефон буде у режимі аварійного повтор. виклику протягом <xliff:g id="COUNT">%s</xliff:g> хв. Під час цього неможл. корист. жодною програмою, яка використовує передавання даних. Вийти зараз?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Телефон буде у режимі аварійного повтору виклику протягом <xliff:g id="COUNT">%s</xliff:g> хв. Під час цього неможл. корист. жодною програмою, яка використовує передавання даних. Вийти зараз?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Телефон буде в режимі екстреного зворотного виклику <xliff:g id="COUNT">%s</xliff:g> хв. У цьому режимі неможливо користуватися програмами, які використовують передавання даних. Вийти зараз?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Телефон буде в режимі екстреного зворотного виклику <xliff:g id="COUNT">%s</xliff:g> хв. У цьому режимі неможливо користуватися програмами, які використовують передавання даних. Вийти зараз?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Вибрана дія недоступна в режимі аварійного зворотного виклику. Телефон буде у цьому реж. протягом <xliff:g id="COUNT">%s</xliff:g> хв. Вийти зараз?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Вибрана дія недоступна в режимі аварійного зворотного виклику. Телефон буде у цьому реж. протягом <xliff:g id="COUNT">%s</xliff:g> хв. Вийти зараз?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Вибрана дія не доступна в режимі екстреного зворотного виклику. Телефон буде в цьому режимі <xliff:g id="COUNT">%s</xliff:g> хв. Вийти зараз?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Вибрана дія не доступна в режимі екстреного зворотного виклику. Телефон буде у цьому режимі <xliff:g id="COUNT">%s</xliff:g> хв. Вийти зараз?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Вибрана дія недоступна під час аварійного виклику"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Вихід з режиму авар. зворот. виклику"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Вибрана дія не доступна під час екстреного виклику."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Вихід із режиму екстреного зворотного виклику"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Так"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Ні"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Відхилити"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Налашт-ня голос. пошти"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;не установ.&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Служба голос. пошти"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Налашт-ння для <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Служба"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Налаштування"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Не встановлено&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Інші налашт-ння виклику"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Набрати"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Дзвон. за доп. ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Перетяг. впр., щоб відп."</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Перетяг. вліво, щоб вимк. дзвін."</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Пертягн. вліво, щоб відх."</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Перетяг. впр, щоб відп., і"\n"утрим. акт. дзвін."</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Перетяг. впр., щоб відп., і"\n"зак. акт. дзвін."</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Перетяг. впр, щоб відп., і"\n"зак. дзвін, що очік."</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Відповісти"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Відхилити"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Виклик здійснюється за допомогою <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"фото контакта"</string>
     <string name="goPrivate" msgid="865837794424530980">"конфіденц."</string>
     <string name="selectContact" msgid="781975788478987237">"вибрати контакт"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Налаштування Інтернет-дзвінків"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Облікові записи для Інтернет-дзвінків (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Облікові записи"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Керувати обліковими записами та станами Інтернет-дзвінків (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Отримувати вхідні дзвінки"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Скорочує час роботи батареї"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Налаштувати параметри дзвінка"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Використовувати Інтернет-дзвінки"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Використовувати Інтернет-дзвінки (лише Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Для всіх дзвінків, коли доступна мережа передавання даних"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Лише для Інтернет-дзвінків"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Запитувати для кожного дзвінка"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Для всіх дзвінк."</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Автоматична реєстрація"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Вихідний дзвінок через SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Здійснити дзвінок"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Використовувати обліковий запис для Інтернет-дзвінків:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Завжди використовувати для здійснення Інтернет-дзвінків"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"У налаштуваннях дзвінків можна змінити обліковий запис, який буде використовуватися за умовчанням під час здійснення дзвінків. Для цього треба вибрати інший обліковий запис у налаштуваннях Інтернет-дзвінків"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Обліковий запис для інтернет-викликів можна змінити на екрані Телефон &gt; Налаштування &gt; Налаштування інтернет-викликів &gt; Облікові записи, щоб використовувати його за умовчанням."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Дзвінок з мобільного телефону"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Інтернет-дзвінок"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Немає облікового запису для Інтернет-дзвінків"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"У цьому телефоні немає облікових записів для Інтернет-дзвінків. Додати зараз?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"У цьому телефоні немає облікових записів для інтернет-викликів. Додати зараз?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Додати"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Додати обліковий запис"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Видалити обліковий запис"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Облікові записи SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Збереження облікового запису..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Видалення облікового запису..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Збереження облікового запису..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Видалення облікового запису..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Зберегти"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Відхилити"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Закрити профіль"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Закрити"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Основний"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Зробити моїм основним обліковим записом"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Використовується для вихідних дзвінків"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Розширені налаштування"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Основний обліковий запис. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Перевірка стану..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Реєстрація..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Повторна спроба..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Не отримує дзвінки"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Реєстрацію облікового запису зупинено, оскільки відсутнє з\'єднання з Інтернетом"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Реєстрацію облікового запису зупинено, оскільки відсутнє з\'єднання Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Обліковий запис не зареєстровано"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Отримання дзвінків"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Реєстрація..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Повторна спроба..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Виклики не отримуються."</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Реєстрацію облікового запису зупинено, оскільки відсутнє з’єднання з Інтернетом."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Реєстрацію облікового запису зупинено, оскільки відсутнє з’єднання з мережею Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Обліковий запис не зареєстровано."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Виклики отримуються."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Обліковий запис не зареєстровано: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>). Спробуємо пізніше"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Обліковий запис не зареєстровано: неправильне ім’я користувача чи пароль"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Обліковий запис не зареєстровано: перевірте ім’я сервера"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Наразі цей обліковий запис використовується програмою <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Обліковий запис не зареєстровано: неправильне ім’я користувача чи пароль."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Обліковий запис не зареєстровано: перевірте ім’я сервера."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Зараз цей обліковий запис використовується програмою <xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Деталі облікового запису SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Деталі облікового запису SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Сервер"</string>
@@ -660,9 +564,6 @@
     <string name="port_title" msgid="5952939408078626657">"Номер порту"</string>
     <string name="transport_title" msgid="8253139511847746640">"Тип транспортування"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Надсилання для підтримки з\'єднання"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Надсилати повідомлення SIP для підтримки з\'єднання"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Автоматична реєстрація"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Автоматично реєструвати профіль"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Установити як основний обліковий запис"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Використовується для вихідних дзвінків"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Додаткові налаштування"</string>
@@ -673,12 +574,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Додатково&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Торкніться, щоб показати всі"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Торкніться, щоб сховати всі"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"Поле <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> обов\'язкове, воно не може бути порожнім"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Номер порту має бути між 1000 і 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"Поле <xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> обов’язкове, воно не може бути порожнім."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Номер порту має бути між 1000 і 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Відсутнє з\'єднання з Інтернетом"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Відсутнє з\'єднання Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Щоб здійснити Інтернет-дзвінок, спершу перевірте своє з\'єднання з Інтернетом"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Для здійснення Інтернет-дзвінків потрібне з\'єднання з мережею Wi-Fi (використовуйте налаштування бездротового зв\'язку &amp; мережі)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Щоб здійснити інтернет-виклик, спершу перевірте своє з’єднання з Інтернетом."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Для здійснення інтернет-викликів потрібне з’єднання з мережею Wi-Fi (скористайтеся налаштуваннями Бездротовий зв’язок і мережі)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Інтернет-дзвінки не підтримуються"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Автоматично"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Завжди надсилати"</string>
@@ -687,7 +588,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Я зараз передзвоню."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Я передзвоню пізніше."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Не можу говорити. Передзвоніть."</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Персоналізоване повідомлення..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Спеціальне повідомлення"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Швидкі відповіді"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Редагувати швидкі відповіді"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +606,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"зірочка"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"нуль"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"решітка"</string>
-    <string name="description_search_button" msgid="239929880630534731">"пошук"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"дзвонити"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Гучний зв’язок увімкнено."</string>
@@ -715,9 +615,22 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Відхилити"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Вібросигнал"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Вібросигнал"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Сигнал дзвінка"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Завжди"</item>
-    <item msgid="1595097872875714252">"Лише в беззвуч. реж."</item>
+    <item msgid="1595097872875714252">"Лише в беззвучному режимі"</item>
     <item msgid="1458182414036878616">"Ніколи"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Сигнал дзвінка телефону"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Вібрувати під час дзвінка"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Звук клавіш"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Мелодія"</string>
+    <string name="perm_change_mobile_network">Змінення режиму мережі (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Програма з цими правами може в будь-який момент змінити режим мережі. 3G швидше, але споживає більше енергії, а також може тарифікуватися дорожче.</string>
+    <string name="advanced_setting">Додаткові налаштування</string>
+    <string name="vibrate_outgoing">Вібросигнал відповіді</string>
+    <string name="vibrate_45">Вібросигнал кожні 45 секунд</string>
+    <string name="vibrate_45_sum">Вібрування кожні 45 секунд під час вихідного виклику</string>
+    <string name="vibrate_hangup">Вібросигнал роз\u2019єднання</string>
+    <string name="vibrate_call_waiting">Вібросигнал очікування виклику</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 9b71cf155..b21a6d083 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Số cá nhân"</string>
     <string name="payphone" msgid="1931775086311769314">"Điện thoại tự động"</string>
     <string name="onHold" msgid="9035493194749959955">"Đang chờ"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Cuộc gọi hiện tại"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Đường dây bận"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Mạng bận"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Không có phản hồi, đã hết thời gian chờ"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Máy chủ không thể truy cập được"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Số không thể truy cập được"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Tên người dùng hoặc mật khẩu không chính xác"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Được gọi từ ngoài mạng"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Được gọi từ ngoài mạng"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Lỗi máy chủ. Hãy thử lại sau."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Không có tín hiệu nào"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Đã vượt quá giới hạn ACM"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Tắt radio"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Không có SIM hoặc lỗi SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Không có SIM hoặc lỗi SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Ngoài vùng dịch vụ"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Cuộc gọi đi bị hạn chế bởi FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Bạn không thể thực hiện cuộc gọi đi khi đang bật chế độ chặn cuộc gọi."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Bạn không thể thực hiện cuộc gọi đi khi đang bật chế độ chặn cuộc gọi."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Tất cả cuộc gọi bị hạn chế bởi kiểm soát truy cập."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Cuộc gọi khẩn cấp bị hạn chế bằng kiểm soát truy cập."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Cuộc gọi thông thường bị hạn chế bởi kiểm soát truy cập."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA: Điện thoại bị khóa cho tới khi bật nguồn."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA: Cuộc gọi bị gián đoạn."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA: Cuộc gọi bị chặn."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA: sắp xếp lại."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA: Từ chối Tùy chọn Dịch vụ."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA: thử sắp xếp lại."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA: Truy cập không thành công."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA: Bị chặn trước."</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Chỉ có thể thực hiện cuộc gọi Khẩn cấp."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Số không hợp lệ"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Số không hợp lệ"</string>
     <string name="confCall" msgid="1904840547188336828">"Cuộc gọi hội nghị"</string>
     <string name="call_lost" msgid="317670617901479594">"Cuộc gọi đã bị mất."</string>
-    <string name="retry" msgid="8462986804300767852">"Thử lại"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Cuộc gọi bị Mất"</string>
     <string name="ok" msgid="3811371167865772377">"OK"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Đã bắt đầu mã MMI"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Mã USSD đang chạy…"</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"Tai nghe có dây"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Gửi các âm sau?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Đang gửi Âm"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Đang gửi âm"\n</string>
     <string name="send_button" msgid="4106860097497818751">"Gửi"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Có"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Không"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Thay thế ký tự tự do với"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Thay thế ký tự tự do bằng"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Thiếu số thư thoại"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Không có số thư thoại nào được lưu trữ trên thẻ SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Thêm số điện thoại"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Đang tải…"</string>
-    <string name="enterPin" msgid="4753300834213388397">"Nhập mã PIN để mở khóa thẻ SIM."</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"Đã mở khóa SIM"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Mã PIN mới của SIM"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Nhập lại mã PIN mới của SIM để xác nhận"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Mã PIN của SIM bạn đã nhập không khớp. Vui lòng thử lại."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Nhập mã PUK để mở khóa thẻ SIM."</string>
-    <string name="badPuk" msgid="3213017898690275965">"Mã PUK không chính xác!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Tiếp tục"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Thẻ SIM của bạn đã được bỏ chặn. Điện thoại của bạn đang mở khóa…"</string>
     <string name="label_ndp" msgid="780479633159517250">"Mã PIM mở khóa mạng SIM"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Mở khóa"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Đang yêu cầu mở khóa mạng..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Yêu cầu mở khóa mạng không thành công."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Mở khóa mạng thành công."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Cài đặt cuộc gọi GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Cài đặt cuộc gọi CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Tên Điểm Truy cập"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Cài đặt cuộc gọi chỉ CDMA bổ sung"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Cài đặt dịch vụ mạng"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"Số gọi đến"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Đang tải cài đặt…"</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Số bị ẩn trong cuộc gọi đi"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Số được hiển thị trong cuộc gọi đi"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Sử dụng cài đặt mặc định của nhà cung cấp dịch vụ để hiển thị số của tôi trong cuộc gọi đi"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Số khi bận"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Chuyển tiếp tới <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Đã tắt"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Nhà cung cấp dịch vụ của bạn không hỗ trợ vô hiệu hóa chuyển tiếp cuộc gọi khi điện thoại của bạn bận."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Nhà cung cấp dịch vụ của bạn không hỗ trợ vô hiệu hóa chuyển tiếp cuộc gọi khi điện thoại của bạn bận."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Chuyển tiếp khi không trả lời"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Số khi không được trả lời"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Chuyển tiếp tới <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Đã tắt"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Nhà cung cấp dịch vụ của bạn không hỗ trợ vô hiệu hóa chuyển tiếp cuộc gọi khi điện thoại của bạn không trả lời."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Nhà cung cấp dịch vụ của bạn không hỗ trợ vô hiệu hóa chuyển tiếp cuộc gọi khi điện thoại của bạn không trả lời."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Chuyển tiếp khi không thể kết nối"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Số khi không thể truy cập được"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Chuyển tiếp tới <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Đã tắt"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Nhà cung cấp dịch vụ của bạn không hỗ trợ vô hiệu hóa chuyển tiếp cuộc gọi khi điện thoại của bạn không thể truy cập được."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Nhà cung cấp dịch vụ của bạn không hỗ trợ vô hiệu hóa chuyển tiếp cuộc gọi khi điện thoại của bạn không thể truy cập được."</string>
     <string name="updating_title" msgid="6146755386174019046">"Cài đặt cuộc gọi"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Lỗi cài đặt cuộc gọi"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Đang đọc cài đặt…"</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Đang hoàn nguyên cài đặt…"</string>
     <string name="response_error" msgid="6674110501330139405">"Phản hồi không mong muốn từ mạng."</string>
     <string name="exception_error" msgid="7027667130619518211">"Lỗi mạng hoặc thẻ SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Thao tác chỉ được phép đối với các số quay số định sẵn."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Vui lòng bật radio trước khi xem những cài đặt này."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Cài đặt Số quay định sẵn trên ứng dụng điện thoại được bật. Do đó, một số tính năng có liên quan đến cuộc gọi không hoạt động."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Hãy bật radio trước khi xem những cài đặt này."</string>
     <string name="close_dialog" msgid="2365884406356986917">"OK"</string>
     <string name="enable" msgid="1059008390636773574">"Bật"</string>
     <string name="disable" msgid="7274240979164762320">"Vô hiệu hóa"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Ẩn số"</item>
     <item msgid="1108394741608734023">"Hiển thị số"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Lưu số thư thoại"</string>
     <string name="vm_changed" msgid="380744030726254139">"Số thư thoại đã thay đổi."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Thay đổi số thư thoại không thành công."\n"Hãy liên hệ với nhà cung cấp dịch vụ của bạn nếu sự cố vẫn tiếp diễn."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Thay đổi số chuyển tiếp không thành công."\n"Hãy liên hệ với nhà cung cấp dịch vụ của bạn nếu sự cố này vẫn tiếp diễn."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Không thể thay đổi số thư thoại."\n"Liên hệ với nhà cung cấp dịch vụ nếu sự cỗ này vẫn tiếp diễn."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Không thể thay đổi số chuyển hướng."\n"Liên hệ với nhà cung cấp dịch vụ của bạn nếu sự cố này vẫn tiếp diễn."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Không thể truy xuất và lưu cài đặt số chuyển tiếp hiện tại."\n"Bạn vẫn muốn chuyển sang nhà cung cấp mới?"</string>
     <string name="no_change" msgid="3186040086622435212">"Không thay đổi nào được thực hiện."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Chọn dịch vụ thư thoại"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Tìm kiếm trong mạng"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Lỗi khi tìm kiếm mạng."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Đang đăng ký trên <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Thẻ SIM của bạn không cho phép kết nối với mạng này."</string>
-    <string name="connect_later" msgid="500090982903469816">"Không thể kết nối với mạng này vào lúc này. Vui lòng thử lại sau."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Thẻ SIM của bạn không cho phép kết nối với mạng này."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Không thể kết nối với mạng này ngay bây giờ. Hãy thử lại sau."</string>
     <string name="registration_done" msgid="495135664535876612">"Đã đăng ký trên mạng."</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Chọn nhà cung cấp dịch vụ mạng"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Chọn nhà cung cấp dịch vụ mạng"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Tìm kiếm tất cả mạng khả dụng"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Chọn tự động"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Tự động chọn mạng ưu thích"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Đăng ký tự động..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Tự động chọn"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Tự động chọn mạng ưa thích"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Đăng ký tự động..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Chế độ Mạng"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Thay đổi chế độ hoạt động của mạng"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Chế độ mạng được ưu thích"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Chế độ mạng được ưa thích: chỉ EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Chế độ mạng được ưa thích: LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"Chỉ EvDo"</item>
     <item msgid="454610224530856274">"CDMA không có EvDo"</item>
-    <item msgid="8928247118825616081">"CDMA / EvDo tự động"</item>
-    <item msgid="8595462903294812666">"GSM / WCDMA tự động"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo tự động"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA tự động"</item>
     <item msgid="5189164180446264504">"Chỉ WCDMA"</item>
     <item msgid="5714714953966979187">"Chỉ GSM"</item>
-    <item msgid="4775796025725908913">"GSM / WCDMA được ưu thích"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA được ưa thích"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Đã bật dữ liệu"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Chuyển vùng dữ liệu"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Kết nối với dịch vụ dữ liệu khi chuyển vùng"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Kết nối với dịch vụ dữ liệu khi chuyển vùng"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Bạn đã mất kết nối dữ liệu vì bạn đã tắt chuyển vùng dữ liệu của mạng gia đình của mình."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Bạn đã mất kết nối dữ liệu vì bạn đã tắt chuyển vùng dữ liệu của mạng gia đình của mình."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Cho phép chuyển vùng dữ liệu? Bạn có thể phải chịu phí chuyển vùng đáng kể!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Tùy chọn GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Tùy chọn CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Sử dụng dữ liệu"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Chính sách dữ liệu của nhà cung cấp dịch vụ"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Dữ liệu được sử dụng trong thời gian hiện tại"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Thời gian sử dụng dữ liệu"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Chính sách tốc độ dữ liệu"</string>
@@ -226,7 +202,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"<xliff:g id="USED_0">%1$d</xliff:g>٪ của chu kỳ đã qua"\n"Thời gian tiếp theo sẽ bắt đầu trong <xliff:g id="USED_1">%2$d</xliff:g> ngày (<xliff:g id="USED_2">%3$s</xliff:g>)"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Tốc độ dữ liệu bị giảm xuống <xliff:g id="USED">%1$d</xliff:g> Kb/s nếu vượt quá giới hạn sử dụng dữ liệu"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Thêm thông tin về chính sách sử dụng dữ liệu mạng dành cho điện thoại di động của nhà cung cấp dịch vụ của bạn"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"SMS Phát trên Di động"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"SMS Phát trên Di động"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"SMS Phát trên Di động"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"Đã bật SMS Phát trên Di động"</string>
@@ -267,15 +242,6 @@
     <item msgid="1858401628368130638">"Tiếng Hàn"</item>
     <item msgid="1933212028684529632">"Tiếng Trung"</item>
     <item msgid="1908428006803639064">"Tiếng Do Thái"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Ngôn ngữ"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Thời tiết Địa phương"</string>
@@ -305,9 +271,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Cơ hội Nghề nghiệp"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Đã bật Cơ hội Nghề nghiệp"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Đã tắt Cơ hội nghề nghiệp"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Y tế, Sức khoẻ và Bệnh viện"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Đã bật Y tế, Sức khoẻ và Bệnh viện"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Đã vô hiệu hóa Y tế, Sức khoẻ và Bệnh viện"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Y tế, Sức khoẻ và Bệnh viện"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Đã bật Y tế, Sức khoẻ và Bệnh viện"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Đã tắt Y tế, Sức khoẻ và Bệnh viện"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Tin tức Công nghệ"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Đã bật Tin tức Công nghệ"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Đã tắt Tin tức công nghệ"</string>
@@ -322,35 +288,17 @@
     <item msgid="8912042051809329533">"Chỉ WCDMA"</item>
     <item msgid="8776934131146642662">"Chỉ GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA (WCDMA được ưu thích)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Chỉ sử dụng mạng 2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Tiết kiệm pin"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Chọn hệ thống"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Thay đổi chế độ chuyển vùng cdma"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Thay đổi chế độ chuyển vùng CDMA"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Chọn hệ thống"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Chỉ nhà riêng"</item>
     <item msgid="1205664026446156265">"Tự động"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Chế độ Chuyển vùng CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Thay đổi chế độ chuyển vùng cdma"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Chế độ chuyển vùng CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Chỉ Mạng gia đình"</item>
-    <item msgid="8174642753290624634">"Mạng Liên kết"</item>
-    <item msgid="2241951431403168661">"Bất kỳ Mạng nào"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Đăng ký CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Tùy chọn Mạng CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Chưa triển khai!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Tùy chọn mạng CDMA"</string>
@@ -364,16 +312,11 @@
     <item msgid="5741268642513143762">"1"</item>
     <item msgid="419525200910932450">"2"</item>
   </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Đăng ký CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Thay đổi giữa RUIM/SIM và NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"đăng ký"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Kích hoạt thiết bị"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Thiết lập dịch vụ dữ liệu"</string>
@@ -390,18 +333,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Quản lý Số Quay định sẵn"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Thay đổi mã PIN để truy cập FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Quản lý danh sách số điện thoại"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Bảo mật của Voice"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Bảo mật của Voice"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Bật chế độ bảo mật tăng cường"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Chế độ TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Bật chế độ TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Chế độ TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Đặt chế độ TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Tự động Thử lại"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Bật chế độ Tự động Thử lại"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Tự động thử lại"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Bật chế độ Tự động thử lại"</string>
     <string name="menu_add" msgid="1882023737425114762">"Thêm liên hệ"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Chỉnh sửa liên hệ"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Xóa liên hệ"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Nhập mã PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Nhập PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Tên"</string>
     <string name="number" msgid="7905950798349903858">"Số"</string>
     <string name="save" msgid="4094274636321939086">"Lưu"</string>
@@ -414,56 +355,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Xóa số quay định sẵn"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Đang xóa số quay định sẵn…"</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Đã thêm số quay định sẵn."</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN chưa được cập nhật: bạn đã nhập mã PIN không chính xác."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN chưa được cập nhật: số không được vượt quá 20 chữ số."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"FDN không được cập nhật do bạn đã nhập PIN không chính xác."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"FDN chưa được cập nhật do số đã vượt quá 20 chữ số."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN không được cập nhật. Mã PIN2 không đúng hoặc số điện thoại đã bị từ chối."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Đang đọc từ thẻ SIM…"</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Không có danh bạ trên thẻ SIM của bạn."</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Chọn danh bạ để nhập"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Để nhập địa chỉ liên hệ từ thẻ SIM, vui lòng tắt chế độ trên Máy bay."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Để nhập danh bạ từ thẻ SIM, trước tiên hãy tắt Chế độ trên máy bay."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Bật/vô hiệu hóa mã PIN của SIM"</string>
     <string name="change_pin" msgid="9174186126330785343">"Thay đổi mã PIN của SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"Mã PIN của SIM:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"Mã PIN cũ"</string>
     <string name="newPinLabel" msgid="207488227285336897">"Mã PIN Mới"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Xác nhận mã PIN mới"</string>
-    <string name="badPin" msgid="4154316827946559447">"Mã PIN cũ bạn đã nhập không chính xác. Vui lòng thử lại."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Mã PIN bạn đã nhập không khớp. Vui lòng thử lại."</string>
+    <string name="badPin" msgid="8955102849303984935">"Mã PIN cũ bạn đã nhập không chính xác. Hãy thử lại."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"PIN bạn đã nhập không khớp. Hãy thử lại."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Nhập mã PIN có từ 4 đến 8 số."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Vô hiệu hóa mã PIN của SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Bật mã PIM của SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Vui lòng đợi..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"Đã bật mã PIN của SIM"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"Đã vô hiệu hóa mã PIN của SIM"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"Mã PIN bạn đã nhập không chính xác"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"Mã PIN của SIM đã được thay đổi thành công"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"Đã bật mã PIN của SIM."</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"Đã tắt mã PIN của SIM."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"Mã PIN bạn đã nhập không chính xác."</string>
+    <string name="pin_changed" msgid="4365538014588501049">"Mã PIN của SIM đã được thay đổi thành công."</string>
     <string name="puk_requested" msgid="3898394204193202803">"Mật khẩu không chính xác, SIM bị khóa! PUK2 được yêu cầu."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"Mã PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"Mã PIN2 cũ"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"Mã PIN2 Mới"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Xác nhận mã PIN2 mới"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"Mã PUK2 bạn đã nhập không chính xác. Vui lòng thử lại."</string>
-    <string name="badPin2" msgid="515218795152422178">"Mã PIN2 cũ bạn đã nhập không chính xác. Vui lòng thử lại."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Mã PIN2 bạn đã nhập không khớp. Vui lòng thử lại."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"Mã PUK2 bạn đã nhập không chính xác. Hãy thử lại."</string>
+    <string name="badPin2" msgid="1041576234483629991">"Mã PIN2 cũ bạn đã nhập không chính xác. Hãy thử lại."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"PIN2s bạn đã nhập không khớp. Hãy thử lại."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Nhập mã PIN2 có từ 4 đến 8 số."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Nhập mã PUK2 có 8 số."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"Mã PIN2 đã được thay đổi thành công"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"Mã PIN2 đã được thay đổi thành công."</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Nhập mã PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Mật khẩu không chính xác, vui lòng thay đổi mã PIN2 và thử lại!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Mật khẩu không chính xác, SIM bị khóa! PUK2 được yêu cầu."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Mật khẩu không chính xác. Hãy thay đổi mã PIN2 và thử lại."</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Mật khẩu không chính xác, SIM bị khóa. PUK2 được yêu cầu."</string>
     <string name="doneButton" msgid="2859593360997984240">"Xong"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Cuộc gọi hội nghị <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Quay lại cuộc gọi"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Tiếp tục mà không có thẻ SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Không tìm thấy thẻ SIM nào. Hãy lắp thẻ SIM vào điện thoại."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Loại bỏ"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Mở khóa"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Đang xác thực mã PIN…"</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Số thư thoại"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Đang quay số"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Đang thử lại"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Cuộc gọi hội nghị"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Cuộc gọi đến"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Chờ cuộc gọi cdma"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Cuộc gọi đã kết thúc"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Đang chờ"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Kết thúc cuộc gọi"</string>
@@ -473,7 +408,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Cuộc gọi nhỡ"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> cuộc gọi nhỡ"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Cuộc gọi nhỡ từ <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Cuộc gọi hiện tại (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Cuộc gọi đang thực hiện"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Đang chờ"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Cuộc gọi đến"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Thư thoại mới"</string>
@@ -482,13 +417,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Số thư thoại không xác định"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Không có dịch vụ nào"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Mạng được chọn (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) không khả dụng"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Kết thúc"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Gọi lại"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Tin nhắn"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Để thực hiện cuộc gọi, trước tiên, hãy tắt chế độ trên Máy bay."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Chưa được đăng ký trên mạng."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Mạng di động không khả dụng."</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Cuộc gọi không được gửi đi, bạn đã nhập số không hợp lệ."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Cuộc gọi không được gửi đi."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Khởi động chuỗi MMI…"</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Đang khởi động chuỗi mã tính năng…"</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Dịch vụ không được hỗ trợ."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Không thể chuyển đổi cuộc gọi."</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Không thể tách cuộc gọi."</string>
@@ -500,18 +437,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Cuộc gọi khẩn cấp"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Đang bật radio..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Ngoài vùng dịch vụ, đang thử lại..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Cuộc gọi không được gửi đi, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> không phải là số khẩn cấp!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Cuộc gọi không được gửi đi, hãy quay số số khẩn cấp!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Cuộc gọi không được gửi đi. <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> không phải là số khẩn cấp!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Cuộc gọi không được gửi đi. Hãy quay số số khẩn cấp!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Sử dụng bàn phím để quay số"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Bộ tạo xung từ bàn phím"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Giữ"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Bỏ giữ"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Kết thúc"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Bàn phím số"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Ẩn"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Loa"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Tắt tiếng"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Thêm cuộc gọi"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Hợp nhất cuộc gọi"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Hoán đổi"</string>
@@ -530,36 +462,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Văn bản ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Âm DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Âm DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Đặt độ dài âm DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Thường"</item>
     <item msgid="2883365539347850535">"Dài"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Thông báo của Mạng"</string>
+    <string name="network_message" msgid="4483886461245213802">"Thông báo của mạng"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Kích hoạt điện thoại của bạn"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"Bạn cần phải thực hiện cuộc gọi đặc biệt để kích hoạt dịch vụ điện thoại của mình. "\n\n"Sau khi nhấn “Kích hoạt”, nghe hướng dẫn được cung cấp để kích hoạt điện thoại của bạn."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Chạm vào “Kích hoạt” để thực hiện cuộc gọi đặc biệt sẽ kích hoạt điện thoại của bạn trên mạng di động của nhà cung cấp dịch vụ. Vì vậy, bạn có thể thực hiện cuộc gọi và kết nối với mạng dữ liệu dành cho điện thoại di động."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Bỏ qua kích hoạt?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Nếu bạn bỏ qua kích hoạt, bạn không thể thực hiện cuộc gọi hoặc kết nối với mạng dữ liệu dành cho điện thoại di động (mặc dù bạn có thể kết nối với mạng Wi-Fi). Cho tới khi bạn kích hoạt điện thoại của mình, bạn được yêu cầu kích hoạt điện thoại mỗi lần bạn bật điện thoại."</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Bỏ qua"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Kích hoạt"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Kích hoạt"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Điện thoại đã được kích hoạt!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Điện thoại đã được kích hoạt."</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Sự cố với kích hoạt"</string>
     <string name="ota_listen" msgid="162923839877584937">"Làm theo hướng dẫn bằng lời cho tới khi bạn nghe thấy kích hoạt đã hoàn tất."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Bàn phím"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Loa"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Vui lòng đợi trong khi điện thoại của bạn được lập trình."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Lập trình Không thành công"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Hãy đợi trong khi điện thoại của bạn được lập trình."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Lập trình không thành công"</string>
     <string name="ota_successful" msgid="1880780692887077407">"Điện thoại của bạn giờ đây đã được kích hoạt. Có thể mất tối đa 15 phút để dịch vụ bắt đầu."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Điện thoại của bạn chưa được kích hoạt. "\n"Bạn có thể phải tìm khu vực có phạm vi phủ sóng tốt hơn (gần cửa sổ hoặc bên ngoài). "\n\n"Hãy thử lại hoặc gọi cho dịch vụ khách hàng để có tùy chọn khác."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Điện thoại của bạn chưa được kích hoạt. "\n"Bạn có thể phải tìm một khu vực có phạm vi phủ sóng tốt hơn (gần cửa sổ hoặc bên ngoài). "\n\n"Hãy thử lại hoặc gọi cho dịch vụ khách hàng để có tùy chọn khác."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"LỖI SPC QUÁ MỨC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Quay lại"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Thử lại"</string>
     <string name="ota_next" msgid="3904945374358235910">"Tiếp theo"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Quay lại"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Đã vào Chế độ Gọi lại Khẩn cấp"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Chế độ Gọi lại Khẩn cấp"</string>
@@ -569,87 +496,69 @@
     <item quantity="other" msgid="3122217344579273583">"Không có kết nối dữ liệu trong <xliff:g id="COUNT">%s</xliff:g> phút"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Điện thoại sẽ ở chế độ gọi lại khẩn cấp trong <xliff:g id="COUNT">%s</xliff:g> phút. Khi ở chế độ này, bạn không thể sử dụng các ứng dụng sử dụng kết nối dữ liệu. Bạn có muốn thoát ngay bây giờ không?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Điện thoại sẽ ở chế độ gọi lại khẩn cấp trong <xliff:g id="COUNT">%s</xliff:g> phút. Khi ở chế độ này, bạn không thể sử dụng các ứng dụng sử dụng kết nối dữ liệu. Bạn có muốn thoát ngay bây giờ không?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Điện thoại sẽ ở chế độ Gọi lại khẩn cấp trong vòng <xliff:g id="COUNT">%s</xliff:g> phút. Không thể ứng dụng nào sử dụng kết nối dữ liệu trong khi ở trong chế độ này. Bạn có muốn thoát ngay bây giờ không?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Điện thoại sẽ ở chế độ Gọi lại khẩn cấp trong vòng <xliff:g id="COUNT">%s</xliff:g> phút. Không thể sử dụng ứng dụng nào sử dụng kết nối dữ liệu trong khi đang ở trong chế độ này. Bạn có muốn thoát ngay bây giờ không?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Tác vụ đã chọn không khả dụng khi ở chế độ gọi lại khẩn cấp. Điện thoại sẽ ở chế độ này trong <xliff:g id="COUNT">%s</xliff:g> phút. Bạn có muốn thoát ngay bây giờ không?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Tác vụ đã chọn không khả dụng khi ở chế độ gọi lại khẩn cấp. Điện thoại sẽ ở chế độ này trong <xliff:g id="COUNT">%s</xliff:g> phút. Bạn có muốn thoát ngay bây giờ không?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Tác vụ đã chọn không khả dụng trong khi ở chế độ Gọi lại khẩn cấp. Điện thoại sẽ ở chế độ này trong vòng <xliff:g id="COUNT">%s</xliff:g> phút. Bạn có muốn thoát ngay bây giờ không?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Tác vụ đã chọn không sẵn có trong khi ở chế độ Gọi lại khẩn cấp. Điện thoại sẽ ở chế độ này trong vòng <xliff:g id="COUNT">%s</xliff:g> phút. Bạn có muốn thoát ngay bây giờ không?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Tác vụ đã chọn không khả dụng trong khi thực hiện cuộc gọi khẩn cấp"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Thoát Chế độ Gọi lại Khẩn cấp"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Tác vụ đã chọn không khả dụng trong khi thực hiện cuộc gọi khẩn cấp."</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Thoát khỏi chế độ Gọi lại khẩn cấp"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Có"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Không"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Loại bỏ"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Cài đặt thư thoại"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;chưa được đặt&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Dịch vụ thư thoại"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Cài đặt cho <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Dịch vụ"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Thiết lập"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Chưa được đặt&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Cài đặt cuộc gọi khác"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Quay số"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Gọi điện qua ^1"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Kéo sang phải để trả lời"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Kéo sang trái để tắt chuông"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Kéo sang trái để từ chối"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Kéo sang phải để trả lời và"\n"giữ cuộc gọi hiện hoạt"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Kéo sang phải để trả lời và"\n"kết thúc cuộc gọi hiện hoạt"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Kéo sang phải để trả lời và"\n"kết thúc cuộc gọi đang chờ"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Trả lời"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Từ chối"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Gọi điện qua <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"ảnh liên hệ"</string>
     <string name="goPrivate" msgid="865837794424530980">"chuyển thành riêng tư"</string>
     <string name="selectContact" msgid="781975788478987237">"chọn địa chỉ liên hệ"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Cài đặt cuộc gọi qua Internet"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Tài khoản gọi qua Internet (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Tài khoản"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Quản lý tài khoản và trạng thái gọi qua Internet (SIP)"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Nhận cuộc gọi đến"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Giảm tuổi thọ pin"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Định cấu hình tùy chọn cuộc gọi"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Sử dụng tính năng gọi qua Internet"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Sử dụng tính năng gọi qua Internet (chỉ Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Dành cho tất cả các cuộc gọi khi mạng dữ liệu sẵn có"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Chỉ dành cho các cuộc gọi qua Internet"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Yêu cầu cho mỗi cuộc gọi"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Dành cho tất cả các cuộc gọi"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Tự động đăng ký"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Cuộc gọi đi qua SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Thực hiện cuộc gọi"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Sử dụng tài khoản gọi qua Internet:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Luôn sử dụng để thực hiện cuộc gọi qua Internet"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Bạn có thể sử dụng Cài đặt cuộc gọi để thay đổi tài khoản gọi qua Internet nào sử dụng theo mặc định khi thực hiện cuộc gọi, bằng cách chọn tài khoản khác trong cài đặt cuộc gọi qua Internet"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Bạn có thể thay đổi tài khoản gọi qua Internet nào sử dụng theo mặc định từ màn hình Điện thoại &gt; Cài đặt &gt; Cài đặt gọi qua Internet &gt; Tài khoản."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Cuộc gọi qua điện thoại di động"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Cuộc gọi qua internet"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Không có tài khoản gọi qua Internet nào"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Không có tài khoản gọi qua Internet nào trên điện thoại này. Thêm tài khoản ngay bây giờ?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Không có tài khoản gọi qua Internet nào trên điện thoại này. Bạn có muốn thêm một tài khoản gọi qua Internet ngay bây giờ không?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Thêm"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Thêm tài khoản"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Xóa tài khoản"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Tài khoản SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Đang lưu tài khoản..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Đang xóa tài khoản..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Đang lưu tài khoản..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Đang xóa tài khoản..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Lưu"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Hủy"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Đóng tiểu sử"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"OK"</string>
     <string name="close_profile" msgid="6886968271423155284">"Đóng"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Chính"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Đặt tài khoản này làm tài khoản chính của tôi"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Được sử dụng cho các cuộc gọi đi"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Cài đặt nâng cao"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"Tài khoản chính. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Đang kiểm tra trạng thái..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Đang đăng ký..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Vẫn đang thử..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Đang không nhận cuộc gọi"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Đăng ký tài khoản đã dừng do không có kết nối Internet"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Đăng ký tài khoản đã dừng do không có kết nối Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Đăng ký tài khoản không thành công"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Đang nhận cuộc gọi"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Đang đăng ký…"</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Vẫn đang thử..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Đang không nhận cuộc gọi"</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Đăng ký tài khoản đã dừng do không có kết nối Internet."</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Đăng ký tài khoản đã dừng do không có kết nối Wi-Fi."</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Đăng ký tài khoản không thành công."</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Đang nhận cuộc gọi."</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Đăng ký tài khoản không thành công: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); sẽ thử sau"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Đăng ký tài khoản không thành công: tên người dùng hoặc mật khẩu không đúng"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Đăng ký tài khoản không thành công: kiểm tra tên máy chủ"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Tài khoản này hiện đang được ứng dụng <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> sử dụng"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Đăng ký tài khoản không thành công: Tên người dùng hoặc mật khẩu không chính xác."</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Đăng ký tài khoản không thành công: Kiểm tra tên máy chủ."</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Tài khoản này hiện đang được ứng dụng <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> sử dụng."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Chi tiết tài khoản SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Chi tiết tài khoản SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Máy chủ"</string>
@@ -660,9 +569,6 @@
     <string name="port_title" msgid="5952939408078626657">"Số cổng"</string>
     <string name="transport_title" msgid="8253139511847746640">"Loại truyền tải"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Gửi giữ kết nối"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Gửi thông báo giữ kết nối SIP"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Tự động đăng ký"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Tự động đăng ký tiểu sử"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Đặt làm tài khoản chính"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Được sử dụng cho các cuộc gọi đi"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Cài đặt tùy chọn"</string>
@@ -673,12 +579,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Tùy chọn&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Chạm để hiển thị tất cả"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Chạm để ẩn tất cả"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> là bắt buộc, không thể để trống"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Số cổng phải trong khoảng từ 1000 đến 65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> là bắt buộc và không thể để trống."</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Số cổng phải trong khoảng từ 1000 đến 65534."</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Không có kết nối Internet"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Không có kết nối Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Để thực hiện cuộc gọi qua Internet, hãy kiểm tra kết nối của bạn trước tiên"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Bạn phải kết nối với mạng Wi-Fi để thực hiện các cuộc gọi qua Internet (sử dụng cài đặt Mạng &amp; Không dây)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Để thực hiện cuộc gọi qua Internet, hãy kiểm tra kết nối Internet của bạn trước tiên."</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Bạn cần kết nối với mạng Wi-Fi để thực hiện các cuộc gọi qua Internet (sử dụng cài đặt Mạng &amp; không dây)."</string>
     <string name="no_voip" msgid="8901474054537199865">"Không hỗ trợ gọi qua Internet"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Tự động"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Luôn luôn gửi"</string>
@@ -687,7 +593,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"Tôi sẽ gọi lại ngay."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Tôi sẽ gọi lại sau."</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Giờ tôi ko thể nói chuyện. Gọi sau nhé?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Tùy chỉnh thông báo..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Thông báo tùy chỉnh"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Trả lời nhanh"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Chỉnh sửa trả lời nhanh"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +611,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"dấu sao"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"không"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"dấu thăng"</string>
-    <string name="description_search_button" msgid="239929880630534731">"tìm kiếm"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"quay số"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"phím lùi"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Đã bật loa ngoài."</string>
@@ -715,9 +620,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Từ chối"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Rung"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Rung"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Nhạc chuông"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Luôn luôn"</item>
     <item msgid="1595097872875714252">"Chỉ khi ở chế độ im lặng"</item>
-    <item msgid="1458182414036878616">"Chưa bao giờ"</item>
+    <item msgid="1458182414036878616">"Không bao giờ"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Nhạc chuông điện thoại"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Rung khi đổ chuông"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Âm chạm bàn phím số"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Nhạc chuông"</string>
 </resources>
diff --git a/res/values-w360dp/dimens.xml b/res/values-w360dp/dimens.xml
deleted file mode 100644
index 5b5aeef95..000000000
--- a/res/values-w360dp/dimens.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<!-- Dimensions for screen widths >= 360dp -->
-<resources>
-
-    <!-- Width of buttons in the main row of in-call buttons. -->
-    <dimen name="in_call_button_width">64dp</dimen>
-
-</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 68eee56ed..8cffa7952 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"私人号码"</string>
     <string name="payphone" msgid="1931775086311769314">"公用电话"</string>
     <string name="onHold" msgid="9035493194749959955">"保持"</string>
-    <string name="ongoing" msgid="8300874342848721367">"当前通话"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"线路忙"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"网络忙"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"无响应，已超时"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"无法连接到服务器"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"该号码无法拨通"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"用户名或密码错误"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"网外呼叫"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"网外呼叫"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"服务器错误，请稍后再试。"</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"无信号"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"超出 ACM 限制"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"已关闭天线"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"无 SIM 或 SIM 错误"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"无 SIM 卡或 SIM 卡出错"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"不在服务区"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"外拨电话受固定拨号限制。"</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"通话限制启用时，无法拨出电话。"</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"您无法在已启用通话限制的情况下拨出电话。"</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"所有通话都受访问控制限制。"</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"急救或报警电话受访问控制限制。"</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"正常通话受访问控制限制。"</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"手机在重启之前处于锁定状态。"</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA：通话已取消。"</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA：通话中断。"</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA：重新排序。"</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA：服务选项拒绝。"</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA：重拨顺序。"</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA：接入失败。"</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA：优先抢占。"</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"只能拨打紧急呼救电话。"</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"号码无效"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"号码无效"</string>
     <string name="confCall" msgid="1904840547188336828">"电话会议"</string>
     <string name="call_lost" msgid="317670617901479594">"通话已中断。"</string>
-    <string name="retry" msgid="8462986804300767852">"重拨"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"通话中断"</string>
     <string name="ok" msgid="3811371167865772377">"确定"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI 码已启动"</string>
     <string name="ussdRunning" msgid="485588686340541690">"正在运行 USSD 代码..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"有线耳机"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"蓝牙"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"发送以下音频？"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"正在发送双音频"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"正在发送双音频"\n</string>
     <string name="send_button" msgid="4106860097497818751">"发送"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"是"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"否"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"将通配符替换为"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"将通配符替换为"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"缺少语音信箱号码"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"SIM 卡上未存储语音信箱号码。"</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"添加号码"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"正在载入..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"输入 PIN 码以解锁 SIM 卡。"</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM 已解锁"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"新 SIM 卡 PIN 码"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"再次输入新 SIM 卡 PIN 码予以确认"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"您输入的 SIM 卡 PIN 不匹配，请重试。"</string>
-    <string name="enterPuk" msgid="6144749655582862324">"输入 PUK 码以解锁 SIM 卡"</string>
-    <string name="badPuk" msgid="3213017898690275965">"PUK 码不正确！"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"继续"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"您的 SIM 卡已解锁。正在解锁您的手机..."</string>
     <string name="label_ndp" msgid="780479633159517250">"SIM 网络解锁 PIN"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"解锁"</string>
@@ -93,13 +72,15 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"正在请求网络解锁..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"网络解锁请求失败。"</string>
     <string name="unlock_success" msgid="6770085622238180152">"网络解锁成功。"</string>
-    <string name="imei" msgid="8552502717594321281">"移动通信国际识别码"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM 通话设置"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA 通话设置"</string>
     <string name="apn_settings" msgid="9043423184895642077">"接入点名称 (APN)"</string>
     <string name="settings_label" msgid="3876743539816984008">"网络设置"</string>
     <string name="voicemail" msgid="8693759337917898954">"语音信箱"</string>
+    <!-- Call settings screen, message wait indicator name -->
+    <string name="mwi_notification_title">信息等待指示器</string>
+    <!-- Call settings screen, message wait indicator summary -->
+    <string name="mwi_notification_summary">显示等待语音信箱通知的指示器</string>
     <string name="voicemail_abbreviated" msgid="2215592488517217448">"语音信箱："</string>
     <string name="networks" msgid="8873030692174541976">"网络运营商"</string>
     <string name="call_settings" msgid="6112441768261754562">"通话设置"</string>
@@ -109,6 +90,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"仅适用于 CDMA 的其他通话设置"</string>
     <string name="labelNwService" msgid="4699970172021870983">"网络服务设置"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"本机号码"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"正在加载设置..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"外拨电话时隐藏本机号码"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"外拨电话时显示本机号码"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"外拨电话时按照运营商的默认设置来显示本机号码"</string>
@@ -127,17 +109,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"占线时的转接号码"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"转接到 <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"已停用"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"您的运营商不支持在手机占线时停用呼叫转接功能。"</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"您的运营商不支持在手机占线时停用来电转接功能。"</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"无人接听时转接"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"无人接听时的转接号码"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"转接到 <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"已停用"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"您的运营商不支持在手机无人接听时停用呼叫转接功能。"</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"您的运营商不支持在手机无人接听时停用来电转接功能。"</string>
     <string name="labelCFNRc" msgid="47183615370850000">"无法接通时转接"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"无法接通时的转接号码"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"转接到 <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"已停用"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"您的运营商不支持在手机无法接通时停用呼叫转接功能。"</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"您的运营商不支持在手机无法接通时停用来电转接功能。"</string>
     <string name="updating_title" msgid="6146755386174019046">"通话设置"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"通话设置出错"</string>
     <string name="reading_settings" msgid="1920291699287055284">"正在读取设置..."</string>
@@ -145,8 +127,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"正在恢复设置..."</string>
     <string name="response_error" msgid="6674110501330139405">"网络响应异常。"</string>
     <string name="exception_error" msgid="7027667130619518211">"网络或 SIM 卡出错。"</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"只能对固定拨号号码执行此类操作。"</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"请先开启无线通信，然后再查看这些设置。"</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"拨号应用的固定拨号设置已启用。因此，部分与拨号相关的功能将不能正常使用。"</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"请先开启无线装置，然后再查看这些设置。"</string>
     <string name="close_dialog" msgid="2365884406356986917">"确定"</string>
     <string name="enable" msgid="1059008390636773574">"启用"</string>
     <string name="disable" msgid="7274240979164762320">"禁用"</string>
@@ -156,10 +138,9 @@
     <item msgid="7876195870037833661">"隐藏号码"</item>
     <item msgid="1108394741608734023">"显示号码"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"保存语音信箱号码"</string>
     <string name="vm_changed" msgid="380744030726254139">"语音信箱号码已更改。"</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"语音信箱号码更改失败。"\n"如果问题依然存在，请与您的运营商联系。"</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"转接号码更改失败。"\n"如果问题依然存在，请与您的运营商联系。"</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"无法更改语音信箱号码。"\n"如果此问题仍然存在，请与您的运营商联系。"</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"无法更改转接号码。"\n"如果此问题仍然存在，请与您的运营商联系。"</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"无法检索和保存当前转接号码设置。"\n"仍然要切换到新的服务提供商吗？"</string>
     <string name="no_change" msgid="3186040086622435212">"未做任何更改。"</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"选择语音信箱服务"</string>
@@ -171,51 +152,73 @@
     <string name="search_networks" msgid="1601136049300882441">"搜索网络"</string>
     <string name="network_query_error" msgid="6828516148953325006">"搜索网络时出错。"</string>
     <string name="register_on_network" msgid="9055203954040805084">"正在<xliff:g id="NETWORK">%s</xliff:g>上注册..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"您的 SIM 卡不允许连接到此网络。"</string>
-    <string name="connect_later" msgid="500090982903469816">"目前无法连接到此网络。请稍后重试。"</string>
+    <string name="not_allowed" msgid="5613353860205691579">"您的 SIM 卡不允许连接到此网络。"</string>
+    <string name="connect_later" msgid="2308119155752343975">"目前无法连接到此网络，请稍后重试。"</string>
     <string name="registration_done" msgid="495135664535876612">"已在网络上注册。"</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"选择一个网络运营商"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"选择网络运营商"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"搜索所有可用网络"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"自动选择"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"自动选择首选网络"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"自动注册..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"自动选择"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"自动选择首选网络"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"自动注册..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"网络模式"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"更改网络运行方式"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"首选网络模式"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="8521677230113533809">"首选网络模式：首选 WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="3352445413437453511">"首选网络模式：仅限 GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="2836897236221063413">"首选网络模式：仅限 WCDMA"</string>
-    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"首选网络模式：GSM/WCDMA"</string>
+    <string name="preferred_network_mode_gsm_wcdma_summary" msgid="3161255745326408587">"首选网络模式：GSM / WCDMA"</string>
     <string name="preferred_network_mode_cdma_summary" msgid="3175690187294334241">"首选网络模式：CDMA"</string>
-    <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"首选网络模式：CDMA/EvDo"</string>
+    <string name="preferred_network_mode_cdma_evdo_summary" msgid="8332063064712726618">"首选网络模式：CDMA / EvDo"</string>
     <string name="preferred_network_mode_cdma_only_summary" msgid="1309770926198634150">"首选网络模式：仅限 CDMA"</string>
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"首选网络模式：仅限 EvDo"</string>
-    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"首选网络模式：LTE/CDMA"</string>
-  <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE/CDMA"</item>
-    <item msgid="3273348576277144124">"仅 EvDo"</item>
-    <item msgid="454610224530856274">"CDMA，无 EvDo 功能"</item>
-    <item msgid="8928247118825616081">"CDMA/EvDo 自动选择"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA 自动选择"</item>
-    <item msgid="5189164180446264504">"仅 WCDMA"</item>
-    <item msgid="5714714953966979187">"仅 GSM"</item>
-    <item msgid="4775796025725908913">"首选 GSM/WCDMA"</item>
-  </string-array>
-  <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE/CDMA"</item>
-    <item msgid="5541716989029928208">"CDMA"</item>
-  </string-array>
+    <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"首选网络模式：LTE / CDMA"</string>
+    <!-- Mobile network settings, summary for preferred network mode LTE / GSM/WCDMA [CHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_gsm_summary">首选网络模式：LTE / GSM/WCDMA</string>
+    <!-- Mobile network settings, summary for preferred network mode LTE / CDMA / EvDo [CHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_cdma_evdo_summary">首选网络模式：LTE / CDMA / EvDo</string>
+    <!-- Mobile network settings, summary for preferred network mode LTE / CMDA / EvDo / GSM/WCDMA [CHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">首选网络模式：LTE / CMDA / EvDo / GSM / WCDMA</string>
+
+    <string-array name="preferred_network_mode_choices">
+        <item>全球</item>
+        <item msgid="3273348576277144124">"仅 EvDo"</item>
+        <item msgid="454610224530856274">"CDMA，无 EvDo 功能"</item>
+        <item msgid="648505122852496166">"CDMA/EvDo 自动选择"</item>
+        <item msgid="7148247646407324800">"GSM/WCDMA 自动选择"</item>
+        <item msgid="5189164180446264504">"仅 WCDMA"</item>
+        <item msgid="5714714953966979187">"仅 GSM"</item>
+        <item msgid="8508331239546115206">"首选 GSM/WCDMA"</item>
+    </string-array>
+    <string-array name="preferred_network_mode_choices_lte">
+        <item>仅 LTE</item>
+        <item>LTE/CDMA/EvDo/GSM/WCDMA</item>
+        <item>LTE/CDMA/EvDo</item>
+        <item msgid="7002474529872452266">"LTE/CDMA"</item>
+        <item msgid="5541716989029928208">"CDMA/EvDo 自动选择"</item>
+    </string-array>
+    <!-- Mobile network settings, network mode choices for a device supporting GSM and LTE [CHAR LIMIT=25] -->
+    <string-array name="preferred_network_mode_choices_lte_gsm">
+        <item>LTE/GSM/WCDMA</item>
+        <item>首选 GSM/WCDMA</item>
+    </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"已启用数据流量"</string>
     <string name="data_enable_summary" msgid="5022018967714633874">"允许通过移动网络存取数据"</string>
-    <string name="roaming" msgid="8871412572928323707">"数据漫游"</string>
-    <string name="roaming_enable" msgid="7331106985174381987">"漫游时连接到数据服务"</string>
-    <string name="roaming_disable" msgid="1843417228755568110">"漫游时连接到数据服务"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"数据连接已断，因为您已离开本地网络并已关闭数据漫游。"</string>
-    <string name="roaming_warning" msgid="7820963598559553967">"是否允许数据漫游？这可能产生大量漫游费！"</string>
+    <string name="roaming" msgid="8871412572928323707">"移动数据网络漫游"</string>
+    <string name="roaming_enable" msgid="7331106985174381987">"漫游时连接到移动数据网络服务"</string>
+    <string name="roaming_disable" msgid="1843417228755568110">"漫游时连接到移动数据网络服务"</string>
+
+    <!-- Mobile network settings screen, setting check box name -->
+    <string name="national_roaming">国家性数据网络漫游</string>
+    <!-- Mobile network settings screen, setting summary text when check box is selected -->
+    <string name="national_roaming_enable">在原国家境内漫游时将连接到数据网络服务</string>
+    <!-- Mobile network settings screen, setting summary text when check box is clear -->
+    <string name="national_roaming_disable">在原国家境内漫游时将不连接到数据网络服务</string>
+
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"移动数据网络连接已断开，因为您已离开本地网络并关闭了移动数据网络漫游功能。"</string>
+    <string name="roaming_warning" msgid="7820963598559553967">"是否要允许移动数据网络漫游？这可能产生大量漫游费！"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS 选项"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA 选项"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"流量使用情况"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"运营商流量政策"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"当前时段使用的数据"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"数据使用时段"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"数据传输速率政策"</string>
@@ -226,7 +229,6 @@
     <string name="throttle_time_frame_subtext" msgid="7732763021560399960">"此周期已过去 <xliff:g id="USED_0">%1$d</xliff:g>٪"\n"下一个时段将从 <xliff:g id="USED_1">%2$d</xliff:g> 天后 (<xliff:g id="USED_2">%3$s</xliff:g>) 开始"</string>
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"如果超过了流量上限，则数据传输速率会降至 <xliff:g id="USED">%1$d</xliff:g> Kb/s"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"有关您运营商的移动网络数据使用政策的详情"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"小区广播短信"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"小区广播短信"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"小区广播短信"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"已启用小区广播短信"</string>
@@ -267,15 +269,6 @@
     <item msgid="1858401628368130638">"韩语"</item>
     <item msgid="1933212028684529632">"中文"</item>
     <item msgid="1908428006803639064">"希伯来语"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"语言"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"本地天气"</string>
@@ -305,9 +298,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"招聘信息"</string>
     <string name="eo_enable" msgid="8623559062015685813">"已启用招聘信息"</string>
     <string name="eo_disable" msgid="3863812478090907609">"已停用招聘信息"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"医疗、保健和医院"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"已启用医疗、保健和医院信息"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"已停用医疗、保健和医院信息"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"医疗、保健和医院"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"医疗、保健和医院信息已启用"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"医疗、保健和医院信息已停用"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"技术新闻"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"已启用技术新闻"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"已停用技术新闻"</string>
@@ -322,35 +315,17 @@
     <item msgid="8912042051809329533">"仅 WCDMA"</item>
     <item msgid="8776934131146642662">"仅 GSM"</item>
     <item msgid="4684679567848300935">"GSM/WCDA（首选 WCDMA）"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"仅使用 2G 网络"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"省电"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"系统选择"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"更改 CDMA 漫游模式"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"更改 CDMA 漫游模式"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"系统选择"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"仅本地系统"</item>
     <item msgid="1205664026446156265">"自动"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"CDMA 漫游模式"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"更改 CDMA 漫游模式"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"CDMA 漫游模式"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"仅本地网络"</item>
-    <item msgid="8174642753290624634">"附属网络"</item>
-    <item msgid="2241951431403168661">"任何网络"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"CDMA 订阅"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA 网络偏好设置"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"尚未实现！"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"CDMA 网络偏好设置"</string>
@@ -359,21 +334,11 @@
     <item msgid="6143696847467859795">"仅 CDMA"</item>
     <item msgid="2683555124647197574">"仅 EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA 订阅"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"在 RUIM/SIM 和 NV 之间进行切换"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"订阅"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"激活设备"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"设置数据服务"</string>
@@ -390,18 +355,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"管理固定拨号"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"更改为访问固定拨号设置的 PIN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"管理手机号码列表"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"语音隐私权"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"语音隐私权"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"启用增强型隐秘模式"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY 模式"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"启用 TTY 模式"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY 模式"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"设置 TTY 模式"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"自动重拨"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"启用自动重拨模式"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"自动重拨"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"启用自动重拨模式"</string>
     <string name="menu_add" msgid="1882023737425114762">"添加联系人"</string>
     <string name="menu_edit" msgid="7143003705504672374">"编辑联系人"</string>
     <string name="menu_delete" msgid="3977150783449642851">"删除联系人"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"输入 PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"键入 PIN2"</string>
     <string name="name" msgid="7329028332786872378">"名称"</string>
     <string name="number" msgid="7905950798349903858">"号码"</string>
     <string name="save" msgid="4094274636321939086">"保存"</string>
@@ -414,56 +377,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"删除固定拨号联系人"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"正在删除固定拨号联系人..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"已删除固定拨号联系人。"</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN 未更新：您输入的 PIN 有误。"</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN 未更新：号码不得超过 20 位。"</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"系统未更新 FDN，因为键入的 PIN 码有误。"</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"系统未更新 FDN，因为号码不能超过 20 位。"</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"FDN 未更新。PIN2 有误，或电话号码遭拒。"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"正在从 SIM 卡读取..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"SIM 卡上无联系人。"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"选择要导入的联系人"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"要从 SIM 卡导入联系人，请先关闭飞行模式。"</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"要从 SIM 卡导入联系人，请先关闭飞行模式。"</string>
     <string name="enable_pin" msgid="5422767284133234860">"启用/禁用 SIM 卡 PIN"</string>
     <string name="change_pin" msgid="9174186126330785343">"更改 SIM 卡 PIN"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM 卡 PIN："</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"旧 PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"新 PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"确认新 PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"您输入的旧 PIN 不正确，请重试。"</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"您输入的 PIN 不匹配，请重试。"</string>
+    <string name="badPin" msgid="8955102849303984935">"键入的旧 PIN 有误，请重试。"</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"键入的 PIN 不一致，请重试。"</string>
     <string name="invalidPin" msgid="5981171102258684792">"输入 4 到 8 位数字的 PIN。"</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"停用 SIM 卡 PIN"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"启用 SIM 卡 PIN"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"请稍候..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"已启用 SIM 卡 PIN"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"已停用 SIM 卡 PIN"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"您输入的 PIN 不正确"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"已成功更改 SIM 卡 PIN"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"SIM 卡 PIN 已启用。"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"SIM 卡 PIN 已停用。"</string>
+    <string name="pin_failed" msgid="2298841192582192277">"键入的 PIN 有误。"</string>
+    <string name="pin_changed" msgid="4365538014588501049">"已成功更改 SIM 卡 PIN。"</string>
     <string name="puk_requested" msgid="3898394204193202803">"密码不正确，SIM 已锁定！需要 PUK2。"</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"旧 PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"新 PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"确认新 PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"您输入的 PUK2 不正确，请重试。"</string>
-    <string name="badPin2" msgid="515218795152422178">"您输入的旧 PIN2 不正确，请重试。"</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"您输入的 PIN2 不匹配，请重试。"</string>
+    <string name="badPuk2" msgid="4851734468010000418">"键入的 PUK2 有误，请重试。"</string>
+    <string name="badPin2" msgid="1041576234483629991">"您键入的旧 PIN2 有误，请重试。"</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"键入的 PIN2 不一致，请重试。"</string>
     <string name="invalidPin2" msgid="8237110107480395938">"输入 4 到 8 位数字的 PIN2。"</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"输入 8 位数字的 PUK2。"</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"已成功更改 PIN2"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"已成功更改 PIN2。"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"输入 PUK2 码"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"密码不正确，请更改 PIN2 并重试！"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"密码不正确，SIM 已锁定！需要 PUK2。"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"密码有误，请更改 PIN2 并重试。"</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"密码有误，SIM 卡已锁定。需要 PUK2。"</string>
     <string name="doneButton" msgid="2859593360997984240">"完成"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"电话会议<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"返回通话"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"无 SIM 卡时继续"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"未找到 SIM 卡。请将 SIM 卡插入手机中。"</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"关闭"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"解锁"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"正在验证 PIN..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"语音信箱号码"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"正在拨号"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"正在重拨"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"电话会议"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"来电"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"CDMA 来电等待"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"通话结束"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"保持"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"正在挂断"</string>
@@ -473,7 +430,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"未接电话"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> 个未接电话"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"来自<xliff:g id="MISSED_CALL_FROM">%s</xliff:g>的未接电话"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"当前通话 (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"当前通话"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"保持"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"来电"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"新语音邮件"</string>
@@ -482,13 +439,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"语音信箱号码未知"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"无服务"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"所选网络（<xliff:g id="OPERATOR_NAME">%s</xliff:g>）不可用"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"挂断"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"回拨"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"短信"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"要进行呼叫，请先关闭飞行模式。"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"尚未注册网络。"</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"无法访问移动网络"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"拨号未送出，因为输入的号码无效。"</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"拨号未送出。"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"正在启动 MMI 序列..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"正在启动功能代码序列..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"不支持此服务。"</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"无法切换通话。"</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"无法分离通话。"</string>
@@ -500,18 +459,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"紧急呼救"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"正在打开天线..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"不在服务区，正在重试..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"电话未拨出，因为 <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是紧急呼救号码！"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"电话未拨出，请拨打紧急呼救电话！"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"电话未拨出，<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是紧急呼救号码！"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"电话未拨出，请拨打紧急呼救电话！"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"使用键盘拨号"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"按键式键盘"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"等待"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"恢复"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"挂断"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"拨号键盘"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"隐藏"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"免提"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"静音"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"蓝牙"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"添加通话"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"合并通话"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"交换"</string>
@@ -530,36 +484,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI 文字"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF 音"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF 音"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"设置 DTMF 音长度"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"正常"</item>
     <item msgid="2883365539347850535">"长"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"网络讯息"</string>
+    <string name="network_message" msgid="4483886461245213802">"网络讯息"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"激活您的手机"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"需要拨打特别号码才能激活您的手机服务。"\n\n"在按下“激活”后，按照语音提示激活您的手机。"</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"触摸“激活”将拨出特殊呼叫，在运营商的移动网络中激活您的手机，这样您就可拨打电话和连接移动数据网络了。"</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"略过激活步骤？"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"如果您略过激活步骤，就无法拨打电话或连接到移动数据网络（不过您可以连接到 Wi-Fi 网络）。如果您不激活手机，每次开机时都会收到激活提示。"</string>
-    <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"略过"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"激活"</string>
+    <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"跳过"</string>
     <string name="ota_activate" msgid="1368528132525626264">"激活"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"手机已激活！"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"手机已激活。"</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"激活时遇到问题"</string>
     <string name="ota_listen" msgid="162923839877584937">"按照语音提示操作，直至提示手机已激活。"</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"键盘"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"免提"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"正在向您的手机中写入程序，请耐心等待。"</string>
-    <string name="ota_failure" msgid="8600027551822478181">"编程失败"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"正在向您的手机中写入程序，请稍候。"</string>
+    <string name="ota_failure" msgid="4311299546379674378">"写入程序失败"</string>
     <string name="ota_successful" msgid="1880780692887077407">"您的手机已激活。最多 15 分钟即可开始使用服务。"</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"您的手机尚未激活。"\n"您可能需要找一个手机信号更好的位置（窗户附近或室外）。"\n\n"再试一次，或呼叫客户服务中心寻求更多解决方法。"</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"您的手机未激活。"\n"您可能需要找一个手机信号更好的位置（窗户附近或室外）。"\n\n"请重试或致电客户服务小组寻求更多解决方法。"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"SPC 故障太多"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"上一步"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"重试"</string>
     <string name="ota_next" msgid="3904945374358235910">"下一步"</string>
-    <string name="ota_back" msgid="2190038043403850052">"上一步"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"已进入紧急回拨模式"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"紧急回拨模式"</string>
@@ -569,87 +518,74 @@
     <item quantity="other" msgid="3122217344579273583">"持续 <xliff:g id="COUNT">%s</xliff:g> 分钟没有数据连接"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"手机将持续 <xliff:g id="COUNT">%s</xliff:g> 分钟处于紧急回拨模式。在此模式下，无法使用正在进行数据连接的应用程序。要立即退出吗？"</item>
-    <item quantity="other" msgid="3231879566243957821">"手机将持续 <xliff:g id="COUNT">%s</xliff:g> 分钟处于紧急回拨模式。在此模式下，无法使用正在进行数据连接的应用程序。要立即退出吗？"</item>
+    <item quantity="one" msgid="8060210887681426682">"手机在 <xliff:g id="COUNT">%s</xliff:g> 分钟内都会处于紧急回拨模式下，此模式下无法使用需要联网的应用。您要立即退出吗？"</item>
+    <item quantity="other" msgid="8617116564023933114">"手机在 <xliff:g id="COUNT">%s</xliff:g> 分钟内都会处于紧急回拨模式下，此模式下无法使用需要联网的应用。要立即退出吗？"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"无法在紧急回拨模式下执行所选操作。手机会在此模式下持续 <xliff:g id="COUNT">%s</xliff:g> 分钟。要立即退出吗？"</item>
-    <item quantity="other" msgid="3489076611710869904">"无法在紧急回拨模式下执行所选操作。手机会在此模式下持续 <xliff:g id="COUNT">%s</xliff:g> 分钟。要立即退出吗？"</item>
+    <item quantity="one" msgid="2585506997024726599">"无法在紧急回拨模式下执行所选操作，而手机在 <xliff:g id="COUNT">%s</xliff:g> 分钟内都会处于此模式下。要立即退出吗？"</item>
+    <item quantity="other" msgid="6115622137771382224">"无法在紧急回拨模式下执行所选操作，而手机在 <xliff:g id="COUNT">%s</xliff:g> 分钟内都会处于此模式下。要立即退出吗？"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"紧急呼救时您所选的操作无法执行"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"正在退出紧急回拨模式"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"进行紧急呼救时无法执行所选操作。"</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"正在退出紧急回拨模式"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"是"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"否"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"关闭"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"语音信箱设置"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;未设置&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"语音信箱服务"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>的设置"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"服务"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"设置"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;未设置&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"其他通话设置"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"拨打"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"通过 ^1"\n<b>"^2"</b>" 呼叫"</string>
-    <string name="slide_to_answer" msgid="255903188611244476">"向右拖动以接听"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"向左拖动以使振铃器静音"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"向左拖动以拒绝"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"向右拖动以接听并"\n"保持当前通话"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"向右拖动以接听并"\n"结束当前通话"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"向右拖动以接听并"\n"结束保持的通话"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"接听"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"拒绝"</string>
+
+    <!-- Dialer UI Settings -->
+    <string name="dialer_ui_settings_title">拨号键盘设置</string>
+    <string name="dialer_ui_settings_summary">更改拨号键盘的设置</string>
+
+    <string name="calling_via_template" msgid="4839419581866928142">"通过<xliff:g id="PROVIDER_NAME">%s</xliff:g>进行通话"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"联系人照片"</string>
     <string name="goPrivate" msgid="865837794424530980">"私聊"</string>
     <string name="selectContact" msgid="781975788478987237">"选择联系人"</string>
     <string name="sip_settings" msgid="6699045718560859691">"互联网通话设置"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"互联网电话 (SIP) 帐户"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"帐户"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"管理互联网电话 (SIP) 帐户和状态"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"接听来电"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"会缩短电池待机时间"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"配置呼叫选项"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"使用互联网电话"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"使用互联网通话（仅限 Wi-Fi）"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"数据网络接通时适用于所有通话"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"仅适用于互联网通话"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"每次呼叫时询问"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"适用于所有通话"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"自动注册"</string>
-    <string name="call_priority" msgid="8374917577270504387">"通过 SIP 进行外发呼叫"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"拨打电话"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"使用互联网电话帐户："</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"总是用于拨打互联网电话"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"您可以使用“通话设置”更改拨打电话时默认使用的互联网电话帐户，只需在“互联网电话设置”下选择其他帐户即可"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"您可以在“手机”&gt;“设置”&gt;“互联网呼叫设置”&gt;“帐户”屏幕中更改默认使用的互联网呼叫帐户。"</string>
     <string name="pstn_phone" msgid="8782554491484326429">"手机拨号"</string>
     <string name="internet_phone" msgid="1147922660195095810">"互联网电话"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"没有互联网电话帐户"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"该手机上没有互联网电话帐户。要立即添加一个帐户吗？"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"此手机上没有互联网呼叫帐户，要立即添加一个吗？"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"添加"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"添加帐户"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"删除帐户"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP 帐户"</string>
-    <string name="saving_account" msgid="7468818916695729968">"正在保存帐户..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"正在删除帐户..."</string>
+    <string name="saving_account" msgid="52903398217017954">"正在保存帐户..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"正在删除帐户..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"保存"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"舍弃"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"关闭个人资料"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"确定"</string>
     <string name="close_profile" msgid="6886968271423155284">"关闭"</string>
-    <string name="primary_account" msgid="2229538308291934245">"主帐户"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"将该帐户设为我的主帐户"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"用于外拨电话"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"高级设置"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"主帐户。<xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"正在检查状态..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"正在注册..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"仍在尝试..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"不接听电话"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"由于未连接至互联网，帐户注册已停止"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"因无 Wi-Fi 连接，已停止注册帐户。"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"帐户注册失败"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"接听电话"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"正在注册..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"仍在尝试..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"不接听电话。"</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"由于未连接至互联网，帐户注册已停止。"</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"由于未连接到 Wi-Fi 网络，帐户注册已停止。"</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"帐户注册失败。"</string>
+    <string name="registration_status_done" msgid="884630717456439280">"接听电话。"</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"帐户注册失败：（<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>）；系统会在稍后重试"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"帐户注册失败：用户名或密码不正确"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"帐户注册失败：请检查服务器名称"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"<xliff:g id="ACCOUNT_OWNER">%s</xliff:g> 应用程序当前正在使用该帐户"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"帐户注册失败：用户名或密码有误。"</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"帐户注册失败：请检查服务器名称。"</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"“<xliff:g id="ACCOUNT_OWNER">%s</xliff:g>”应用当前正在使用此帐户。"</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIP 帐户详情"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP 帐户详情"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"服务器"</string>
@@ -660,9 +596,6 @@
     <string name="port_title" msgid="5952939408078626657">"端口号"</string>
     <string name="transport_title" msgid="8253139511847746640">"传输类型"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"发送持续连接消息"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"发送 SIP 持续连接消息"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"自动注册"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"自动注册个人资料"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"设置为主帐户"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"用于外拨电话"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"可选设置"</string>
@@ -673,12 +606,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;可选&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ 触摸可全部显示"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ 触摸可全部隐藏"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"“<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>”属于必填字段，不能留空"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"端口号应在 1000 与 65534 之间"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"“<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>”属于必填字段，不能留空。"</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"端口号应在 1000 与 655534 之间。"</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"无互联网连接"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"无 Wi-Fi 连接"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"要拨打互联网电话，请先检查互联网连接情况"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"您必须连接到 Wi-Fi 网络才能使用互联网电话（使用“无线和网络设置”）"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"要拨打互联网电话，请先检查互联网连接情况。"</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"您需要连接到 Wi-Fi 网络才能使用互联网电话（使用“无线与网络”设置）。"</string>
     <string name="no_voip" msgid="8901474054537199865">"不支持互联网电话"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"自动"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"一律发送"</string>
@@ -687,7 +620,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"我马上会打给你。"</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"我稍后会再打给你。"</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"现在无法接听。能稍后再打给我吗？"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"自定义短信..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"自定义短信"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"快速回复"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"修改快速回复"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -705,7 +638,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"星标"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"零"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"英镑"</string>
-    <string name="description_search_button" msgid="239929880630534731">"搜索"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"拨号"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"Backspace 键"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"扬声器已启用。"</string>
@@ -715,9 +647,45 @@
     <string name="description_target_decline" msgid="4789834364389731957">"拒绝"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"振动"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"振动"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"铃声"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"始终"</item>
     <item msgid="1595097872875714252">"仅在静音时"</item>
-    <item msgid="1458182414036878616">"一律不"</item>
+    <item msgid="1458182414036878616">"永不"</item>
   </string-array>
+
+    <string name="voice_quality_preferences_title">音质</string>
+    <string name="voice_quality_summary">当前设置的音频配置文件 : %s</string>
+
+    <string name="voice_quality_entry_normal">标准</string>
+    <string name="voice_quality_entry_clear">平衡</string>
+    <string name="voice_quality_entry_crisp">明亮</string>
+    <string name="voice_quality_entry_bright">高亮</string>
+
+    <string name="ringtone_title" msgid="6374978286202084684">"手机铃声"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"响铃时振动"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"拨号键盘触摸音效"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"铃声"</string>
+    <string name="perm_change_mobile_network">2G／3G 移动网络切换</string>
+    <string name="perm_change_mobile_network_desc">获得该权限的应用程序可以在任何时候在2G/3G移动网络之间切换。3G 网络的速度会更快，但也会消耗更多的电量并且可能消耗您更多的金钱。</string>
+
+    <!-- Noise suppression -->
+    <string name="noise_suppression_title">噪声抑制</string>
+    <string name="noise_suppression_summary">对所有通话启用噪声抑制</string>
+    <!-- End Noise suppression -->
+
+    <string name="phone_number_label">我的电话号码</string>
+    <string name="phone_number_summary">设置此设备的电话号码</string>
+
+    <!-- Advanced Settings -->
+    <string name="advanced_setting">高级设置</string>
+    <string name="keep_proximity_sensor_on">始终开启距离感应器</string>
+    <string name="keep_proximity_sensor_on_sum">使用耳机通话时将不会关闭距离感应器</string>
+    <string name="lockscreen_if_call_ends_with_screenoff">通话结束时锁定</string>
+    <string name="lockscreen_if_call_ends_with_screenoff_sum">在屏幕关闭与通话结束时自动锁定设备</string>
+    <string name="vibrate_outgoing">对方接听时震动</string>
+    <string name="vibrate_call_waiting">呼叫等待时震动</string>
+    <string name="vibrate_hangup">通话结束时震动</string>
+    <string name="vibrate_45">45秒震动</string>
+    <string name="vibrate_45_sum">呼出通话到达每分钟的45秒时震动</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 759d64aec..c15882889 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"私人號碼"</string>
     <string name="payphone" msgid="1931775086311769314">"公共電話"</string>
     <string name="onHold" msgid="9035493194749959955">"通話保留"</string>
-    <string name="ongoing" msgid="8300874342848721367">"目前通話"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"線路忙碌中"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"網路忙碌"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"沒有回應，已逾時"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"無法連上伺服器"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"無法撥通的號碼"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"使用者名稱或密碼有誤"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"無法進行網外撥話"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"無法進行網外撥號"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"伺服器錯誤，請稍後再試。"</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"沒有訊號"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"已達 ACM 限制"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"無線通訊關閉"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"沒有 SIM 或 SIM 錯誤"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"沒有 SIM 卡或 SIM 卡發生錯誤"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"超出服務範圍"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"撥出受固定撥號限制。"</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"通話限制啟用時，無法撥出電話。"</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"通話限制啟用時無法撥號。"</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"所有通話都受存取控制限制。"</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"緊急通話受存取控制限制。"</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"正常通話受存取控制限制。"</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"CDMA：重新開機前鎖定手機。"</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"CDMA：撥號中斷。"</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"CDMA：通話遭攔截。"</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"CDMA：重新排序。"</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"CDMA：拒絕服務選項。"</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"CDMA：重試命令。"</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"CDMA：存取失敗。"</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"CDMA：已預先佔用。"</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"僅能撥打緊急電話。"</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"號碼無效"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"號碼無效"</string>
     <string name="confCall" msgid="1904840547188336828">"多方通話"</string>
     <string name="call_lost" msgid="317670617901479594">"電話已斷線。"</string>
-    <string name="retry" msgid="8462986804300767852">"重試"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"斷線"</string>
     <string name="ok" msgid="3811371167865772377">"確定"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"MMI 碼開始執行"</string>
     <string name="ussdRunning" msgid="485588686340541690">"USSD 碼執行中..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"有線頭戴式耳機"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"藍牙"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"傳送此鈴聲？"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"正在傳送信號音"\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"正在傳送信號音"\n</string>
     <string name="send_button" msgid="4106860097497818751">"傳送"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"是"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"否"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"取代萬用字元為"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"將萬用字元改成"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"遺失語音信箱號碼"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"SIM 卡中未儲存語音信箱號碼。"</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"新增號碼"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"載入中..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"輸入 PIN 碼以解鎖 SIM 卡。"</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"SIM 已解鎖"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"新增 SIM PIN 碼"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"再次輸入新的 SIM PIN 碼以確認"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"您輸入的 SIM PIN 不符合。請再試一次。"</string>
-    <string name="enterPuk" msgid="6144749655582862324">"輸入 PUK 碼以解鎖 SIM 卡"</string>
-    <string name="badPuk" msgid="3213017898690275965">"錯誤的 PUK 碼！"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"繼續"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"您的 SIM 卡已解鎖。正在解鎖手機中..."</string>
     <string name="label_ndp" msgid="780479633159517250">"SIM 網路解鎖 PIN"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"解除鎖定"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"要求解鎖網路中..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"網路解鎖失敗。"</string>
     <string name="unlock_success" msgid="6770085622238180152">"網路解鎖成功。"</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"GSM 通話設定"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"CDMA 通話設定"</string>
     <string name="apn_settings" msgid="9043423184895642077">"存取點名稱 (APN)"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"其他 CDMA 僅限通話設定"</string>
     <string name="labelNwService" msgid="4699970172021870983">"網路服務設定"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"本機號碼"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"正在載入設定..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"隱藏本機號碼"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"撥出電話時顯示本機號碼"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"使用預設值，在撥出電話時顯示本機號碼"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"忙線時轉接號碼"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"轉接至 <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"停用"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"您的電信業者不支援於手機通話中停用轉接功能。"</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"您的行動通訊業者不支援手機通話時停用轉接功能。"</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"未接聽時轉接"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"未接聽時的轉接號碼"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"轉接至 <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"停用"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"您的電信業者不支援於手機未接聽時停用轉接功能。"</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"您的行動通訊業者不支援手機未接聽時停用轉接功能。"</string>
     <string name="labelCFNRc" msgid="47183615370850000">"未能接通時轉接"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"無法接通時的轉接號碼"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"轉接至 <xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"停用"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"您的電信業者不支援於手機無收訊時停用轉接功能。"</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"您的行動通訊業者不支援手機無收訊時停用轉接功能。"</string>
     <string name="updating_title" msgid="6146755386174019046">"通話設定"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"通話設定錯誤"</string>
     <string name="reading_settings" msgid="1920291699287055284">"讀取設定中..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"正在還原設定..."</string>
     <string name="response_error" msgid="6674110501330139405">"網路傳回非預期回應。"</string>
     <string name="exception_error" msgid="7027667130619518211">"網路或 SIM 卡錯誤。"</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"僅限對固定撥號號碼執行此作業。"</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"檢視設定前，請先開啟無線通訊。"</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"您的「手機」應用程式已開啟「固定撥號」設定，導致部分撥號相關功能無法正常運作。"</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"查看這些設定前，請先開啟無線電。"</string>
     <string name="close_dialog" msgid="2365884406356986917">"確定"</string>
     <string name="enable" msgid="1059008390636773574">"啟用"</string>
     <string name="disable" msgid="7274240979164762320">"停用"</string>
@@ -156,29 +134,28 @@
     <item msgid="7876195870037833661">"隱藏號碼"</item>
     <item msgid="1108394741608734023">"顯示號碼"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"儲存語音信箱號碼"</string>
     <string name="vm_changed" msgid="380744030726254139">"語音信箱號碼已變更。"</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"語音信箱號碼變更失敗。"\n"如果問題持續發生，請與您的行動通訊業者聯絡。"</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"轉接號碼變更失敗。"\n"如果問題持續發生，請與您的行動通訊業者聯絡。"</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"無法變更語音信箱號碼。"\n"如果問題持續發生，請與您的行動通訊業者聯絡。"</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"無法變更轉接號碼。"\n"如果問題持續發生，請與您的行動通訊業者聯絡。"</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"無法擷取及儲存目前的轉接號碼設定。"\n"您仍要轉換至新的供應商嗎？"</string>
     <string name="no_change" msgid="3186040086622435212">"未變更設定。"</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"選擇語音信箱服務"</string>
     <string name="voicemail_default" msgid="5902099213882352338">"我的服務業者"</string>
     <string name="mobile_networks" msgid="5540397602919106177">"行動網路設定"</string>
-    <string name="label_available" msgid="1181658289009300430">"可用網路"</string>
+    <string name="label_available" msgid="1181658289009300430">"可用的網路"</string>
     <string name="load_networks_progress" msgid="5230707536168902952">"搜尋中..."</string>
     <string name="empty_networks_list" msgid="4249426905018815316">"找不到網路。"</string>
     <string name="search_networks" msgid="1601136049300882441">"搜尋網路"</string>
     <string name="network_query_error" msgid="6828516148953325006">"搜尋網路時發生錯誤。"</string>
     <string name="register_on_network" msgid="9055203954040805084">"正在註冊 <xliff:g id="NETWORK">%s</xliff:g>..."</string>
-    <string name="not_allowed" msgid="3540496123717833833">"您的 SIM 卡不允許連接此網路。"</string>
-    <string name="connect_later" msgid="500090982903469816">"目前無法連線到這個網路，請稍候再試。"</string>
+    <string name="not_allowed" msgid="5613353860205691579">"您的 SIM 卡無法連上這個網路。"</string>
+    <string name="connect_later" msgid="2308119155752343975">"目前無法連上這個網路，請稍後再試。"</string>
     <string name="registration_done" msgid="495135664535876612">"註冊網路成功。"</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"選取電信業者"</string>
-    <string name="sum_search_networks" msgid="2921092249873272715">"搜尋所有可用網路"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"自動選取"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"自動選取喜好網路"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"自動註冊..."</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"選擇行動網路業者"</string>
+    <string name="sum_search_networks" msgid="2921092249873272715">"搜尋所有可用的網路"</string>
+    <string name="select_automatically" msgid="5628402124471810174">"自動選擇"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"自動選擇慣用網路"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"自動註冊..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"網路模式"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"變更網路操作模式"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"優先網路模式"</string>
@@ -192,30 +169,29 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"慣用網路模式：僅限 EvDo"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"慣用網路模式：LTE / CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE/CDMA"</item>
     <item msgid="3273348576277144124">"僅限 EvDo"</item>
     <item msgid="454610224530856274">"CDMA (不具 EvDo)"</item>
-    <item msgid="8928247118825616081">"CDMA/EvDo 自動切換"</item>
-    <item msgid="8595462903294812666">"GSM/WCDMA 自動切換"</item>
+    <item msgid="648505122852496166">"CDMA/EvDo 自動切換"</item>
+    <item msgid="7148247646407324800">"GSM/WCDMA 自動切換"</item>
     <item msgid="5189164180446264504">"僅限 WCDMA"</item>
     <item msgid="5714714953966979187">"僅限 GSM"</item>
-    <item msgid="4775796025725908913">"GSM/WCDMA 優先"</item>
+    <item msgid="8508331239546115206">"GSM/WCDMA 優先使用"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE/CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"已啟用資料"</string>
-    <string name="data_enable_summary" msgid="5022018967714633874">"啟用 Google 行動服務網路的資料存取"</string>
+    <string name="data_enable_summary" msgid="5022018967714633874">"啟用行動數據服務網路"</string>
     <string name="roaming" msgid="8871412572928323707">"漫遊服務"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"漫遊時連線到資料傳輸服務"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"漫遊時連線到資料傳輸服務"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"由於您不在主要網路蓋涵範圍，而且已關閉資料傳輸漫遊服務，資料連線已中斷。"</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"您已離開國內網路涵蓋範圍，且已關閉數據傳輸漫遊服務，因此數據連線已中斷。"</string>
     <string name="roaming_warning" msgid="7820963598559553967">"要允許漫遊服務嗎？您可能會需要支付龐大漫遊費用！"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"GSM/UMTS 選項"</string>
     <string name="cdma_options" msgid="4016822858172249884">"CDMA 選項"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"資料用量"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"行動業者資料傳輸政策"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"目前週期已使用的資料量"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"資料使用量週期"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"資料傳輸速率政策"</string>
@@ -230,7 +206,6 @@
     <skip />
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"若已達資料用量上限，資料傳輸速率會降低至 <xliff:g id="USED">%1$d</xliff:g> Kb/秒"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"更多有關行動業者行動網路資料使用政策的資訊"</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"區域廣播簡訊"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"區域廣播簡訊"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"區域廣播簡訊"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"已啟用區域廣播簡訊"</string>
@@ -271,15 +246,6 @@
     <item msgid="1858401628368130638">"韓文"</item>
     <item msgid="1933212028684529632">"中文"</item>
     <item msgid="1908428006803639064">"希伯來文"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"4"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"語言"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"當地天氣預報"</string>
@@ -309,34 +275,19 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"就業資訊"</string>
     <string name="eo_enable" msgid="8623559062015685813">"已啟用就業資訊"</string>
     <string name="eo_disable" msgid="3863812478090907609">"已停用就業資訊"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"醫療、保健及醫院"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"啟用醫療、保健及醫院資訊"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"已停用醫療、保健及醫院資訊"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"醫療、保健及醫院資訊"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"已啟用醫療、保健及醫院資訊"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"已停用醫療、保健及醫院資訊"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"科技新聞"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"已啟用科技新聞"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"停用科技新聞"</string>
     <string name="enable_disable_multi_category" msgid="626771003122899280">"多類別資訊"</string>
     <string name="multi_category_enable" msgid="1179299804641721768">"已啟用多類別資訊"</string>
     <string name="multi_category_disable" msgid="880104702904139505">"已停用多類別資訊"</string>
-    <string name="gsm_umts_network_preferences_title" msgid="4834419333547382436">"GSM/UMTS 網路偏好設定"</string>
-    <string name="gsm_umts_network_preferneces_summary" msgid="1905018644156819521">"尚未建置！"</string>
-    <string name="gsm_umts_network_preferences_dialogtitle" msgid="6356332580813229898">"GSM/UMTS 網路偏好設定"</string>
-  <string-array name="gsm_umts_network_preferences_choices">
-    <item msgid="935612021902787683">"GSM/WCDMA (自動模式)"</item>
-    <item msgid="8912042051809329533">"僅限 WCDMA"</item>
-    <item msgid="8776934131146642662">"僅限 GSM"</item>
-    <item msgid="4684679567848300935">"GSM/WCDA (WCDMA 優先)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
-  </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"只使用 2G 網路"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"節省電力"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"選取系統"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"變更 CDMA 漫遊模式"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"變更 CDMA 漫遊模式"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"選取系統"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"僅限住家電話"</item>
@@ -349,11 +300,6 @@
     <item msgid="6024072766548865002">"僅限家用網路"</item>
     <item msgid="8174642753290624634">"聯盟網路"</item>
     <item msgid="2241951431403168661">"任何網路"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
   </string-array>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"CDMA 網路偏好設定"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"尚未建置！"</string>
@@ -363,21 +309,11 @@
     <item msgid="6143696847467859795">"僅限 CDMA"</item>
     <item msgid="2683555124647197574">"僅限 EvDo"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"CDMA 訂閱"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"在 RUIM/SIM 和 NV 之間切換"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"訂閱"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"啟動裝置"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"設定數據傳輸服務"</string>
@@ -394,18 +330,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"管理固定撥號"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"變更固定撥號功能存取密碼"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"管理電話號碼清單"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"語音加密保護"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"語音加密保護"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"已啟用加強型隱私保護模式"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"TTY 模式"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"啟用 TTY 模式"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"TTY 模式"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"設定 TTY 模式"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"自動重試"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"啟用「自動重試」模式"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"自動重試"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"啟用自動重試模式"</string>
     <string name="menu_add" msgid="1882023737425114762">"新增聯絡人"</string>
     <string name="menu_edit" msgid="7143003705504672374">"編輯聯絡人"</string>
     <string name="menu_delete" msgid="3977150783449642851">"刪除聯絡人"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"輸入 PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"輸入 PIN2"</string>
     <string name="name" msgid="7329028332786872378">"名稱"</string>
     <string name="number" msgid="7905950798349903858">"號碼"</string>
     <string name="save" msgid="4094274636321939086">"儲存"</string>
@@ -418,56 +352,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"刪除固定撥號"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"正在刪除固定撥號..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"已刪除固定撥號。"</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"FDN 未更新：您輸入的 PIN 碼不正確。"</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"FDN 未更新：號碼不能超過 20 碼。"</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"您所輸入的 PIN 不正確，因此未更新 FDN。"</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"號碼超過 20 位數的上限，因此未更新 FDN。"</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"未更新 FDN。可能是因為 PIN2 碼不正確或電話號碼遭拒。"</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"從 SIM 卡讀取中..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"您的 SIM 卡上沒有聯絡人。"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"選取要匯入的聯絡人"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"如要從 SIM 卡匯入通訊錄，請關閉飛行模式。"</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"如要從 SIM 卡匯入聯絡人，請先關閉「飛行」模式。"</string>
     <string name="enable_pin" msgid="5422767284133234860">"啟用/停用 SIM PIN"</string>
     <string name="change_pin" msgid="9174186126330785343">"變更 SIM PIN"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"SIM PIN："</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"舊的 PIN"</string>
     <string name="newPinLabel" msgid="207488227285336897">"新的 PIN"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"確認新的 PIN"</string>
-    <string name="badPin" msgid="4154316827946559447">"您輸入的舊 PIN 不正確。請再試一次。"</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"您輸入的 PIN 不符合。請再試一次。"</string>
+    <string name="badPin" msgid="8955102849303984935">"您所輸入的舊 PIN 不正確，請再試一次。"</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"您所輸入的 PIN 不符，請再試一次。"</string>
     <string name="invalidPin" msgid="5981171102258684792">"輸入 4 至 8 個數字的 PIN。"</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"停用 SIM PIN"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"啟用 SIM PIN"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"請稍候..."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"SIM PIN 已啟用"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"SIM PIN 已停用"</string>
-    <string name="pin_failed" msgid="6597695909685242127">"您輸入的 PIN 不正確"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"成功變更 SIM PIN"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"已啟用 SIM PIN。"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"已停用 SIM PIN。"</string>
+    <string name="pin_failed" msgid="2298841192582192277">"您所輸入的 PIN 不正確。"</string>
+    <string name="pin_changed" msgid="4365538014588501049">"已成功變更 SIM PIN。"</string>
     <string name="puk_requested" msgid="3898394204193202803">"密碼錯誤，SIM 已鎖定！需要 PUK2 解鎖。"</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"舊的 PIN2"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"新的 PIN2"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"確認新的 PIN2"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"您輸入的 PUK2 不正確。請再試一次。"</string>
-    <string name="badPin2" msgid="515218795152422178">"您輸入的舊 PIN2 不正確。請再試一次。"</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"您輸入的 PIN2 不符。請再試一次。"</string>
+    <string name="badPuk2" msgid="4851734468010000418">"您所輸入的 PUK2 不正確，請再試一次。"</string>
+    <string name="badPin2" msgid="1041576234483629991">"您所輸入的舊 PIN2 不正確，請再試一次。"</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"您所輸入的 PIN2 不符，請再試一次。"</string>
     <string name="invalidPin2" msgid="8237110107480395938">"輸入 4 至 8 個數字的 PIN2。"</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"輸入 8 個數字的 PUK2。"</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"成功變更 PIN2"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"已成功變更 PIN2。"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"輸入 PUK2 碼"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"密碼錯誤，請更改 PIN2 並再試一次！"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"密碼錯誤，SIM 已鎖定！需要 PUK2 解鎖。"</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"密碼不正確，請變更 PIN2 後重試。"</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"密碼不正確，SIM 已鎖住！請輸入 PUK2。"</string>
     <string name="doneButton" msgid="2859593360997984240">"完成"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"多方通話<xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"返回通話"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"不插入 SIM 卡，繼續操作"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"找不到 SIM 卡。請將 SIM 卡插入手機。"</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"關閉"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"解除鎖定"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"正在驗證 PIN..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"語音信箱號碼"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"撥號中"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"重試中"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"多方通話"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"來電"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"CDMA 通話插播中"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"通話結束"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"通話保留"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"掛斷電話"</string>
@@ -477,7 +405,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"未接來電"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> 通未接來電"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"來自 <xliff:g id="MISSED_CALL_FROM">%s</xliff:g> 的未接來電"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"目前通話 (<xliff:g id="DURATION">%s</xliff:g>)"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"通話中"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"通話保留"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"來電"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"新留言"</string>
@@ -486,13 +414,15 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"無語音信箱號碼"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"沒有服務"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"您所選取的網路 (<xliff:g id="OPERATOR_NAME">%s</xliff:g>) 無法使用"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"掛斷"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"回撥"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"簡訊"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"撥號前，請先關閉飛航模式。"</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"尚未註冊網路。"</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"無法使用 Google 行動服務網路。"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"撥號未送出，未輸入正確號碼。"</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"撥號未送出。"</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"開始 MMI 序列..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"正在啟動功能碼序列..."</string>
     <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"不支援的服務。"</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"無法切換通話。"</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"無法分隔來電。"</string>
@@ -504,18 +434,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"緊急電話"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"開啟無線通訊中..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"超出服務範圍，重試中..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"撥號未送出，<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是緊急電話號碼！"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"撥號未送出，請撥打緊急電話號碼！"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"未送出通話要求，<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> 不是緊急電話號碼！"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"未送出通話要求，請撥打緊急電話號碼！"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"使用鍵盤撥號"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"觸控音按鍵"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"保留"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"取消保留"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"結束"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"撥號鍵盤"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"隱藏"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"擴音"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"靜音"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"藍牙"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"新增通話"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"合併通話"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"切換"</string>
@@ -534,36 +459,31 @@
     <item msgid="1937509904407445684">"TTY HCO"</item>
     <item msgid="5644925873488772224">"TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"ERI 文字"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"DTMF 信號音"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"DTMF 信號音"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"設定 DTMF 信號音長度"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"適中"</item>
     <item msgid="2883365539347850535">"長音"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"網路訊息"</string>
+    <string name="network_message" msgid="4483886461245213802">"網路訊息"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"啟用您的手機"</string>
     <string name="ota_touch_activate" msgid="6553212803262586244">"如要啟用手機服務，您必須撥打一通特殊電話。"\n\n"按下 [啟用] 後，請聽取手機啟用說明。"</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"輕觸 [啟用] 可撥打一通特殊電話，以便在通訊業者的行動網路上啟用您的手機，讓您可以打電話並連線至行動資料網路。"</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"是否略過啟用？"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"如果您不啟用手機，就無法打電話或連線至行動服務資料網路 (透過這個資料網路，可連線至 Wi-Fi 網路)。每次一開機，系統就會詢問您是否要啟用手機，直到您啟用為止。"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"略過"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"啟用"</string>
     <string name="ota_activate" msgid="1368528132525626264">"啟用"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"手機已啟用！"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"手機已啟用。"</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"啟用失敗"</string>
     <string name="ota_listen" msgid="162923839877584937">"依照語音指示進行，直到您聽到啟用完成為止。"</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"小鍵盤"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"擴音"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"手機正在進行程式化設定，請稍候。"</string>
-    <string name="ota_failure" msgid="8600027551822478181">"程式化失敗"</string>
+    <string name="ota_progress" msgid="3420314892609254729">"手機正在進行程式化設定，請稍候。"</string>
+    <string name="ota_failure" msgid="4311299546379674378">"程式化失敗"</string>
     <string name="ota_successful" msgid="1880780692887077407">"您的手機已啟用；系統最多可能需要 15 分鐘，才會開始提供服務。"</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"您的手機尚未啟用。"\n"建議您移到收訊較佳的地方 (例如窗邊或戶外)。"\n\n"請再試一次，或向客戶服務中心洽詢其他啟用方式。"</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"您的手機未啟用。"\n"建議您移往收訊較佳處 (例如窗邊或戶外)。"\n\n"請再試一次，或向客戶服務中心洽詢其他啟用方式。"</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"過度調整 SPC 錯誤"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"返回"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"再試一次"</string>
     <string name="ota_next" msgid="3904945374358235910">"下一頁"</string>
-    <string name="ota_back" msgid="2190038043403850052">"返回"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmExitDialog"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"已進入緊急回撥模式"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"緊急回撥模式"</string>
@@ -573,87 +493,69 @@
     <item quantity="other" msgid="3122217344579273583">"接下來將出現 <xliff:g id="COUNT">%s</xliff:g> 分鐘的資料斷線狀態"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"手機在接下來的 <xliff:g id="COUNT">%s</xliff:g> 分鐘內都將處於緊急回撥模式。在此模式中，所有使用資料連線的應用程式皆無法運作。您要立即退出嗎？"</item>
-    <item quantity="other" msgid="3231879566243957821">"手機在接下來的 <xliff:g id="COUNT">%s</xliff:g> 分鐘內都將處於緊急回撥模式。在此模式中，所有使用資料連線的應用程式皆無法運作。您要立即退出嗎？"</item>
+    <item quantity="one" msgid="8060210887681426682">"手機在接下來的 <xliff:g id="COUNT">%s</xliff:g> 分鐘都將處於緊急回撥模式。在這個模式中，所有使用數據連線的應用程式皆無法運作。您要立即退出嗎？"</item>
+    <item quantity="other" msgid="8617116564023933114">"手機在接下來的 <xliff:g id="COUNT">%s</xliff:g> 分鐘都將處於緊急回撥模式。在這個模式中，所有使用數據連線的應用程式皆無法運作。您要立即退出嗎？"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"緊急回撥模式不支援您要執行的功能。接下來將出現 <xliff:g id="COUNT">%s</xliff:g> 分鐘的資料斷線狀態，您要立即退出嗎？"</item>
-    <item quantity="other" msgid="3489076611710869904">"緊急回撥模式不支援您要執行的功能。接下來將出現 <xliff:g id="COUNT">%s</xliff:g> 分鐘的資料斷線狀態，您要立即退出嗎？"</item>
+    <item quantity="one" msgid="2585506997024726599">"緊急回撥模式不支援您要執行的操作。手機在接下來的 <xliff:g id="COUNT">%s</xliff:g> 分鐘都將處於這個模式，您要立即退出嗎？"</item>
+    <item quantity="other" msgid="6115622137771382224">"緊急回撥模式不支援您要執行的操作。手機在接下來的 <xliff:g id="COUNT">%s</xliff:g> 分鐘都將處於這個模式，您要立即退出嗎？"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"您所選取的動作無法在撥打緊急電話時執行"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"正在退出緊急回撥模式"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"緊急通話模式不支援您要執行的操作。"</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"正在退出緊急回撥模式"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"是"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"否"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"關閉"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"語音信箱設定"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"&lt;未設定&gt;"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"語音信箱服務"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"<xliff:g id="PROVIDER_NAME">%s</xliff:g>的設定"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"服務"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"設定"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;未設定&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"其他通話設定"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"撥號"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"正在透過 ^1 去電"\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"向右拖曳以接聽來電"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"向左拖曳以關閉鈴聲"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"向左拖曳以拒絕通話"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"向右拖曳以接聽來電並保留"\n"目前的通話"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"向右拖曳以接聽來電並結束"\n"目前的通話"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"向右拖曳以接聽來電並結束"\n"目前保留的通話"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"接聽"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"拒絕"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"正在透過 <xliff:g id="PROVIDER_NAME">%s</xliff:g> 撥號"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"聯絡人相片"</string>
     <string name="goPrivate" msgid="865837794424530980">"私人通話"</string>
     <string name="selectContact" msgid="781975788478987237">"選取聯絡人"</string>
     <string name="sip_settings" msgid="6699045718560859691">"網路電話設定"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"網路電話 (SIP) 帳戶"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"帳戶"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"管理網路電話 (SIP) 帳戶和狀態"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"接聽來電"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"會減少電池電量"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"設定通話選項"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"使用網路電話"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"撥打網路電話 (僅限 Wi-Fi)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"數據網路可用時，適用於所有通話"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"僅適用於網路電話"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"每次通話都詢問"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"適用於所有通話"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"自動註冊"</string>
-    <string name="call_priority" msgid="8374917577270504387">"透過 SIP 撥出通話"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"撥打電話"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"使用網路電話帳戶："</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"一律用於撥打網路電話"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"您可以使用 [通話設定]，在網路電話設定下選取其他帳戶，以變更撥打電話時所使用的預設網路電話帳戶"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"如要變更預設使用的網路電話帳戶，請前往 [手機] &gt; [設定] &gt; [網路電話設定] &gt; [帳戶] 畫面調整設定。"</string>
     <string name="pstn_phone" msgid="8782554491484326429">"手機電話"</string>
     <string name="internet_phone" msgid="1147922660195095810">"網路電話"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"沒有網路電話帳戶"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"這支手機上沒有任何網路電話帳戶，要立即新增一個帳戶？"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"這支手機沒有設定任何網路電話帳戶，您要立即新增帳戶嗎？"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"新增"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"新增帳戶"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"移除帳戶"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"SIP 帳戶"</string>
-    <string name="saving_account" msgid="7468818916695729968">"正在儲存帳戶..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"正在移除帳戶..."</string>
+    <string name="saving_account" msgid="52903398217017954">"正在儲存帳戶..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"正在移除帳戶..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"儲存"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"捨棄"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"關閉設定檔"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"確定"</string>
     <string name="close_profile" msgid="6886968271423155284">"關閉"</string>
-    <string name="primary_account" msgid="2229538308291934245">"主要"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"將這個帳戶設為我的主要帳戶"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"用於外撥通話"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"進階設定"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"主要帳戶。<xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"正在檢查狀態..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"註冊中..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"仍在嘗試中..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"不接聽來電"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"由於沒有網際網路連線，已停止帳戶的註冊作業"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"因沒有 Wi-Fi 連線而停止註冊帳戶"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"帳戶註冊失敗"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"接聽來電"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"註冊中..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"仍在嘗試中..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"無法接聽電話。"</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"因沒有網際網路連線，帳戶的註冊作業已停止。"</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"找不到 WiFi 連線，帳戶註冊作業已中止。"</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"帳戶註冊失敗。"</string>
+    <string name="registration_status_done" msgid="884630717456439280">"可以接聽電話。"</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"帳戶註冊失敗：(<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>)；將於稍後重試"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"帳戶註冊失敗：使用者名稱或密碼不正確"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"帳戶註冊失敗：請檢查伺服器名稱"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"這個帳戶目前由 <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> 應用程式使用中"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"帳戶註冊失敗：使用者名稱或密碼不正確。"</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"帳戶註冊失敗：請檢查伺服器名稱。"</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"這個帳戶目前由 <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> 應用程式使用中。"</string>
     <string name="sip_edit_title" msgid="489288416435014385">"SIP 帳戶詳細資料"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"SIP 帳戶詳細資料"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"伺服器"</string>
@@ -664,9 +566,6 @@
     <string name="port_title" msgid="5952939408078626657">"通訊埠號碼"</string>
     <string name="transport_title" msgid="8253139511847746640">"傳輸類型"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"傳送 keep-alive"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"傳送 SIP keep-alive 訊息"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"自動註冊"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"自動註冊設定檔"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"設為主要帳戶"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"用於外撥通話"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"選用設定"</string>
@@ -677,12 +576,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;選擇性&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ 輕觸即可全部顯示"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ 輕觸即可全部隱藏"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> 為必填，不能留空"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"通訊埠號碼必須介於 1000 到 65534 之間"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"「<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g>」為必填欄位，不得留空。"</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"通訊埠號碼必須介於 1000 到 65534 間。"</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"沒有網際網路連線"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"沒有 Wi-Fi 連線"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"如要撥打網路電話，請先檢查您的網際網路連線"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"您必須連上 Wi-Fi 網路才能使用網路電話 (使用 [無線網路和網路] 設定)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"如要撥打網路電話，請先檢查您的網際網路連線。"</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"您必須連上 WiFi 網路才能使用網路電話 (使用 [無線網路與網路設定])。"</string>
     <string name="no_voip" msgid="8901474054537199865">"不支援網路電話"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"自動"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"一律傳送"</string>
@@ -691,7 +590,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">"我待會就回電。"</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"我晚點回電。"</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"我現在不方便通話，晚點再打來好嗎？"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"自訂訊息..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"自訂訊息"</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"快速回應"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"編輯快速回應"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -709,7 +608,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"星號"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"零"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"井字鍵"</string>
-    <string name="description_search_button" msgid="239929880630534731">"搜尋"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"撥號"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"Backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"喇叭已啟用"</string>
@@ -719,9 +617,22 @@
     <string name="description_target_decline" msgid="4789834364389731957">"拒絕"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"震動"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"震動"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"鈴聲"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
-    <item msgid="468237575962916558">"一律"</item>
-    <item msgid="1595097872875714252">"靜音時才啟用"</item>
-    <item msgid="1458182414036878616">"永遠不要"</item>
+    <item msgid="468237575962916558">"一律啟用"</item>
+    <item msgid="1595097872875714252">"僅在靜音時啟用"</item>
+    <item msgid="1458182414036878616">"永不啟用"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"手機鈴聲"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"鈴響時震動"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"撥號鍵盤觸控音效"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"鈴聲"</string>
+    <string name="perm_change_mobile_network">切換行動網路（2G／3G）</string>
+    <string name="perm_change_mobile_network_desc">被授予此權限的應用程式能夠於任何時候在 2G 及 3G 行動網路之間進行切換。使用 3G 行動網路取存資料的速度會比較快，但相對的會消耗較多的電池電量，亦會令您花費較多的金錢。</string>
+    <string name="advanced_setting">進階設定</string>
+    <string name="vibrate_outgoing">接聽震動</string>
+    <string name="vibrate_45">45秒震動</string>
+    <string name="vibrate_45_sum">撥出通話後到45秒時震動</string>
+    <string name="vibrate_hangup">掛斷震動</string>
+    <string name="vibrate_call_waiting">來電待接震動</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9216e9a75..9c2445c1b 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -25,39 +25,27 @@
     <string name="private_num" msgid="6713286113000232309">"Inombolo eyimfihlo"</string>
     <string name="payphone" msgid="1931775086311769314">"Ifoni ekhokhelwayo"</string>
     <string name="onHold" msgid="9035493194749959955">"Ibambile"</string>
-    <string name="ongoing" msgid="8300874342848721367">"Ikholi yamanje"</string>
     <string name="callFailed_userBusy" msgid="8851106999809294904">"Ulayini umatasa"</string>
     <string name="callFailed_congestion" msgid="8737761615702718375">"Inethiwekhi imatasa"</string>
     <string name="callFailed_timedOut" msgid="7590961703135543346">"Ayikho impendulo, isikhathi siphelile"</string>
     <string name="callFailed_server_unreachable" msgid="2133506577423869729">"Iseva ayitholakali"</string>
     <string name="callFailed_number_unreachable" msgid="7632566442515734778">"Inombolo ayifinyeleleki"</string>
     <string name="callFailed_invalid_credentials" msgid="8226835346196775378">"Igama lomsebenzisi noma iphasiwedi engalungile"</string>
-    <string name="callFailed_out_of_network" msgid="6485167392133436262">"Kushayelwe kwinethiwekhi yangaphandle"</string>
+    <string name="callFailed_out_of_network" msgid="8740943329772180507">"Kushayelwe kwinethiwekhi yangaphandle"</string>
     <string name="callFailed_server_error" msgid="5717915213586193217">"Iphutha leseva. Zama futhi emva kwesikhathi."</string>
     <string name="callFailed_noSignal" msgid="1889803273616031933">"Ayikho isignali"</string>
     <string name="callFailed_limitExceeded" msgid="4958065157970101491">"Umkhawulo we-ACM ufinyelelwe"</string>
     <string name="callFailed_powerOff" msgid="2766035859391549713">"Umsakazo uvaliwe"</string>
-    <string name="callFailed_simError" msgid="5652345589458834655">"Ayikho i-SIM, noma iphutha le-SIM"</string>
+    <string name="callFailed_simError" msgid="4476360200030635828">"Ayikho i-SIM, noma iphutha le-SIM"</string>
     <string name="callFailed_outOfService" msgid="4825791466557236225">"Indawo engenayo isevisi"</string>
     <string name="callFailed_fdn_only" msgid="2850204579765430641">"Izincingo eziphumayo zivinjelwe i-FDN."</string>
-    <string name="callFailed_cb_enabled" msgid="3057131228725500761">"Awukwazi ukwenza amakholi aphumayo ngenkathi ukuvimba kuvuliwe."</string>
+    <string name="callFailed_cb_enabled" msgid="3686963693629739680">"Awukwazi ukwenza amakholi aphumayo ngenkathi ukuvimba kuvuliwe."</string>
     <string name="callFailed_dsac_restricted" msgid="2180223622768522345">"Wonke amakholi avimbelwa ngesilawuli sokufinyelela."</string>
     <string name="callFailed_dsac_restricted_emergency" msgid="4353654268813314466">"Amakholi aphuthumayo avinjelwe isilawuli sokufinyelela."</string>
     <string name="callFailed_dsac_restricted_normal" msgid="2680774510252408620">"Amakholi avamile avinjelwe ukulawula kokufinyelela."</string>
-    <string name="callFailed_cdma_lockedUntilPowerCycle" msgid="775483211928061084">"I-CDMA: Ifoni ivaliwe kuze kube umjikelezo wamandla."</string>
-    <string name="callFailed_cdma_drop" msgid="6030084920001082496">"I-CDMA: Ikholi idrojiwe."</string>
-    <string name="callFailed_cdma_intercept" msgid="8402269373120277330">"I-CDMA: Ikholi ingenelelwe."</string>
-    <string name="callFailed_cdma_reorder" msgid="5605791471418711552">"I-CDMA: irekhoda."</string>
-    <string name="callFailed_cdma_SO_reject" msgid="8969174256492763555">"I-CDMA: Ukwenqaba Okukhethwayo Kwensizakalo."</string>
-    <string name="callFailed_cdma_retryOrder" msgid="5848488692485148804">"I-CDMA: zama futhi i-oda."</string>
-    <string name="callFailed_cdma_accessFailure" msgid="715977130417624962">"I-CDMA: Ukwehluleka ukufinyelela."</string>
-    <string name="callFailed_cdma_preempted" msgid="1097095321180029879">"I-CDMA: Ayinalutho"</string>
-    <string name="callFailed_cdma_notEmergency" msgid="2347377816822720761">"Amakholi  aphuthumayo kuphela angeziwe."</string>
-    <string name="callFailed_unobtainable_number" msgid="7886274717456712105">"Inombolo Engalungile"</string>
+    <string name="callFailed_unobtainable_number" msgid="4736290912891155067">"Inombolo Engalungile"</string>
     <string name="confCall" msgid="1904840547188336828">"Ikholi yengqungquthela"</string>
     <string name="call_lost" msgid="317670617901479594">"Ucingo lwakho lulahlekile."</string>
-    <string name="retry" msgid="8462986804300767852">"Zama futhi"</string>
-    <string name="call_lost_title" msgid="6696949678847938515">"Ikholi ilahlekile"</string>
     <string name="ok" msgid="3811371167865772377">"KULUNGILE"</string>
     <string name="mmiStarted" msgid="6347869857061147003">"Ikhodi ye-MMI iqalile"</string>
     <string name="ussdRunning" msgid="485588686340541690">"Ikhodi ye-USSD iyasebenza..."</string>
@@ -69,23 +57,14 @@
     <string name="audio_mode_wired_headset" msgid="1465350758489175975">"I-headset enezincingo"</string>
     <string name="audio_mode_bluetooth" msgid="3047641300848211128">"Bluetooth"</string>
     <string name="wait_prompt_str" msgid="7601815427707856238">"Thumela amathoni alandelayo?"\n</string>
-    <string name="pause_prompt_str" msgid="341477243019906241">"Ithumela Amathoni "\n</string>
+    <string name="pause_prompt_str" msgid="1789964702154314806">"Ithumela Amathoni "\n</string>
     <string name="send_button" msgid="4106860097497818751">"Thumela"</string>
     <string name="pause_prompt_yes" msgid="3564467212025151797">"Yebo"</string>
     <string name="pause_prompt_no" msgid="6686238803236884877">"Cha"</string>
-    <string name="wild_prompt_str" msgid="1585989144582892543">"Buyisela uhlamvu olugqamile ngolu"</string>
+    <string name="wild_prompt_str" msgid="5543521676355533577">"Miselela uhlamvu lwasendle nge"</string>
     <string name="no_vm_number" msgid="4164780423805688336">"Inombolo engekho yomyalezo wezwi"</string>
     <string name="no_vm_number_msg" msgid="1300729501030053828">"Ayikho inombolo yomlayezo wezwi egcinwe ekhadini le-SIM."</string>
     <string name="add_vm_number_str" msgid="4676479471644687453">"Engeza inombolo"</string>
-    <string name="dialer_emptyListWorking" msgid="6022498519770859790">"Iyalayisha..."</string>
-    <string name="enterPin" msgid="4753300834213388397">"Thayipha ikhodi ye-PIN ukuze uvule ikhadi le-SIM"</string>
-    <string name="pinUnlocked" msgid="3260617001055506794">"I-SIM ivuliwe"</string>
-    <string name="enterNewPin" msgid="5311243769004752401">"Ikhodi Entsha ye-SIM PIN"</string>
-    <string name="verifyNewPin" msgid="2593629913010458867">"Thayipha futhi ikhodi entsha ye-SIM PIN ukuqinisekisa"</string>
-    <string name="verifyFailed" msgid="3875778795754857903">"Ama-PIN e-SIM owathayiphile awafani. Sicela uzame futhi."</string>
-    <string name="enterPuk" msgid="6144749655582862324">"Thayipha ikhodi ye-PUK ukuze uvule ikhadi le-SIM"</string>
-    <string name="badPuk" msgid="3213017898690275965">"Ikhodi ye-PUK engalungile!"</string>
-    <string name="buttonTxtContinue" msgid="863271214384739936">"Qhubeka"</string>
     <string name="puk_unlocked" msgid="2284912838477558454">"Ikhadi lakho le-SIM livuliwe. Ifoni yakho iyavula..."</string>
     <string name="label_ndp" msgid="780479633159517250">"Inethiwekhi ye-SIM yokuvula i-PIN"</string>
     <string name="sim_ndp_unlock_text" msgid="683628237760543009">"Vula"</string>
@@ -93,8 +72,6 @@
     <string name="requesting_unlock" msgid="6412629401033249351">"Icela ukuvula inethiwekhi..."</string>
     <string name="unlock_failed" msgid="6490531697031504225">"Isicelo sokuvula inethiwekhi asiphumelelanga."</string>
     <string name="unlock_success" msgid="6770085622238180152">"Ukuvula inethiwekhi kuphumelele."</string>
-    <string name="imei" msgid="8552502717594321281">"IMEI"</string>
-    <string name="meid" msgid="66004808679046045">"I-MEID"</string>
     <string name="labelGSMMore" msgid="5930842194056092106">"Izilungiselelo zekholi ze-GSM"</string>
     <string name="labelCDMAMore" msgid="1630676740428229339">"Izilungiselelo zekholi ye-CDMA"</string>
     <string name="apn_settings" msgid="9043423184895642077">"Amagama Endawo Yokungena"</string>
@@ -109,6 +86,7 @@
     <string name="sum_cdma_call_settings" msgid="284753265979035549">"Izilungiselelo zekholi ezengeziwe ze-CDMA kuphela"</string>
     <string name="labelNwService" msgid="4699970172021870983">"Izilungiselelo zensizakalo yenethiwekhi"</string>
     <string name="labelCallerId" msgid="3888899447379069198">"I-ID yomshayeli"</string>
+    <string name="sum_loading_settings" msgid="1826692909391168620">"Ilayisha izilungiselelo..."</string>
     <string name="sum_hide_caller_id" msgid="1071407020290873782">"Inombolo ifihliwe kwizincingo eziphumayo"</string>
     <string name="sum_show_caller_id" msgid="6768534125447290401">"Inombolo iboniswe kwizincingo eziphumayo"</string>
     <string name="sum_default_caller_id" msgid="1954518825510901365">"Sebenzisa izilungiselelo zo-opheretha ezimisiwe ukubonisa inombolo yami ezincingweni eziphumayo"</string>
@@ -127,17 +105,17 @@
     <string name="messageCFB" msgid="3711089705936187129">"Bala uma imatasa"</string>
     <string name="sum_cfb_enabled" msgid="5984198104833116690">"Idlulisela ku-<xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfb_disabled" msgid="227440009979537651">"Khutshaziwe"</string>
-    <string name="disable_cfb_forbidden" msgid="4524424437001441832">"Isiphathi sakho asisekeli ukuvimbela ukudlulisa ucingo lapho ifoni yakho imatasa."</string>
+    <string name="disable_cfb_forbidden" msgid="3506984333877998061">"Isiphathi sakho asisekeli ukuvimbela ukudlulisa ucingo lapho ifoni yakho imatasa."</string>
     <string name="labelCFNRy" msgid="3646316323834351390">"Dlulisa uma ungaphendulwa"</string>
     <string name="messageCFNRy" msgid="672317899884380374">"Bala uma ingaphendula"</string>
     <string name="sum_cfnry_enabled" msgid="6955775691317662910">"Idlulisela ku-<xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnry_disabled" msgid="8422350929957344729">"Khutshaziwe"</string>
-    <string name="disable_cfnry_forbidden" msgid="7041605706777677935">"Isiphathi sakho asisekeli ukuvimbela ukudlulisa ucigo lapho ifoni yakho ingaphenduli."</string>
+    <string name="disable_cfnry_forbidden" msgid="4308233959150658058">"Isiphathi sakho asisekeli ukuvimbela ukudlulisa ucigo lapho ifoni yakho ingaphenduli."</string>
     <string name="labelCFNRc" msgid="47183615370850000">"Dlulisa uma ingatholakali"</string>
     <string name="messageCFNRc" msgid="6380695421020295119">"Inombolo uma ingatholakali"</string>
     <string name="sum_cfnrc_enabled" msgid="7010898346095497421">"Idlulisela ku-<xliff:g id="PHONENUMBER">{0}</xliff:g>"</string>
     <string name="sum_cfnrc_disabled" msgid="7222141261321276464">"Khutshaziwe"</string>
-    <string name="disable_cfnrc_forbidden" msgid="1093527570652781997">"Isiphathi sakho asisekeli ukuvimbela ukudlulisela ucingo lapho ifoni yakho ingafinyeleleki."</string>
+    <string name="disable_cfnrc_forbidden" msgid="5646361343094064333">"Isiphathi sakho asisekeli ukuvimbela ukudlulisela ucingo lapho ifoni yakho ingafinyeleleki."</string>
     <string name="updating_title" msgid="6146755386174019046">"Izilungiselelo zekholi"</string>
     <string name="error_updating_title" msgid="7970259216988931777">"Iphutha lokulungiselela ikholi"</string>
     <string name="reading_settings" msgid="1920291699287055284">"Ifunda izilungiselelo..."</string>
@@ -145,8 +123,8 @@
     <string name="reverting_settings" msgid="4752151682666912828">"Iguqula izilungiselelo."</string>
     <string name="response_error" msgid="6674110501330139405">"Impendulo engalindelekile kwinethiwekhi."</string>
     <string name="exception_error" msgid="7027667130619518211">"Iphutha lenethiwekhi noma lekhadi le-SIM."</string>
-    <string name="fdn_only_error" msgid="7079583506377602000">"Imisebenzi ivunyelwe kuphela kwizinombolo zokudayela ezingaguquki."</string>
-    <string name="radio_off_error" msgid="6717116288405111269">"Sicela uvule umsakazo ngaphambi kokubuka lezi zilungiselelo."</string>
+    <string name="fdn_check_failure" msgid="18200614306525434">"Izilungiselelo zezinombolo zokudayila okukhiyiwe kohlelo lokusebenza lwefoni yakho zikhanyisiwe. Njengomphumela, ezinye izici ezihlobene namakholi azisebenzi."</string>
+    <string name="radio_off_error" msgid="2304459933248513376">"Sicela uvule umsakazo ngaphambi kokubuka lezi zilungiselelo."</string>
     <string name="close_dialog" msgid="2365884406356986917">"KULUNGILE"</string>
     <string name="enable" msgid="1059008390636773574">"Vumela"</string>
     <string name="disable" msgid="7274240979164762320">"Khubaza"</string>
@@ -156,10 +134,9 @@
     <item msgid="7876195870037833661">"Fihla inombolo"</item>
     <item msgid="1108394741608734023">"Bonisa inombolo"</item>
   </string-array>
-    <string name="vm_save_number" msgid="4579969432544566719">"Londoloza inombolo yomyalezo wezwi"</string>
     <string name="vm_changed" msgid="380744030726254139">"Inombolo yevoyisimeyilii ishintshile."</string>
-    <string name="vm_change_failed" msgid="6912718596496220653">"Ukushintsha inombolo yemeyli yezwi akuphumelelanga."\n"Sicela uxhumane nomphathi wakho uma inkinga iqhubeka."</string>
-    <string name="fw_change_failed" msgid="4437005899675054038">"Ukudlulisela inombolo kushintshe ngokungaphumeleli."\n"Sicela uxhumane nesiphathi sakho uma inkinga iqhubeka."</string>
+    <string name="vm_change_failed" msgid="3352934863246208918">"Ayikwazanga ukushintsha inombolo ye-voicemail."\n"Xhumana nesithwali sakho uma le nkinga iqhubeka."</string>
+    <string name="fw_change_failed" msgid="5298103228470214665">"Ayikwazanga ukushintsha inombolo edluliselayo."\n"Xhumana nesithwali sakho uma le-nkinga iqhubeka."</string>
     <string name="fw_get_in_vm_failed" msgid="8862896836093833973">"Yehlulekile ukulanda kanye nokulondoloza izimiso zamanje zokuthumela."\n"Noma kunjalo shintshela kohlinzeka ngezinsiza omusha?"</string>
     <string name="no_change" msgid="3186040086622435212">"Azikho izinguquko ezenziwe."</string>
     <string name="sum_voicemail_choose_provider" msgid="59911196126278922">"Khetha insizikalo yemeyili yezwi"</string>
@@ -171,14 +148,14 @@
     <string name="search_networks" msgid="1601136049300882441">"Sesha amanethiwekhi"</string>
     <string name="network_query_error" msgid="6828516148953325006">"Iphutha ngenkathi icinga amanethiwekhi."</string>
     <string name="register_on_network" msgid="9055203954040805084">"Ibhalisa kwi <xliff:g id="NETWORK">%s</xliff:g>"</string>
-    <string name="not_allowed" msgid="3540496123717833833">"Ikhadi lakho le-SIM alivumeli uxhumano kulenethiwekhi."</string>
-    <string name="connect_later" msgid="500090982903469816">"Ayikwazi ukuxhuma kule nethiwekhi ngalesi sikhathi. Sicela uzame futhi emva kwesikhathi."</string>
+    <string name="not_allowed" msgid="5613353860205691579">"Ikhadi lakho le-SIM alivumeli uxhumano kulenethiwekhi."</string>
+    <string name="connect_later" msgid="2308119155752343975">"Ayikwazi ukuxhuma kunethiwekhi okwamanje. Zama futhi ngemva kwesikhashana."</string>
     <string name="registration_done" msgid="495135664535876612">"Ibhalisiwe kwinethiwekhi"</string>
-    <string name="sum_carrier_select" msgid="6526225502314751575">"Khetha u-opheretha wenethiwekhi"</string>
+    <string name="sum_carrier_select" msgid="3494252551249882718">"Khetha inkamapani yenethiwekhi"</string>
     <string name="sum_search_networks" msgid="2921092249873272715">"Sesha wonke amanethiwekhi atholakalayo"</string>
-    <string name="select_automatically" msgid="8615980695510888796">"Khetha ngokuzenzakalelayo"</string>
-    <string name="sum_select_automatically" msgid="8460954604521755275">"Ngokuzenzakalelayo khetha inethiwekhi efisekayo"</string>
-    <string name="register_automatically" msgid="6272031189219101172">"Ukubhalisa okuzenzakalelayo..."</string>
+    <string name="select_automatically" msgid="5628402124471810174">"Khetha ngokuzenzakalela"</string>
+    <string name="sum_select_automatically" msgid="5614890115123292400">"Khetha ngokuzenzakalela inethiwekhi ethandwayo"</string>
+    <string name="register_automatically" msgid="6017849844573519637">"Ukubhalisa okuzenzakalelayo..."</string>
     <string name="preferred_network_mode_title" msgid="8873246565334559308">"Imodi Yenethiwekhi"</string>
     <string name="preferred_network_mode_summary" msgid="1434820673166126609">"Shintsha imodi esebenzayo yenethiwekhi"</string>
     <string name="preferred_network_mode_dialogtitle" msgid="8176355237105593793">"Imodi yenethiwekhi ekhethwayo"</string>
@@ -192,17 +169,17 @@
     <string name="preferred_network_mode_evdo_only_summary" msgid="8472220691721269155">"Imodi yenethiwekhi ekhethwayo: i-EvDo kuphela"</string>
     <string name="preferred_network_mode_lte_cdma_summary" msgid="3722647806454528426">"Imodi yenethiwekhi ekhethwayo: i-LTE/CDMA"</string>
   <string-array name="preferred_network_mode_choices">
-    <item msgid="5886604709726177211">"LTE / CDMA"</item>
+    <item msgid="5543794538185064048">"LTE / CDMA"</item>
     <item msgid="3273348576277144124">"I-EvDo kuphela"</item>
     <item msgid="454610224530856274">"I_CDMA w/o EvDo"</item>
-    <item msgid="8928247118825616081">"I-CDMA / EvDo ezenzakalelayo"</item>
-    <item msgid="8595462903294812666">"Okuzenzakalelayo kwe-GSM /WCDMA"</item>
+    <item msgid="648505122852496166">"I-CDMA / EvDo ezenzakalelayo"</item>
+    <item msgid="7148247646407324800">"Okuzenzakalelayo kwe-GSM /WCDMA"</item>
     <item msgid="5189164180446264504">"I-WCDMA entsha"</item>
     <item msgid="5714714953966979187">"I-GSM kuphela"</item>
-    <item msgid="4775796025725908913">"Okukhethwayo kwe-GSM / WCDMA"</item>
+    <item msgid="8508331239546115206">"Okukhethwayo kwe-GSM / WCDMA"</item>
   </string-array>
   <string-array name="preferred_network_mode_choices_lte">
-    <item msgid="7345284701413565429">"LTE / CDMA"</item>
+    <item msgid="7002474529872452266">"LTE / CDMA"</item>
     <item msgid="5541716989029928208">"CDMA"</item>
   </string-array>
     <string name="data_enabled" msgid="5972538663568715366">"Idatha ivunyelwe"</string>
@@ -210,12 +187,11 @@
     <string name="roaming" msgid="8871412572928323707">"Ukuzulazula kwedatha"</string>
     <string name="roaming_enable" msgid="7331106985174381987">"Xhuma emasevisini edatha uma uzulazula"</string>
     <string name="roaming_disable" msgid="1843417228755568110">"Xhuma emasevisini edatha lapho uzulazula"</string>
-    <string name="roaming_reenable_message" msgid="6973894869473170666">"Ulahlekelwe uxhumano lwedatha ngoba ushiye inethiwekhi yakho yasekhaya inokuzulazula kwedatha okuvuliwe."</string>
+    <string name="roaming_reenable_message" msgid="8913735676127858115">"Ulahlekelwe uxhumano lwedatha ngoba ushiye inethiwekhi yakho yasekhaya inokuzulazula kwedatha okuvuliwe."</string>
     <string name="roaming_warning" msgid="7820963598559553967">"Vumela ukuzulazula kwedatha? Ungase ubhekane nezindleko eziphezulu zokuzulazula!"</string>
     <string name="gsm_umts_options" msgid="6538311689850981686">"Okukhethwa kukho kwe-GSM/UMTS"</string>
     <string name="cdma_options" msgid="4016822858172249884">"Okukhethwa kukho kwe-CDMA"</string>
     <string name="throttle_data_usage" msgid="3715677828160555808">"Ukusebenzisa idatha"</string>
-    <string name="throttle_settings_title" msgid="2761975408383706589">"Inqubomgomo yesiphathi sedatha"</string>
     <string name="throttle_current_usage" msgid="8762280193043815361">"Idatha esebenziswe esikhathini samanje"</string>
     <string name="throttle_time_frame" msgid="1915198770363734685">"Isikhathi sokusebenzisa idatha"</string>
     <string name="throttle_rate" msgid="4710388992676803508">"Inqubomgomo yokukala idatha"</string>
@@ -230,7 +206,6 @@
     <skip />
     <string name="throttle_rate_subtext" msgid="2149102656120726855">"Isilinganiso sedatha sehliselwe ku-<xliff:g id="USED">%1$d</xliff:g> ama-Kb uma ukusebenzisa umkhawulo wedatha ufinyelelwe"</string>
     <string name="throttle_help_subtext" msgid="5217706521499010816">"Olunye ulwazi mayelana nenqubomgomo yokusebenzisa idatha yenethiwekhi yesiphathi sakho sefoni."</string>
-    <string name="cdma_cell_broadcast_sms" msgid="7898475142527341808">"I-SMS Yokusakaza Iseli"</string>
     <string name="cell_broadcast_sms" msgid="5584192824053625842">"I-SMS Yokusakaza Iseli"</string>
     <string name="enable_disable_cell_bc_sms" msgid="4851147873691392255">"I-SMS Yokusakaza ngeSeli"</string>
     <string name="cell_bc_sms_enable" msgid="6441688565738921084">"I-SMS Yokusakaza yeSeli ivunyelwe"</string>
@@ -271,15 +246,6 @@
     <item msgid="1858401628368130638">"isi-Korean"</item>
     <item msgid="1933212028684529632">"isi-Chinese"</item>
     <item msgid="1908428006803639064">"isi-Hebrew"</item>
-  </string-array>
-  <string-array name="list_language_values">
-    <item msgid="1804908636436467150">"1"</item>
-    <item msgid="289708030346890334">"2"</item>
-    <item msgid="1121469729692402684">"3"</item>
-    <item msgid="2614093115912897722">"44"</item>
-    <item msgid="2411164639857960614">"5"</item>
-    <item msgid="5884448729274543324">"6"</item>
-    <item msgid="5511864807618312598">"7"</item>
   </string-array>
     <string name="list_language_dtitle" msgid="5442908726538951934">"Izilimi"</string>
     <string name="enable_disable_local_weather" msgid="986967454867219114">"Isimo Sezulu Sasendaweni"</string>
@@ -309,9 +275,9 @@
     <string name="enable_disable_eo" msgid="4863043263443942494">"Amathuba Omsebenzi"</string>
     <string name="eo_enable" msgid="8623559062015685813">"Amathuba Omsebenzi avunyelwe"</string>
     <string name="eo_disable" msgid="3863812478090907609">"Amathuba Omsebenzi avimbelwe"</string>
-    <string name="enable_disable_mhh" msgid="5698783743098373681">"Ezokwelapha, Ezempilo kanye Nesibhedlela"</string>
-    <string name="mhh_enable" msgid="3949276822735205799">"Ezokwelapha, Ezempilo kanye Nesibhedlela kuvunyelwe"</string>
-    <string name="mhh_disable" msgid="4834280270664925123">"Ezokwelapha, Ezempilo kanye Nesibhedlela kuvimbelwe"</string>
+    <string name="enable_disable_mhh" msgid="908214593528968522">"Ezokwelapha, Ezempilo kanye Nesibhedlela"</string>
+    <string name="mhh_enable" msgid="5544500632306446815">"Ezokwelapha, Ezempilo kanye Nesibhedlela kuvunyelwe"</string>
+    <string name="mhh_disable" msgid="8998210550117117437">"Ezokwelapha, Ezempilo kanye Nesibhedlela kuvimbelwe"</string>
     <string name="enable_disable_technology_news" msgid="3517184627114999149">"Izindaba Zobuchwephese"</string>
     <string name="technology_news_enable" msgid="7995209394210455181">"Izindaba Zobuchwepheshe zivunyelwe"</string>
     <string name="technology_news_disable" msgid="5483490380561851946">"Izindaba Zobuchwepheshe zivimbelwe"</string>
@@ -326,35 +292,17 @@
     <item msgid="8912042051809329533">"I-WCDMA kuphela"</item>
     <item msgid="8776934131146642662">"I-GSM kuphela"</item>
     <item msgid="4684679567848300935">"I-GSM/WCDA (okukhethwayo i-WCDMA)"</item>
-  </string-array>
-  <string-array name="gsm_umts_network_preferences_values">
-    <item msgid="117293148930527265">"0"</item>
-    <item msgid="2264578612775462302">"1"</item>
-    <item msgid="1268081943590316978">"2"</item>
-    <item msgid="4469871047641902607">"3"</item>
   </string-array>
     <string name="prefer_2g" msgid="8442550937280449639">"Sebenzisa kuphela amanethiwekhi e-2G"</string>
     <string name="prefer_2g_summary" msgid="1976491403210690759">"Ilondoloza ibhetri"</string>
     <string name="cdma_system_select_title" msgid="5757657769327732833">"Khetha uhlelo"</string>
-    <string name="cdma_system_select_summary" msgid="2528661990595284707">"Sintsha imodi yokuzulazula ye-cdma"</string>
+    <string name="cdma_system_select_summary" msgid="60460043745797517">"Sintsha imodi yokuzulazula ye-cdma"</string>
     <string name="cdma_system_select_dialogtitle" msgid="6083355415165359075">"Khetha uhlelo"</string>
   <string-array name="cdma_system_select_choices">
     <item msgid="176474317493999285">"Ekhaya kuphela"</item>
     <item msgid="1205664026446156265">"Okuzenzakalelayo"</item>
   </string-array>
-    <string name="cdma_roaming_mode_title" msgid="6366737033053855198">"Imodi Yokuzulazula ye-CDMA"</string>
-    <string name="cdma_roaming_mode_summary" msgid="8604713111805562261">"Shintsha imodi yokuzulazule ye-cdma"</string>
-    <string name="cdma_roaming_mode_dialogtitle" msgid="1802896889172094947">"Imodi yokuzulazula ye-CDMA"</string>
-  <string-array name="cdma_roaming_mode_choices">
-    <item msgid="6024072766548865002">"Amanethiwekhi Asekhaya kuphela"</item>
-    <item msgid="8174642753290624634">"Amanethiwekhi Axhunyiwe"</item>
-    <item msgid="2241951431403168661">"Noma iyiphi inethiwekhi"</item>
-  </string-array>
-  <string-array name="cdma_roaming_mode_values">
-    <item msgid="2549203161367380954">"0"</item>
-    <item msgid="6007798728227141997">"1"</item>
-    <item msgid="4039511109802141047">"2"</item>
-  </string-array>
+    <string name="cdma_subscription_title" msgid="1162564010076763284">"Imali Ekhishelwayo ye-CDMA"</string>
     <string name="cdma_network_preferences_title" msgid="41193174429510391">"Okukhethwayo Kwenethiwekhi ye-CDMA"</string>
     <string name="cdma_network_preferneces_summary" msgid="3524451924935793338">"Azikakasebenziswa okwamanje!"</string>
     <string name="cdma_network_preferences_dialogtitle" msgid="4548860809290455653">"Okukhethwayo kwenethiwekhi ye-CDMA"</string>
@@ -363,21 +311,11 @@
     <item msgid="6143696847467859795">"I-CDMA kuphela"</item>
     <item msgid="2683555124647197574">"I-EvDo kuphela"</item>
   </string-array>
-  <string-array name="cdma_network_preferences_values">
-    <item msgid="5584048199290030331">"0"</item>
-    <item msgid="5741268642513143762">"1"</item>
-    <item msgid="419525200910932450">"2"</item>
-  </string-array>
-    <string name="cdma_subscription_title" msgid="445607520753045412">"Imali Ekhishelwayo ye-CDMA"</string>
     <string name="cdma_subscription_summary" msgid="2530890766115781140">"Shintsha phakathi kwe-RUIM/SIM ne-NV"</string>
     <string name="cdma_subscription_dialogtitle" msgid="2699527950523333110">"Okubhalisile"</string>
   <string-array name="cdma_subscription_choices">
     <item msgid="2258014151300708431">"I_RUIM/SIM"</item>
     <item msgid="5127722015571873880">"NV"</item>
-  </string-array>
-  <string-array name="cdma_subscription_values">
-    <item msgid="7494167883478914080">"0"</item>
-    <item msgid="6043847456049107742">"1"</item>
   </string-array>
     <string name="cdma_activate_device" msgid="3793805892364814518">"Yenza idivaysi isebenze"</string>
     <string name="cdma_lte_data_service" msgid="4255018217292548962">"Setha isevisi yedatha"</string>
@@ -394,18 +332,16 @@
     <string name="sum_fdn" msgid="1959399454900272878">"Phatha Izinombolo Zokudayela Okungaguquki"</string>
     <string name="sum_fdn_change_pin" msgid="6666549734792827932">"Shintsha i-PIN ukuze ufinyelele kwei-FDN"</string>
     <string name="sum_fdn_manage_list" msgid="8431088265332628316">"Phatha uhlu lwenombolo yefoni"</string>
-    <string name="voice_privacy" msgid="7803023024169078619">"Ubumfihlo Bezwi"</string>
+    <string name="voice_privacy" msgid="3776841382844614716">"Ubumfihlo Bezwi"</string>
     <string name="voice_privacy_summary" msgid="3159383389833516214">"Vumela imodi yobumfihlo ithuthukisiwe"</string>
-    <string name="tty_mode_title" msgid="3171521903490559138">"Imodi ye-TTY"</string>
-    <string name="tty_mode_summary" msgid="5057244302665817977">"Vumela imodi ye-TTY"</string>
     <string name="tty_mode_option_title" msgid="9033098925144434669">"Imodi ye-TTY"</string>
     <string name="tty_mode_option_summary" msgid="1073835131534808732">"Hlela imodi ye-TTY"</string>
-    <string name="auto_retry_mode_title" msgid="1478311108889330757">"Zama futhi ngokuzenzakalelayo"</string>
-    <string name="auto_retry_mode_summary" msgid="4921028586041909574">"Vumela imodi Yokuzama Futhi Okuzenzakalelayo"</string>
+    <string name="auto_retry_mode_title" msgid="4073265511427813322">"Zama futhi ngokuzenzakalelayo"</string>
+    <string name="auto_retry_mode_summary" msgid="4973886004067532288">"Vumela imodi Yokuzama Futhi Okuzenzakalelayo"</string>
     <string name="menu_add" msgid="1882023737425114762">"Engeza othintana naye"</string>
     <string name="menu_edit" msgid="7143003705504672374">"Hlela othintana naye"</string>
     <string name="menu_delete" msgid="3977150783449642851">"Susa othintana naye"</string>
-    <string name="get_pin2" msgid="1198225482542827652">"Faka i-PIN2"</string>
+    <string name="get_pin2" msgid="8204677063922225311">"Thayipha i-PIN2"</string>
     <string name="name" msgid="7329028332786872378">"Igama"</string>
     <string name="number" msgid="7905950798349903858">"Inombolo"</string>
     <string name="save" msgid="4094274636321939086">"Londoloza"</string>
@@ -418,56 +354,50 @@
     <string name="delete_fdn_contact" msgid="6668958073074151717">"Susa othintana naye wokudayela okungaguquki"</string>
     <string name="deleting_fdn_contact" msgid="5669163206349319969">"Isusa othintana naye wokudayela okungaguquki..."</string>
     <string name="fdn_contact_deleted" msgid="7154162327112259569">"Othintana naye wokudayela okungaguquki ususiwe"</string>
-    <string name="pin2_invalid" msgid="7176360264228076810">"I-FDN ayibukeziwe: ufake i-PIN engalungile."</string>
-    <string name="fdn_invalid_number" msgid="9193130794297997290">"I-FDN ayibukeziwe: inombolo ayikwazi ukudlula amadijithi angu-20."</string>
+    <string name="pin2_invalid" msgid="5470854099230755944">"I-FDN ayivuselelwanga ngoba uthayiphe i-PIN engalungile."</string>
+    <string name="fdn_invalid_number" msgid="1494755047900009147">"I-FDN ayivuselelwanga ngoba inombolo ayikwazi ukudlula ezinombolweni ezingu-20."</string>
+    <string name="pin2_or_fdn_invalid" msgid="6025144083384701197">"I-FDN ayibuyekeziwe. I-PIN2 kade ingalungile, noma inombolo yefoni yenqatshelwe."</string>
     <string name="simContacts_emptyLoading" msgid="2203331234764498011">"Ifunda ekhadini le-SIM..."</string>
     <string name="simContacts_empty" msgid="5270660846489561932">"Abekho othintana nabo ekhadini lakho le-SIM"</string>
     <string name="simContacts_title" msgid="1861472842524839921">"Khetha othintana nabo ozobangenisa"</string>
-    <string name="simContacts_airplaneMode" msgid="8221701142387137660">"Ukuthatha abaxhumani ekhadini le-SIM, sicla ucishe isimo sendizamshini."</string>
+    <string name="simContacts_airplaneMode" msgid="1846161429087789936">"Ukufaka oxhumana nabo kusuka ekhadini le-SIM, qala ngokucima imodi yeNdiza."</string>
     <string name="enable_pin" msgid="5422767284133234860">"Vumela/Vima i-PIN ye-SI&lt;M"</string>
     <string name="change_pin" msgid="9174186126330785343">"Shintsha i-PIN ye-SIM"</string>
     <string name="enter_pin_text" msgid="8532615714751931951">"I-SIM PIN:"</string>
     <string name="oldPinLabel" msgid="5287773661246368314">"I-PIN endala"</string>
     <string name="newPinLabel" msgid="207488227285336897">"I-PIN entsha"</string>
     <string name="confirmPinLabel" msgid="257597715098070206">"Qinisekisa i-PIN entsha"</string>
-    <string name="badPin" msgid="4154316827946559447">"I-PIN yakudala oyifakile ayilungile. Sicela uzame futhi."</string>
-    <string name="mismatchPin" msgid="5974597541268042785">"Ama-PIN owafakile awafani. Sicela uzame futhi."</string>
+    <string name="badPin" msgid="8955102849303984935">"I-PIN yakudala oyifakile ayilungile. Sicela uzame futhi."</string>
+    <string name="mismatchPin" msgid="5923253370683071889">"AMa-PINs owathayiphile awafani. Zama futhi."</string>
     <string name="invalidPin" msgid="5981171102258684792">"Thayipha i-PIN enezinombolo ezingu-4 kuya kwezingu-8."</string>
     <string name="disable_sim_pin" msgid="3992926931620188855">"Khubaza i-PIN ye-SIM"</string>
     <string name="enable_sim_pin" msgid="5803702443844458831">"Vula i-PIN ye-SIM"</string>
     <string name="enable_in_progress" msgid="3695303775100109650">"Sicela ulinde."</string>
-    <string name="enable_pin_ok" msgid="8077439615296694284">"I-PIN ye-SIM ivuliwe"</string>
-    <string name="disable_pin_ok" msgid="8552428316206928913">"I-PIN ye-SIM ivaliwe."</string>
-    <string name="pin_failed" msgid="6597695909685242127">"I-PIN oyifakile aiylungile"</string>
-    <string name="pin_changed" msgid="9000716792724195093">"I-PIN ye-SIM ishintshwe ngempumelelo"</string>
+    <string name="enable_pin_ok" msgid="9166061915030865848">"I-PIN ye-SIM ivuliwe"</string>
+    <string name="disable_pin_ok" msgid="5596999379593924850">"I-PIN ye-SIM ivaliwe."</string>
+    <string name="pin_failed" msgid="2298841192582192277">"I-PIN oyifakile ayilungile"</string>
+    <string name="pin_changed" msgid="4365538014588501049">"I-PIN ye-SIM ishintshwe ngempumelelo"</string>
     <string name="puk_requested" msgid="3898394204193202803">"Iphasiwedi ayilungile, i-SIM ivaliwe! Kudingena i-PUK2."</string>
     <string name="enter_pin2_text" msgid="8339444124477720345">"I-PIN2"</string>
     <string name="oldPin2Label" msgid="8559146795026261502">"I-PIN2 endala"</string>
     <string name="newPin2Label" msgid="4573956902204349054">"I-PIN entsha"</string>
     <string name="confirmPin2Label" msgid="8100319484454787708">"Qinisekisa i-PIN2 entsha"</string>
-    <string name="badPuk2" msgid="4072035207011308856">"I-PUK2  oyifakile ayilungile. Sicela uzame futhi."</string>
-    <string name="badPin2" msgid="515218795152422178">"I-PIN2 yakudala oyifakile ayilungile. Sicela uzame futhi."</string>
-    <string name="mismatchPin2" msgid="4177060915600342718">"Ama-PIN2 owafakile awafani. Sicela uzame futhi."</string>
+    <string name="badPuk2" msgid="4851734468010000418">"I-PUK2 oyifakile ayilungile. Sicela uzame futhi."</string>
+    <string name="badPin2" msgid="1041576234483629991">"I-PIN2 yakudala oyifakile ayilungile. Sicela uzame futhi."</string>
+    <string name="mismatchPin2" msgid="523029155918113440">"Ama-PIN2s owathayiphile akafani. Zama futhi."</string>
     <string name="invalidPin2" msgid="8237110107480395938">"Thayipha i-PIN2 enezinombolo ezingu-4 kuya kwezingu-8."</string>
     <string name="invalidPuk2" msgid="1290977391033057871">"Thayipha i-PUK2 enezinombolo ezingu-8."</string>
-    <string name="pin2_changed" msgid="2670422162555916562">"I-PIN2 ishintshwe ngempumelelo"</string>
+    <string name="pin2_changed" msgid="1639666438836544393">"I-PIN2 ishintshwe ngokuphumelelayo"</string>
     <string name="label_puk2_code" msgid="302845876240219560">"Thayipha ikhodi ye-PUK2"</string>
-    <string name="fdn_enable_puk2_requested" msgid="2608836967081385948">"Iphasiwedi ayilungile, sicela ushintshe i-PIN2 bese uzama futhi!"</string>
-    <string name="puk2_requested" msgid="5863580927788820813">"Iphasiwedi ayilungile, i-SIM ivaliwe! Kudingena i-PUK2."</string>
+    <string name="fdn_enable_puk2_requested" msgid="4262894949634885773">"Iphasiwedi ayilungile, sicela ushintshe i-PIN2 bese uzama futhi!"</string>
+    <string name="puk2_requested" msgid="8909278021238716877">"Iphasiwedi ayilungile, i-SIM ivaliwe! Kudingena i-PUK2."</string>
     <string name="doneButton" msgid="2859593360997984240">"Kwenziwe"</string>
     <string name="caller_manage_header" msgid="3231519674734638786">"Ikholi yengqungquthela <xliff:g id="CONF_CALL_TIME">%s</xliff:g>"</string>
-    <string name="caller_manage_manage_done_text" msgid="8093934725536733856">"Buyela ocingweni"</string>
-    <string name="sim_missing_continueView_text" msgid="4199689081742026077">"Qhubeka ngaphandle kwekhadi le-SIM"</string>
-    <string name="sim_missing_msg_text" msgid="6803619600564142188">"Alikho ikhadi le-SIM elitholakele. Sicela ufake ikhadi le-SIM efonini."</string>
-    <string name="sim_unlock_dismiss_text" msgid="8292343981739813597">"Cashisa"</string>
-    <string name="sim_unlock_unlock_text" msgid="6328406783399256930">"Vula"</string>
-    <string name="sim_unlock_status_text" msgid="1919609683384607179">"Iqinisekisa i-PIN..."</string>
     <string name="voicemail_settings_number_label" msgid="8524164258691887790">"Inombolo yevoyisimeyili"</string>
     <string name="card_title_dialing" msgid="5769417478498348054">"Iyadayela"</string>
     <string name="card_title_redialing" msgid="4831412164303596395">"Izama futhi"</string>
     <string name="card_title_conf_call" msgid="1162980346189744501">"Ikholi yengqungquthela"</string>
     <string name="card_title_incoming_call" msgid="7364539451234646909">"Ikholi engenayo"</string>
-    <string name="card_title_cdma_call_waiting" msgid="4532445524811272644">"Ucingo olulindile le-Cdma"</string>
     <string name="card_title_call_ended" msgid="5544730338889702298">"Ikholi iqediwe"</string>
     <string name="card_title_on_hold" msgid="821463117892339942">"Ibambile"</string>
     <string name="card_title_hanging_up" msgid="3999101620995182450">"Iyavala"</string>
@@ -477,7 +407,7 @@
     <string name="notification_missedCallsTitle" msgid="1361677948941502522">"Izincingo ezikulahlekele"</string>
     <string name="notification_missedCallsMsg" msgid="4575787816055205600">"<xliff:g id="NUM_MISSED_CALLS">%s</xliff:g> amakholi akulahlekele"</string>
     <string name="notification_missedCallTicker" msgid="504686252427747209">"Ulahlekelwe izincingo eziphuma ku <xliff:g id="MISSED_CALL_FROM">%s</xliff:g>"</string>
-    <string name="notification_ongoing_call_format" msgid="227216462548540316">"Ucingo lwamanje <xliff:g id="DURATION">%s</xliff:g>"</string>
+    <string name="notification_ongoing_call" msgid="7068688957273482989">"Ikholi eqhubekayo"</string>
     <string name="notification_on_hold" msgid="3480694969511790465">"Ibambile"</string>
     <string name="notification_incoming_call" msgid="2820429205043529642">"Ikholi engenayo"</string>
     <string name="notification_voicemail_title" msgid="8933468752045550523">"Umlayezo wezwi omusha"</string>
@@ -486,14 +416,16 @@
     <string name="notification_voicemail_no_vm_number" msgid="760963466895609716">"Inombolo yevoyisimeyili ayaziwa"</string>
     <string name="notification_network_selection_title" msgid="4224455487793492772">"Ayikho isevisi"</string>
     <string name="notification_network_selection_text" msgid="2607085729661923269">"Inethiwekhi ekhethiwe <xliff:g id="OPERATOR_NAME">%s</xliff:g> ayitholakali"</string>
+    <string name="notification_action_end_call" msgid="6069460915123531620">"Vala ikholi"</string>
+    <string name="notification_missedCall_call_back" msgid="2684890353590890187">"Phinda ushaye"</string>
+    <string name="notification_missedCall_message" msgid="3049928912736917988">"Umlayezo"</string>
     <string name="incall_error_power_off" msgid="6550191216405193368">"Ukwenza ikholi, vala kuqala imodi Yendiza."</string>
     <string name="incall_error_emergency_only" msgid="4678640422710818317">"Ayibhalisiwe kwinethiwekhi."</string>
     <string name="incall_error_out_of_service" msgid="8587993036435080418">"Inethiwekhi yefoni ayitholakali"</string>
     <string name="incall_error_no_phone_number_supplied" msgid="4197432103471807739">"Ikholi ayithunyelwanga, ayikho inombolo elungile efakiwe."</string>
     <string name="incall_error_call_failed" msgid="4313552620858880999">"Ikholi ayithunyelwanga."</string>
     <string name="incall_status_dialed_mmi" msgid="3672498861336189563">"Iqalisa ukulandelana kwe-MMI..."</string>
-    <string name="incall_status_dialed_fc" msgid="1632879988662225263">"Ukuqalisa ukulandelana kwekhodi yesici..."</string>
-    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Insizakalo engasekelwe."</string>
+    <string name="incall_error_supp_service_unknown" msgid="2991054870745666038">"Isevisi engasekelwe."</string>
     <string name="incall_error_supp_service_switch" msgid="3503552565745872241">"Ayikwazi ukushintsha izincingo"</string>
     <string name="incall_error_supp_service_separate" msgid="914362338192301746">"Ayikwazi ukwehlukanisa ucingo."</string>
     <string name="incall_error_supp_service_transfer" msgid="2509871374644921632">"Ayikwazi ukudlulisa ucingo."</string>
@@ -504,18 +436,13 @@
     <string name="emergency_enable_radio_dialog_title" msgid="4627849966634578257">"Ikholi ephuthumayo"</string>
     <string name="emergency_enable_radio_dialog_message" msgid="207613549344420291">"Ivula umsakazo..."</string>
     <string name="emergency_enable_radio_dialog_retry" msgid="3724423402363063736">"Indawo engenayo isevisi, iyazama futhi..."</string>
-    <string name="dial_emergency_error" msgid="8362624131726575194">"Ikholi ayithunyelwe, <xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> akuyona inombolo ephuthumayo!"</string>
-    <string name="dial_emergency_empty_error" msgid="5048645338094088229">"Ikholi ayithunyelwanga, sicela udayela inombolo ephuthumayo!"</string>
+    <string name="dial_emergency_error" msgid="7969515493359619960">"Ikholi ayithunyelwe. I-<xliff:g id="NON_EMERGENCY_NUMBER">%s</xliff:g> akuyona inombolo ephuthumayo!"</string>
+    <string name="dial_emergency_empty_error" msgid="5556166819619323893">"Ikholi ayithunyelwanga, sicela udayela inombolo ephuthumayo!"</string>
     <string name="dialerKeyboardHintText" msgid="9192914825413747792">"Sebenzisa ikhibhodi ukudayela"</string>
-    <string name="dtmfDialpadHintText" msgid="2153335217920679451">"Thinta ikhiphedi yethoni"</string>
     <string name="onscreenHoldText" msgid="2285258239691145872">"Bamba"</string>
-    <string name="onscreenUnholdText" msgid="5033582269005230794">"Ukungabambi"</string>
     <string name="onscreenEndCallText" msgid="4403855834875398585">"Qeda"</string>
     <string name="onscreenShowDialpadText" msgid="8561805492659639893">"Iphedi yokudayela"</string>
-    <string name="onscreenHideDialpadText" msgid="2572388822571686252">"Fihla"</string>
-    <string name="onscreenSpeakerText" msgid="9013795366801657948">"Isipikha"</string>
     <string name="onscreenMuteText" msgid="5011369181754261374">"Thulisa"</string>
-    <string name="onscreenBluetoothText" msgid="2479639597725504499">"I-Bluetooth"</string>
     <string name="onscreenAddCallText" msgid="5140385634712287403">"Yengeza ikholi"</string>
     <string name="onscreenMergeCallsText" msgid="6640195098064538950">"Hlanganisa amakholi"</string>
     <string name="onscreenSwapCallsText" msgid="1602990689244030047">"Shintsha"</string>
@@ -534,36 +461,31 @@
     <item msgid="1937509904407445684">"I-TTY HCO"</item>
     <item msgid="5644925873488772224">"I-TTY VCO"</item>
   </string-array>
-    <string name="eri_text_label" msgid="4326942349915331461">"Umbhalo we-ERI"</string>
-    <string name="dtmf_tones_title" msgid="3866923093113274152">"Amathoni e-DTMF"</string>
+    <string name="dtmf_tones_title" msgid="5163153771291340803">"Amathoni e-DTMF"</string>
     <string name="dtmf_tones_summary" msgid="3351820372864020331">"Hlela ubude bamathoni e-DTMF"</string>
   <string-array name="dtmf_tone_entries">
     <item msgid="899650777817315681">"Jwayelekile"</item>
     <item msgid="2883365539347850535">"Kude"</item>
   </string-array>
-    <string name="network_message" msgid="5673682885938122239">"Umyalezo Wenethiwekhi"</string>
+    <string name="network_message" msgid="4483886461245213802">"Umlayezo Wenethiwekhi"</string>
     <string name="ota_title_activate" msgid="8616918561356194398">"Yenza ifoni yakho isebenze"</string>
-    <string name="ota_touch_activate" msgid="6553212803262586244">"Ikholi ekhethekile kumele yenziwe ukuze wenze insizakalo yefoni yakho isebenze."\n\n"Emva kokucindezela \"Yenza kusebenze\", lalela iziqondiso ezinikeziwe ukwenza ifoni yakho isebenze."</string>
-    <string name="ota_touch_activate_new" msgid="4508197891732183852">"Thinta \"Yenza kusebenze\" ukwenza ucingo olukhethekile olwenza ifoni yakho isebenze kwinethiwekhi yefoni yesiphathi, ngakho ke ungenza amakholi bese uxhuma kumanethiwekhi edatha yefoni."</string>
+    <string name="ota_touch_activate" msgid="6553212803262586244">"Ikholi ekhethekile kumele yenziwe ukuze wenze isevisi yefoni yakho isebenze."\n\n"Emva kokucindezela \"Yenza kusebenze\", lalela iziqondiso ezinikeziwe ukwenza ifoni yakho isebenze."</string>
     <string name="ota_skip_activation_dialog_title" msgid="2943366608272261306">"Yeqa ukwenza kusebenze?"</string>
     <string name="ota_skip_activation_dialog_message" msgid="2440770373498870550">"Uma weqa ukwenza kusebenze, awukwazi ukwenza izincingo noma xhuma kumanethiwekhi edatha yefoni (nakuba ungakwazi ukuxhuma kumanethiwekhi e-Wi-Fi). Kuze kube yilapho wenza ifoni yakho isebenze, ucelwa ukuba wenze isebenze"</string>
     <string name="ota_skip_activation_dialog_skip_label" msgid="3458532775091563208">"Yeqa"</string>
-    <string name="ota_skip_activation_dialog_continue_label" msgid="4343765820509664362">"Yenza kusebenze"</string>
     <string name="ota_activate" msgid="1368528132525626264">"Yenza kusebenze"</string>
-    <string name="ota_title_activate_success" msgid="3344632328991980578">"Ifoni yenziwe yasebenza!"</string>
+    <string name="ota_title_activate_success" msgid="6570240212263372046">"Ifoni yenziwe yasebenza!"</string>
     <string name="ota_title_problem_with_activation" msgid="7095824491970084367">"Inkinga yokwenza kusebenze"</string>
     <string name="ota_listen" msgid="162923839877584937">"Landela iziqondiso ezikhulunyiwe kuze kube yilapho uzwa ukuthi ukwenza kusebenze kuqedile."</string>
-    <string name="ota_dialpad" msgid="3530900997110658409">"Ikhiphedi"</string>
     <string name="ota_speaker" msgid="6904589278542719647">"Isipikha"</string>
-    <string name="ota_progress" msgid="4644512049143969504">"Sicela ulinde ngenkathi ifoni ihlelwa."</string>
-    <string name="ota_failure" msgid="8600027551822478181">"Ukuhlela Akuphumelelanga"</string>
-    <string name="ota_successful" msgid="1880780692887077407">"Ifoni yakho manje iyasebenza. Kungase kuthathe amaminithi angu-15 ukuze insizakalo iqale."</string>
-    <string name="ota_unsuccessful" msgid="623361244652068739">"Ifoni yakho ayizange isebenze. "\n"Kungase kudingeke ukuba uthole indawo enenethiwekhi (eduze kwefasitela, noma ngaphandle)."\n\n"Zama futhi noma shayela insizakalo yekhasimende ukutholo okunye okukhethwayo."</string>
+    <string name="ota_progress" msgid="3420314892609254729">"Sicela ulinde ngenkathi ifoni ihlelwa."</string>
+    <string name="ota_failure" msgid="4311299546379674378">"Ukuhlela Akuphumelelanga"</string>
+    <string name="ota_successful" msgid="1880780692887077407">"Ifoni yakho manje iyasebenza. Kungase kuthathe amaminithi angu-15 ukuze isevisi iqale."</string>
+    <string name="ota_unsuccessful" msgid="8072141612635635357">"Ifoni yakho ayizange isebenze. "\n"Kungase kudingeke ukuba uthole indawo enenethiwekhi (eduze kwefasitela, noma ngaphandle)."\n\n"Zama futhi noma shayela isevisi yekhasimende ukutholo okunye okukhethwayo."</string>
     <string name="ota_spc_failure" msgid="3909983542575030796">"FINYELELA UKWEHLULEKA KWE-SPC"</string>
     <string name="ota_call_end" msgid="4537279738134612388">"Emuva"</string>
     <string name="ota_try_again" msgid="7685477206465902290">"Zama futhi"</string>
     <string name="ota_next" msgid="3904945374358235910">"Okulandelayo"</string>
-    <string name="ota_back" msgid="2190038043403850052">"Emuva"</string>
     <string name="ecm_exit_dialog" msgid="4448531867763097533">"EcmPhuma Kwingxoxo"</string>
     <string name="phone_entered_ecm_text" msgid="6266424252578731203">"Ingene Kwimdoi Yokuphinda Ukushayela Okuphuthumayo"</string>
     <string name="phone_in_ecm_notification_title" msgid="3226896828951687085">"Imodi Yokuphinda Ukushayela Okuphuthumayo"</string>
@@ -573,87 +495,69 @@
     <item quantity="other" msgid="3122217344579273583">"Alukho uxhumano lwamaminithi angu-<xliff:g id="COUNT">%s</xliff:g>"</item>
   </plurals>
   <plurals name="alert_dialog_exit_ecm">
-    <item quantity="one" msgid="2181569650640386253">"Ifoni izoba kwimodi yokuphinda ukushayela okuphuthumayo kwemizuzu engu-<xliff:g id="COUNT">%s</xliff:g>. Ngenkathi ikule modi azikho izinhlelo zokusebenza ezisebenzisa uxhumano lwedatha ezingasebenziswa. Ingabe ungathanda ukuphuma manje?"</item>
-    <item quantity="other" msgid="3231879566243957821">"Ifoni izoba kwimodi yokuphinda ukushayela okuphuthumayo amaminithi angu-<xliff:g id="COUNT">%s</xliff:g>. Ngenkathi ikulemodi azikho izinhlelo zokusebenza ezingasetshenziswa kusebenziswa uxhumano lwedatha. Ingabe ungathanda ukuphuma manje?"</item>
+    <item quantity="one" msgid="8060210887681426682">"Ucingo luzoba semodini ye-Emergency Callback amaminithi angu-<xliff:g id="COUNT">%s</xliff:g>. Ngenkathi ikule modi awekho ama-apps asebenzisa ukuxhumana kwedatha angasetshenziswa. Ufuna ukuphuma manje?"</item>
+    <item quantity="other" msgid="8617116564023933114">"Ucingo luzoba semodini ye-Emergency Callback amaminithi angu-<xliff:g id="COUNT">%s</xliff:g>. Ngenkathi ikule modi azikho izinhlelo ezisebenzisa ukuxhumana kwedatha ezingasetshenziswa. Ufuna ukuphuma manje?"</item>
   </plurals>
   <plurals name="alert_dialog_not_avaialble_in_ecm">
-    <item quantity="one" msgid="8939225905428421722">"Isenzo esikhethiwe asitholakali ngenkathi ikwimodi yokuphinda ukushaya ephuthumayo. Ifoni izoba kwilemodi amaminithi angu- <xliff:g id="COUNT">%s</xliff:g>. Ungathanda ukuphuma manje?"</item>
-    <item quantity="other" msgid="3489076611710869904">"Isenzo esikhethiwe asitholakali ngenkathi ukwimodi yokuphinda kushayela ephuthumayo. Ifoni izoba kulemodi amaminithi angu- <xliff:g id="COUNT">%s</xliff:g>. Ungathanda ukuphuma manje?"</item>
+    <item quantity="one" msgid="2585506997024726599">"Isenzo esikhethiwe asitholakali uma usemodini ye-Emergency Callback. Ucingo luzoba kule modi amaminithi angu-<xliff:g id="COUNT">%s</xliff:g>. Ufuna ukuphuma manje?"</item>
+    <item quantity="other" msgid="6115622137771382224">"Isenzo esikhethiwe asitholakali ngenkathi ukumodi ye-Emergency Callback. Ucingo luzoba kule modi amaminithi angu-<xliff:g id="COUNT">%s</xliff:g>. Ufuna ukuphuma manje?"</item>
   </plurals>
-    <string name="alert_dialog_in_ecm_call" msgid="2334477874583086142">"Isenzo esikhethiwe asitholakali ngenkathi usocingweni oluphuthumayo"</string>
-    <string name="progress_dialog_exiting_ecm" msgid="8751952246695857820">"Ikhipha Imodi Yokuphinda Ukushaya Okuphuthumayo"</string>
+    <string name="alert_dialog_in_ecm_call" msgid="1886723687211887104">"Isenzo esikhethiwe asitholakali ngenkathi usocingweni oluphuthumayo"</string>
+    <string name="progress_dialog_exiting_ecm" msgid="4835734101617817074">"Ikhipha Imodi Yokuphinda Ukushaya Okuphuthumayo"</string>
     <string name="alert_dialog_yes" msgid="6674268047820703974">"Yebo"</string>
     <string name="alert_dialog_no" msgid="1476091437797628703">"Cha"</string>
     <string name="alert_dialog_dismiss" msgid="2491494287075907171">"Susa"</string>
-    <string name="voicemail_settings" msgid="2288633492587133022">"Izilungiselelo zemeyili yezwi"</string>
-    <string name="voicemail_number_not_set" msgid="1604580506447265808">"ayisethiwe"</string>
-    <string name="voicemail_provider" msgid="6299679757491942924">"Insizakalo yemeyili yezwi"</string>
-    <string name="voicemail_settings_for" msgid="9018656268027893088">"Izilungiselelo ze-<xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
+    <string name="voicemail_provider" msgid="5135942703327136909">"Isevisi"</string>
+    <string name="voicemail_settings" msgid="72448049107749316">"Ukumisa"</string>
+    <string name="voicemail_number_not_set" msgid="6724904736891087856">"&lt;Ayisethiwe&gt;"</string>
     <string name="other_settings" msgid="3672912580359716394">"Ezinye izilungiselelo zekholi"</string>
-    <string name="dial_button_label" msgid="5551611636419190229">"Dayela"</string>
-    <string name="calling_via_template" msgid="7374498518104190489">"Ishayela nge ^1 "\n<b>"^2"</b></string>
-    <string name="slide_to_answer" msgid="255903188611244476">"Donsela ngokwesokudla ukuphendula"</string>
-    <string name="slide_to_silence" msgid="2224982696981131553">"Donsela ngokwesokunxele ukuthulisa isikhali"</string>
-    <string name="slide_to_decline" msgid="7342094219435077069">"Donsela ngokwesokunxele ukwenqaba"</string>
-    <string name="slide_to_answer_and_hold" msgid="9212596323067601245">"Donsela ngokwesokudla ukuphendula "\n"bese ubambisa ikholi okade ukuyo"</string>
-    <string name="slide_to_answer_and_end_active" msgid="6473719408670133380">"Donsela ngokwesokudla ukuphendula bese"\n"umisa ucingo"</string>
-    <string name="slide_to_answer_and_end_onhold" msgid="638748048960663506">"Donsela ngokwesokudla ukuphendula bese"\n"uphothula ikholi ekulindile"</string>
-    <string name="slide_to_answer_hint" msgid="4901042355463593903">"Phendula"</string>
-    <string name="slide_to_decline_hint" msgid="4484576372463030324">"Nqaba"</string>
+    <string name="calling_via_template" msgid="4839419581866928142">"Ishaya ucingo nge <xliff:g id="PROVIDER_NAME">%s</xliff:g>"</string>
     <string name="contactPhoto" msgid="4713193418046639466">"isithombe sothintana naye"</string>
     <string name="goPrivate" msgid="865837794424530980">"yenza kube imfihlo"</string>
     <string name="selectContact" msgid="781975788478987237">"khetha othintana naye"</string>
     <string name="sip_settings" msgid="6699045718560859691">"Izilungiselelo zekholi ye-Inthanethi"</string>
     <string name="sip_accounts" msgid="2097054001288457163">"Ama-akhawunti okushayela nge-Inthanethi (SIP)"</string>
     <string name="sip_accounts_title" msgid="1212889069281054570">"Ama-akhawunti"</string>
-    <string name="sip_accounts_summary" msgid="6812629993146552527">"Phatha ama-akhawunti okufona nge-Inthanethi (SIP) kanye nesimo"</string>
     <string name="sip_receive_calls" msgid="5635685570889971559">"Thola amakholi angenayo"</string>
     <string name="sip_receive_calls_summary" msgid="8403613238633679184">"Yehlisa ukuphila kwebhetri"</string>
-    <string name="sip_call_options" msgid="7128315120104066133">"Misa okukhethwa kukho kwekholi"</string>
     <string name="sip_call_options_title" msgid="27433718808839672">"Sebenzisa ukushayela nge-Inthanethi"</string>
     <string name="sip_call_options_wifi_only_title" msgid="145572394529090811">"Sebenzisa ukushayela nge-Inthanethi (i-Wi-Fi kuphela)"</string>
     <string name="sip_call_options_entry_1" msgid="6556668894178520760">"Yamakholi wonke uma uxhumano lwedatha lutholakala"</string>
     <string name="sip_call_options_entry_2" msgid="6789764029719494361">"Amakholi e-Inthanethi kuphela"</string>
     <string name="sip_call_options_entry_3" msgid="7474809001402649185">"Cela ikholi ngayinye"</string>
     <string name="sip_call_options_wifi_only_entry_1" msgid="7423523864471650069">"Yamakholi wonke"</string>
-    <string name="auto_reg" msgid="8150163311655081599">"Ukubhalisa okuzenzakalelayo"</string>
-    <string name="call_priority" msgid="8374917577270504387">"Ikholi ephumayo nge-SIP"</string>
     <string name="pick_outgoing_call_phone_type" msgid="5622916534828338675">"Yenza ikholi"</string>
     <string name="pick_outgoing_sip_phone" msgid="7012322118236208875">"Sebenzisa i-akhawunti yokushayela nge-Inthanethi:"</string>
     <string name="remember_my_choice" msgid="7058059586169290705">"Njalo sebenzisa ukwenza izincingo nge-Inthanethi"</string>
-    <string name="reset_my_choice_hint" msgid="8522825056755061594">"Ungasebenzisa izilungiselelo Zekholi ukushintsha ukuthi iyiphi i-akhawunti yokufona nge-Inthanethi ongayisebenzisa ngokumisiwe lapho wenza izincingo, ngokukhetha i-akhawunti ehlukene ngaphansi kwezilungiselelo zokufona nge-Inthanethi"</string>
+    <string name="reset_my_choice_hint" msgid="5523030209803567922">"Ungashintsha ukuthi iyiphi i-akhawunti yokushaya ye-Inthanethi ongayisebenzisa ngokwakhona kusuka Ocingweni &gt; Izilungisele &gt; Izilungiselelo zokushaya ze-inthanethi &gt; Ukubukwa kwama-Akhawunti."</string>
     <string name="pstn_phone" msgid="8782554491484326429">"Ikholi yeselula foni"</string>
     <string name="internet_phone" msgid="1147922660195095810">"Ikholi ye-Inthanethi"</string>
     <string name="no_sip_account_found_title" msgid="6266249392379373628">"Ayikho i-akhawunti yokushayela nge-Inthanethi"</string>
-    <string name="no_sip_account_found" msgid="8777818244108212791">"Awekho ama-akhawunti okufona nge-Inthanethi kulefoni. Faka entsha manje?"</string>
+    <string name="no_sip_account_found" msgid="724325811961769997">"Awekho ama-akhawunti okushaya we-inthanethi kulolu cingo. Ufuna ukuwangeza manje?"</string>
     <string name="sip_menu_add" msgid="8757508498518881500">"Yengeza"</string>
     <string name="add_sip_account" msgid="5904858426290097611">"Yengeza i-akhawunti"</string>
     <string name="remove_sip_account" msgid="7645900420385682570">"Susa i-akhawunti"</string>
     <string name="sip_account_list" msgid="5480058210652194306">"Ama-akhawunti e-SIP"</string>
-    <string name="saving_account" msgid="7468818916695729968">"Igcina i-akhawunti..."</string>
-    <string name="removing_account" msgid="5569334415898924904">"Ikhipha i-akhawunti..."</string>
+    <string name="saving_account" msgid="52903398217017954">"Ilondolza i-akhawunti..."</string>
+    <string name="removing_account" msgid="7183999896088628100">"Ikhipha i-akhawunti..."</string>
     <string name="sip_menu_save" msgid="5842531129356014943">"Londoloza"</string>
     <string name="sip_menu_discard" msgid="524075892158789701">"Lahla"</string>
     <string name="alert_dialog_close" msgid="7759635137627626235">"Vala iphrofayli"</string>
     <string name="alert_dialog_ok" msgid="3580379406983564080">"KULUNGILE"</string>
     <string name="close_profile" msgid="6886968271423155284">"Vala"</string>
-    <string name="primary_account" msgid="2229538308291934245">"Qalisayo"</string>
-    <string name="primary_account_title" msgid="5694267218020951531">"Yenza lokhu kube i-akhawunti yami eyinhloko"</string>
-    <string name="primary_account_summary" msgid="7339564526372623187">"Isetshenziselwa izincingo eziphumayo"</string>
-    <string name="advanced_settings_title" msgid="8846648727128452293">"Izilungiselelo ezithuthukisiwe"</string>
     <string name="primary_account_summary_with" msgid="1633960536212343187">"I-akhawunti eyinhloko. <xliff:g id="REGISTRATION_STATUS">%s</xliff:g>"</string>
     <string name="registration_status_checking_status" msgid="3381868307694056727">"Ihlola isimo..."</string>
-    <string name="registration_status_registering" msgid="7115694971025999516">"Iyabhalisa..."</string>
-    <string name="registration_status_still_trying" msgid="1471733478935862864">"Isazama..."</string>
-    <string name="registration_status_not_receiving" msgid="5011399017106466965">"Ayitholi amakholi"</string>
-    <string name="registration_status_no_data" msgid="8279587001454092132">"Ukubhalisela i-akhawunti kumile ngoba alukho uxhumano lwe-Inthanethi"</string>
-    <string name="registration_status_no_wifi_data" msgid="6698550648571450078">"Ukubhalisa i-akhawunti kumile ngoba alukho uxhumano lwe-Wi-Fi"</string>
-    <string name="registration_status_not_running" msgid="3826034902272084289">"Ukubhalisa i-akhawunti kwehlulekile"</string>
-    <string name="registration_status_done" msgid="6434927607037752239">"Ithola amakholi"</string>
+    <string name="registration_status_registering" msgid="4288401139400232968">"Iyabhalisa..."</string>
+    <string name="registration_status_still_trying" msgid="3185581992666091911">"Isazama..."</string>
+    <string name="registration_status_not_receiving" msgid="4185572774980557758">"Ayitholi amakholi"</string>
+    <string name="registration_status_no_data" msgid="4901476962360656611">"Ukubhalisela i-akhawunti kumile ngoba alukho uxhumano lwe-Inthanethi"</string>
+    <string name="registration_status_no_wifi_data" msgid="4038976374713018067">"Ukubhalisa i-akhawunti kumile ngoba alukho uxhumano lwe-Wi-Fi"</string>
+    <string name="registration_status_not_running" msgid="4824867184446232131">"Ukubhalisa i-akhawunti kwehlulekile"</string>
+    <string name="registration_status_done" msgid="884630717456439280">"Ithola amakholi"</string>
     <string name="registration_status_failed_try_later" msgid="5214474354451220581">"Ukubhalisa i-akhawunti kwehlulekile: (<xliff:g id="REGISTRATION_ERROR_MESSAGE">%s</xliff:g>); izozama emva kwesikhathi"</string>
-    <string name="registration_status_invalid_credentials" msgid="85887803757211092">"Ukubhalisela i-akhawunti kwehlulekile: igama lomsebenzisi elingalungile noma iphasiwedi"</string>
-    <string name="registration_status_server_unreachable" msgid="9138794150602726009">"Ukubhalisa i-akhawunti kwehlulekile: sicela uhlole igama leseva"</string>
-    <string name="third_party_account_summary" msgid="1069915789382987226">"Le akhawunti okwamanje isebenziswa <xliff:g id="ACCOUNT_OWNER">%s</xliff:g> uhlelo lokusebenza"</string>
+    <string name="registration_status_invalid_credentials" msgid="4908446367559341757">"Ukubhalisela i-akhawunti kwehlulekile: igama lomsebenzisi noma iphasiwedi elingalungile"</string>
+    <string name="registration_status_server_unreachable" msgid="5733421582468991276">"Ukubhalisa i-akhawunti kwehlulekile: sicela uhlole igama leseva"</string>
+    <string name="third_party_account_summary" msgid="2532526738862533028">"Le akhawunti okwamanje isetshenziswa i-app ye-<xliff:g id="ACCOUNT_OWNER">%s</xliff:g>."</string>
     <string name="sip_edit_title" msgid="489288416435014385">"Imininingwane ye-akhawunti ye-SIP"</string>
     <string name="sip_edit_new_title" msgid="3659149255856520385">"Imininingwane ye-akhawunti ye-SIP"</string>
     <string name="domain_address_title" msgid="9071787581316160480">"Iseva"</string>
@@ -664,9 +568,6 @@
     <string name="port_title" msgid="5952939408078626657">"Inombolo yembobo"</string>
     <string name="transport_title" msgid="8253139511847746640">"Uhlobo lokuhamba"</string>
     <string name="send_keepalive_title" msgid="7533342573918645113">"Thumula gcina kuphila"</string>
-    <string name="send_keepalive_summary" msgid="9038969409950960640">"Thumela imiyalezo yokugcina kuphila"</string>
-    <string name="auto_registration_title" msgid="3586777375420122154">"Ukubhalisa okuzenzakalelayo"</string>
-    <string name="auto_registration_summary" msgid="2522794041206619280">"Bhalisa iphrofayli ngokuzenzakalelayo"</string>
     <string name="set_primary_title" msgid="5351892327447571451">"Misa njenge-akhawunti eyinhloko"</string>
     <string name="set_primary_summary" msgid="2219064654523258577">"Setshenziselwa izincingo eziphumayo"</string>
     <string name="advanced_settings" msgid="8350631795335495338">"Izilungiselelo zokuzikhethela"</string>
@@ -677,12 +578,12 @@
     <string name="optional_summary" msgid="1464058793789832411">"&lt;Okokuzikhethela&gt;"</string>
     <string name="advanced_settings_show" msgid="4668880308290857597">"▷ Thinta ukubonisa konke"</string>
     <string name="advanced_settings_hide" msgid="217398292824758079">"▽ Thinta ukufihla konke"</string>
-    <string name="empty_alert" msgid="8177828109581557940">"<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> iyadingeka, ayikwazi ukungabi nalutho"</string>
-    <string name="not_a_valid_port" msgid="5750410768271782606">"Inombolo yembobo kumele ibe phakathi kuka-100 no-65534"</string>
+    <string name="empty_alert" msgid="6839103946505432390">"I-<xliff:g id="INPUT_FIELD_NAME">%s</xliff:g> iyadingeka, ayikwazi ukungabi nalutho"</string>
+    <string name="not_a_valid_port" msgid="4796149266434630292">"Inombolo yembobo kumele ibe phakathi kuka-100 no-65534"</string>
     <string name="no_internet_available_title" msgid="3327109242858406165">"Alukho uxhumano lwe-Inthanethi"</string>
     <string name="no_wifi_available_title" msgid="747881033089378758">"Alukho uxhumano lwe-Wi-Fi"</string>
-    <string name="no_internet_available" msgid="1100564991026313234">"Ukwenza ikholi nge-Inthanethi, hlola kuqala uxhumano lwakho lwe-Inthanethi"</string>
-    <string name="no_wifi_available" msgid="3389743006886634541">"Kumele uxhumeke kwinethiwekhi ye-Wi-Fi ukwenza amakholi nge-Inthanethi (sebenzisa izilungiselelo Zenethiwekhi Engenantambo &amp;)"</string>
+    <string name="no_internet_available" msgid="7877142631803238549">"Ukwenza ikholi nge-Inthanethi, hlola kuqala uxhumano lwakho lwe-Inthanethi"</string>
+    <string name="no_wifi_available" msgid="1225073547318465713">"Kumele uxhumeke kwinethiwekhi ye-Wi-Fi ukwenza amakholi nge-Inthanethi (sebenzisa izilungiselelo Zenethiwekhi; Nokungenantambo)"</string>
     <string name="no_voip" msgid="8901474054537199865">"Ukushayela nge-Inthanethi akusekelwe"</string>
     <string name="sip_system_decide" msgid="368030746310423471">"Okuzenzakalelayo"</string>
     <string name="sip_always_send_keepalive" msgid="8192080724632877132">"Thumela njalo"</string>
@@ -691,7 +592,7 @@
     <string name="respond_via_sms_canned_response_2" msgid="4074450431532859214">" Ngizophinde ngikushayele ucingo."</string>
     <string name="respond_via_sms_canned_response_3" msgid="3496079065723960450">"Ngizokushayela ucingo emva kwesikhathi"</string>
     <string name="respond_via_sms_canned_response_4" msgid="1698989243040062190">"Angikwazi ukukhuluma okwamanje. Ngicela uphinde ungishayele ucingo kamuva?"</string>
-    <string name="respond_via_sms_custom_message" msgid="4911568567889429624">"Umlayezo ngokwezifiso..."</string>
+    <string name="respond_via_sms_custom_message" msgid="6648174777301028017">"Umlayezo ngokwezifiso..."</string>
     <string name="respond_via_sms_setting_title" msgid="3754000371039709383">"Izimpendulo ezisheshayo"</string>
     <string name="respond_via_sms_setting_title_2" msgid="6104662227299493906">"Hlela izimpendulo ezisheshayo"</string>
     <string name="respond_via_sms_setting_summary" msgid="9150281183930613065"></string>
@@ -709,7 +610,6 @@
     <string name="description_image_button_star" msgid="1976280813017254462">"inkanyezi"</string>
     <string name="description_image_button_zero" msgid="4211255756866893605">"lutho"</string>
     <string name="description_image_button_pound" msgid="1716041284529917866">"iphawundi"</string>
-    <string name="description_search_button" msgid="239929880630534731">"sesha"</string>
     <string name="description_dial_button" msgid="7459705245418435351">"dayela"</string>
     <string name="description_delete_button" msgid="4015842181592283903">"i-backspace"</string>
     <string name="accessibility_speakerphone_enabled" msgid="1988512040421036359">"Isipikha sefoni sinikwe amandla"</string>
@@ -719,9 +619,14 @@
     <string name="description_target_decline" msgid="4789834364389731957">"Nqaba"</string>
     <string name="voicemail_notification_vibrate_when_title" msgid="8361970092063604886">"Dlidliza"</string>
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="5739583146522136440">"Dlidliza"</string>
+    <string name="voicemail_notification_ringtone_title" msgid="2512535133814478358">"Ithoni yokukhala"</string>
   <string-array name="voicemail_notification_vibrate_when_entries">
     <item msgid="468237575962916558">"Njalo"</item>
     <item msgid="1595097872875714252">"Kuphela uma ithulile"</item>
     <item msgid="1458182414036878616">"Akusoze"</item>
   </string-array>
+    <string name="ringtone_title" msgid="6374978286202084684">"Ithoni yokukhala kocingo"</string>
+    <string name="vibrate_on_ring_title" msgid="9197564612065258960">"Dlidlizisa uma ikhala"</string>
+    <string name="dtmf_tone_enable_title" msgid="827601042915852989">"Amathoni okuthinta iphedi yokudayela"</string>
+    <string name="preference_category_ringtone" msgid="9007490591910078324">"Ithoni yokukhala"</string>
 </resources>
diff --git a/res/values/array.xml b/res/values/array.xml
index 86bd7d038..71e6f477d 100644
--- a/res/values/array.xml
+++ b/res/values/array.xml
@@ -49,17 +49,17 @@
         <item>@string/sip_always_send_keepalive</item>
     </string-array>
 
-    <!-- "Target" resources for the MultiWaveView widget used for incoming calls;
+    <!-- "Target" resources for the GlowPadView widget used for incoming calls;
          see InCallTouchUi.showIncomingCallWidget() and incall_touch_ui.xml.  -->
 
-    <!-- For most incoming calls the MultiWaveView widget provides 3 choices:
+    <!-- For most incoming calls the GlowPadView widget provides 3 choices:
          - Answer (drag right)
          - Reject (drag left)
          - Respond via SMS (drag up) -->
     <array name="incoming_call_widget_3way_targets">
-        <item>@*android:drawable/ic_lockscreen_answer</item>
-        <item>@*android:drawable/ic_lockscreen_send_sms</item>
-        <item>@*android:drawable/ic_lockscreen_decline</item>
+        <item>@drawable/ic_lockscreen_answer</item>
+        <item>@drawable/ic_lockscreen_text</item>
+        <item>@drawable/ic_lockscreen_decline</item>
         <item>@null</item>"
     </array>
     <array name="incoming_call_widget_3way_target_descriptions">
@@ -80,9 +80,9 @@
          - Answer (drag right)
          - Reject (drag left) -->
     <array name="incoming_call_widget_2way_targets">
-        <item>@*android:drawable/ic_lockscreen_answer</item>
+        <item>@drawable/ic_lockscreen_answer</item>
         <item>@null</item>
-        <item>@*android:drawable/ic_lockscreen_decline</item>
+        <item>@drawable/ic_lockscreen_decline</item>
         <item>@null</item>"
     </array>
     <array name="incoming_call_widget_2way_target_descriptions">
@@ -98,4 +98,15 @@
         <item>@null</item>
     </array>
 
+    <string-array translatable="false" name="voice_quality_entries">
+        <!-- Overlay appropriately, using string constants as above. E.g.:
+        <item>@string/voice_quality_normal</item>
+        <item>@string/voice_quality_clear</item>
+        -->
+    </string-array>
+
+    <string-array translatable="false" name="voice_quality_values">
+        <!-- Overlay appropriately -->
+    </string-array>
+
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c14b2a158..a3b946cf4 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,18 +15,23 @@
 -->
 
 <resources>
-    <!-- Dialer -->
-    <color name="dialer_matchHighlight">#EECF6A</color>
 
     <!-- In-call UI -->
     <color name="incall_callTypeSip">#99CE3F</color> <!-- green -->
     <color name="incall_call_banner_background">#A0000000</color> <!-- semitransparent black -->
-    <color name="incall_call_state_label_background">#8033b5e5</color> <!-- semitransparent blueish grey -->
+    <color name="incall_secondary_info_background">#8033b5e5</color> <!-- semitransparent blueish grey -->
     <color name="incall_call_banner_text_color">#FFFFFF</color> <!-- white -->
+    <color name="incall_call_multiwave_background">#40000000</color> <!-- 25% black -->
 
     <!-- DTMF Dialer -->
     <color name="dtmf_dialer_display_text">#FFFFFF</color> <!-- white -->
 
     <!-- Color of the theme of the People app -->
     <color name="people_app_theme_color">#33B5E5</color>
+
+    <!-- Put on top of each photo, implying 80% darker than usual. -->
+    <color name="on_hold_dim_effect">#cc000000</color>
+
+    <!-- Used with some smaller texts in manage conference screen. -->
+    <color name="manage_conference_secondary_text_color">#888888</color>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index eb9de4c3f..95b44240b 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -91,6 +91,9 @@
     <!-- Determines if device implements a noise suppression device for in call audio-->
     <bool name="has_in_call_noise_suppression">false</bool>
 
+    <!-- Audio parameter for setting noise suppression-->
+    <string name="in_call_noise_suppression_audioparameter">noise_suppression=on=off</string>
+
     <!-- Determines if the current device should allow emergency numbers
          to be logged in the Call Log.
          (Some carriers require that emergency calls *not* be logged,
@@ -112,4 +115,21 @@
 
     <!-- If true, removes the Voice Privacy option from Call Settings -->
     <bool name="config_voice_privacy_disable">false</bool>
+
+    <!-- If true, removes the Preferred Network Mode selection from Mobile Network Settings -->	
+    <bool name="config_preferred_mode_disable">false</bool>
+
+    <!-- Voice quality filter parameter
+         Set this if your device's libaudio has a parameter to adjust voice quality
+         (don't forget to also overlay to value array in that case).
+         Leave empty to disable the feature. -->
+    <string name="voice_quality_param"></string>
+
+    <!-- Sprint Message Wait Indicator Quirk
+         If true, message wait indicators are hidden by default on this device
+         unless the user enables it in Call Settings.  This quirk is necessary
+         for the "Phantom Voicemail" issue where notifications that are
+         impossible to dismiss on the Sprint network. -->
+    <bool name="sprint_mwi_quirk">false</bool>
+
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 0e1d9aa22..97a149633 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -25,25 +25,13 @@
          and the top of the in-call button cluster. -->
     <dimen name="in_call_touch_ui_upper_margin">2dp</dimen>
 
-    <!-- Amount of vertical space to reserve for the MultiWaveView widget
-         while an incoming call is ringing.
-         This is used as the bottom margin for the "call info container"
-         of the in-call UI while an incoming call is ringing, to prevent
-         the call info from overlapping with the incoming-call widget.
-
-         The incoming-call widget takes up more vertical space than the
-         regular in-call button cluster, so this value is larger than
-         in_call_control_height_active. -->
-    <dimen name="in_call_incoming_call_widget_height">260dp</dimen>
-
     <!-- Padding at the left and right edges of the "call banner". -->
     <dimen name="call_banner_side_padding">24dp</dimen>
     <!-- Padding at the top and bottom edges of the "call banner". -->
     <dimen name="call_banner_top_bottom_padding">16dp</dimen>
 
-    <!-- Padding for the "call state label" at the bottom of the banner. -->
-    <dimen name="call_state_label_right_padding">10dp</dimen>
-    <dimen name="call_state_label_top_bottom_padding">5dp</dimen>
+    <!-- Padding at the top and bottom edges of the "provider information" -->
+    <dimen name="provider_info_top_bottom_padding">8dp</dimen>
 
     <!-- Right padding for name and number fields in the call banner.
          This padding is used to ensure that ultra-long names or
@@ -53,13 +41,15 @@
     <!-- Height of the main row of in-call buttons. -->
     <dimen name="in_call_button_height">76dp</dimen>
 
-    <!-- Width of buttons in the main row of in-call buttons.
-         NOTE these buttons are wider on some devices; see values-w360dp/dimens.xml -->
-    <dimen name="in_call_button_width">56dp</dimen>
-
     <!-- Height of the in-call "End" button. -->
     <dimen name="in_call_end_button_height">74dp</dimen>
 
+    <!-- Width of buttons in the extra button row. -->
+    <dimen name="extra_row_button_width">56dp</dimen>
+
+    <!-- Height of buttons in the extra button row. -->
+    <dimen name="extra_row_button_height">@dimen/in_call_button_height</dimen>
+
     <!-- Padding at the left and right edges of the incall_touch_ui button
          cluster.  This padding is necessary because we can't allow the
          buttons to be very close to the edges of the screen, due to the
@@ -69,15 +59,7 @@
     <dimen name="button_cluster_side_padding">20dp</dimen>
 
 
-    <!-- Contact photo dimensions -->
-    <dimen name="contact_photo_inset_width">180dp</dimen>
-    <dimen name="contact_photo_inset_height">180dp</dimen>
-    <dimen name="contact_photo_inset_left_margin">0dp</dimen>
-
-
     <!-- Dimensions for OTA Call Card -->
-    <dimen name="otabase_layout_marginTop">30dp</dimen>
-    <dimen name="otabase_minHeight">270dp</dimen>
     <dimen name="otaactivate_layout_marginTop">10dp</dimen>
     <dimen name="otalistenprogress_layout_marginTop">5dp</dimen>
     <dimen name="otasuccessfail_layout_marginTop">10dp</dimen>
@@ -90,20 +72,23 @@
     <!-- Just used in landscape mode -->
     <dimen name="emergency_dialer_digits_height">0px</dimen>
 
-    <!-- Top margin for the "Calling via ..." provider badge, which is
-         displayed for a few seconds at the start of any outgoing call
-         using a gateway provider (see InCallScreen.updateProviderOverlay()).
-           Currently, this badge floats on top of the normal in-call UI, and
-         the value here is used to position the badge vertically so that
-         it doesn't cover up the "call banner" or any onscreen buttons.
-           TODO: Integrate the badge more smoothly into the call banner,
-         rather than using an overlay element at all (bug 5045539). -->
-    <dimen name="provider_overlay_top_margin">160dp</dimen>
-
     <!-- Layout weight values for dialpad screen. These layouts will be used in one
          LinearLayout (dialpad_fragment.xml), configuring dialpad screen's vertical
          ratio. -->
     <integer name="dialpad_layout_weight_digits">20</integer>
     <integer name="dialpad_layout_weight_dialpad">65</integer>
     <integer name="dialpad_layout_weight_additional_buttons">15</integer>
+
+    <!-- Dimension used to possibly down-scale high-res photo into what is suitable
+         for notification's large icon. -->
+    <dimen name="notification_icon_size">64dp</dimen>
+
+    <!-- Circle size for incoming call widget's each item. -->
+    <dimen name="incoming_call_widget_circle_size">94dp</dimen>
+    <!-- Margin used for incoming call widget's icon for each item.
+         This should be same as "(incoming_call_widget_circle_size - icon_size)/2".
+         Right now answer/decline/reject icons have 38dp width/height.
+         So, (94 - 38)/2 ==> 28dp -->
+    <dimen name="incoming_call_widget_asset_margin">28dp</dimen>
+
 </resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index 0f6c8337a..b004051ba 100755
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -22,6 +22,6 @@
     <item type="id" name="incomingCallReject" />
     <item type="id" name="incomingCallRespondViaSms" />
 
-    <!-- View tag ID used by CallCard.Fade -->
+    <!-- View tag ID used by AnimationUtils.Fade -->
     <item type="id" name="fadeState" />
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
old mode 100755
new mode 100644
index 57382dfb6..4b8a4bbc0
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -42,9 +42,7 @@
     <string name="payphone">Pay phone</string>
     <!-- In-call screen: status label for a call that's on hold -->
     <string name="onHold">On hold</string>
-    <!-- In-call screen: status label for the current active call -->
-    <string name="ongoing">Current call</string>
-    <!-- Possible error messages with outgoing calls -->
+    <!-- Possible error messages with outgoing calls --><skip/>
     <!-- In-call screen: call failure reason (busy) -->
     <string name="callFailed_userBusy">Line busy</string>
     <!-- In-call screen: call failure reason (network congestion) -->
@@ -58,7 +56,7 @@
     <!-- In-call screen: call failure reason (incorrect username or password) -->
     <string name="callFailed_invalid_credentials">Incorrect username or password</string>
     <!-- In-call screen: call failure reason (calling from out of network is not allowed) -->
-    <string name="callFailed_out_of_network">Called from out of network</string>
+    <string name="callFailed_out_of_network">Called from out-of-network</string>
     <!-- In-call screen: call failure reason (server error) -->
     <string name="callFailed_server_error">Server error. Try again later.</string>
     <!-- In-call screen: call failure reason (no signal) -->
@@ -68,47 +66,25 @@
     <!-- In-call screen: call failure reason (radio is off) -->
     <string name="callFailed_powerOff">Radio off</string>
     <!-- In-call screen: call failure reason (SIM error) -->
-    <string name="callFailed_simError">No SIM, or SIM error</string>
+    <string name="callFailed_simError">No SIM or SIM error</string>
     <!-- In-call screen: call failure reason (out of service) -->
     <string name="callFailed_outOfService">Out of service area</string>
     <!-- In-call screen: call failure reason (call denied because of current FDN setting) -->
     <string name="callFailed_fdn_only">Outgoing calls are restricted by FDN.</string>
     <!-- In-call screen: call failure reason (call denied because call barring is on) -->
-    <string name="callFailed_cb_enabled">You cannot make outgoing calls while call barring is on.</string>
+    <string name="callFailed_cb_enabled">You can\'t make outgoing calls while call barring is on.</string>
     <!-- In-call screen: call failure reason (call denied because domain specific access control is on) -->
     <string name="callFailed_dsac_restricted">All calls are restricted by access control.</string>
     <!-- In-call screen: call failure reason (Emergency call denied because domain specific access control is on)-->
     <string name="callFailed_dsac_restricted_emergency">Emergency calls are restricted by access control.</string>
     <!-- In-call screen: call failure reason (Normal call denied because domain specific access control is on)-->
     <string name="callFailed_dsac_restricted_normal">Normal calls are restricted by access control.</string>
-    <!-- In-call screen: call failure reason (Phone is locked until next power cycle)-->
-    <string name="callFailed_cdma_lockedUntilPowerCycle">CDMA: Phone locked until power cycle.</string>
-    <!-- In-call screen: call failure reason (CDMA: call dropped)-->
-    <string name="callFailed_cdma_drop">CDMA: Call dropped.</string>
-    <!-- In-call screen: call failure reason (CDMA: call intercepted)-->
-    <string name="callFailed_cdma_intercept">CDMA: Call intercepted.</string>
-    <!-- In-call screen: call failure reason (CDMA reorder)-->
-    <string name="callFailed_cdma_reorder">CDMA: reorder.</string>
-    <!-- In-call screen: call failure reason (CDMA: Service Option Reject)-->
-    <string name="callFailed_cdma_SO_reject">CDMA: Service Option Reject.</string>
-    <!-- In-call screen: call failure reason (CDMA: retry order)-->
-    <string name="callFailed_cdma_retryOrder">CDMA: retry order.</string>
-    <!-- In-call screen: call failure reason (CDMA: Access failure)-->
-    <string name="callFailed_cdma_accessFailure">CDMA: Access unsuccessful.</string>
-    <!-- In-call screen: call failure reason (CDMA: Preempted)-->
-    <string name="callFailed_cdma_preempted">CDMA: Preempted.</string>
-    <!-- In-call screen: call failure reason (Only Emergency calls are possible)-->
-    <string name="callFailed_cdma_notEmergency">Only Emergency calls are possible.</string>
     <!-- In-call screen: call failure reason (Dialed number doesn't exist) -->
-    <string name="callFailed_unobtainable_number">Invalid Number</string>
+    <string name="callFailed_unobtainable_number">Invalid number</string>
     <!-- In-call screen: status label for a conference call -->
     <string name="confCall">Conference call</string>
     <!-- In-call screen: call lost dialog text -->
     <string name="call_lost">Call has been lost.</string>
-    <!-- In-call screen: auto retry  -->
-    <string name="retry">Retry</string>
-    <!-- In-call screen: call lost title of dialog -->
-    <string name="call_lost_title">Call Lost</string>
 
     <!-- Positive button label ("OK") used in several dialogs in the phone UI [CHAR LIMIT=10] -->
     <string name="ok">OK</string>
@@ -143,7 +119,7 @@
     <!-- In-call screen: body text of the dialog that appears when we encounter
          the "PAUSE" character in a phone number to be dialed; this dialog gives
          informative message to the user to show the sending numbers following the "Pause". -->
-    <string name="pause_prompt_str">Sending Tones\n</string>
+    <string name="pause_prompt_str">Sending tones\n</string>
     <!-- In-call screen: button label on the "wait" prompt dialog -->
     <string name="send_button">Send</string>
     <!-- In-call screen: button label on the "wait" prompt dialog in CDMA Mode-->
@@ -153,7 +129,7 @@
     <!-- In-call screen: on the "wild" character dialog, this is the label
          for a text widget that lets the user enter the digits that should
          replace the "wild" character. -->
-    <string name="wild_prompt_str">Replace the wild character with</string>
+    <string name="wild_prompt_str">Replace wild character with</string>
 
     <!-- missing voicemail number -->
     <!-- Title of the "Missing voicemail number" dialog -->
@@ -163,27 +139,6 @@
     <!-- Button label on the "Missing voicemail number" dialog -->
     <string name="add_vm_number_str">Add number</string>
 
-    <!-- Placeholder text displayed while loading a list of phone numbers
-         into the dialer UI -->
-    <string name="dialer_emptyListWorking">Loading\u2026</string>
-
-    <!-- SIM PIN strings -->
-    <!-- Instructional text on SIM PIN unlock panel -->
-    <string name="enterPin">Type PIN code to unlock SIM card.</string>
-    <!-- Success message displayed on SIM PIN unlock panel -->
-    <string name="pinUnlocked">SIM unlocked</string>
-    <!-- Label for PIN entry widget on SIM PIN unlock panel -->
-    <string name="enterNewPin">New SIM PIN code</string>
-    <!-- Label for PIN entry widget on SIM PIN unlock panel -->
-    <string name="verifyNewPin">Type new SIM PIN code again to confirm</string>
-    <!-- Error message displayed on SIM PIN unlock panel -->
-    <string name="verifyFailed">The SIM PINs you typed do not match. Please try again.</string>
-    <!-- Instructional text on SIM PIN unlock panel -->
-    <string name="enterPuk">Type PUK code to unlock SIM card</string>
-    <!-- Error message displayed on SIM PIN unlock panel -->
-    <string name="badPuk">Incorrect PUK code!</string>
-    <!-- Button label on SIM PIN unlock panel -->
-    <string name="buttonTxtContinue">Continue</string>
     <!-- Status message displayed on SIM PIN unlock panel -->
     <string name="puk_unlocked">Your SIM card has been unblocked. Your phone is unlocking\u2026</string>
     <!-- network depersonalization -->
@@ -200,12 +155,6 @@
     <!-- Success message displayed on SIM Network Depersonalization panel -->
     <string name="unlock_success">Network unlock successful.</string>
 
-    <!-- Title for the dialog used to display the user's IMEI number -->
-    <string name="imei">IMEI</string>
-
-    <!-- Title for the dialog used to display the user's MEID number on CDMA network -->
-    <string name="meid">MEID</string>
-
     <!-- settings strings -->
 
     <!-- GSM Call settings screen, setting option name -->
@@ -218,6 +167,10 @@
     <string name="settings_label">Network settings</string>
     <!-- Call settings screen, setting option name -->
     <string name="voicemail">Voicemail</string>
+    <!-- Call settings screen, message wait indicator name -->
+    <string name="mwi_notification_title">Message Wait Indicator</string>
+    <!-- Call settings screen, message wait indicator summary -->
+    <string name="mwi_notification_summary">Show message wait indicator voicemail notifications</string>
     <!-- Call forwarding dialog box, voicemail number prefix -->
     <string name="voicemail_abbreviated">VM:</string>
     <!-- Mobile network settings screen, setting option name -->
@@ -236,6 +189,8 @@
     <string name="labelNwService">Network service settings</string>
     <!-- Call settings screen, setting option name -->
     <string name="labelCallerId">Caller ID</string>
+    <!-- Additional call settings screen, setting summary text when the setting is being loaded [CHAR LIMIT=40] -->
+    <string name="sum_loading_settings">Loading settings\u2026</string>
     <!-- Additional call settings screen, setting summary text when Caller ID is hidden -->
     <string name="sum_hide_caller_id">Number hidden in outgoing calls</string>
     <!-- Additional call settings screen, setting summary text when Caller ID is shown -->
@@ -275,7 +230,7 @@
     <!-- Call forwarding settings screen, setting summary text when forwarding when busy is disabled -->
     <string name="sum_cfb_disabled">Disabled</string>
     <!-- Error message displayed after failing to disable forwarding calls when the phone is busy -->
-    <string name="disable_cfb_forbidden">Your carrier does not support disabling call-forwarding when your phone is busy.</string>
+    <string name="disable_cfb_forbidden">Your operator doesn\'t support disabling call forwarding when your phone is busy.</string>
 
     <!-- Call forwarding settings screen, setting option name -->
     <string name="labelCFNRy">Forward when unanswered</string>
@@ -286,7 +241,7 @@
     <!-- Call forwarding settings screen, setting summary text when Forward when unanswered is disabled -->
     <string name="sum_cfnry_disabled">Disabled</string>
     <!-- Error message displayed after failing to disable forwarding calls when the phone does not answer -->
-    <string name="disable_cfnry_forbidden">Your carrier does not support disabling call-forwarding when your phone doesn\'t answer.</string>
+    <string name="disable_cfnry_forbidden">Your operator doesn\'t support disabling call forwarding when your phone doesn\'t answer.</string>
 
     <!-- Call forwarding settings screen, setting option name -->
     <string name="labelCFNRc">Forward when unreachable</string>
@@ -297,7 +252,7 @@
     <!-- Call forwarding settings screen, setting summary text when Forward when unreachable is disabled -->
     <string name="sum_cfnrc_disabled">Disabled</string>
     <!-- Error message displayed after failing to disable forwarding calls when the phone is unreachable -->
-    <string name="disable_cfnrc_forbidden">Your carrier does not support disabling call-forwarding when your phone is unreachable.</string>
+    <string name="disable_cfnrc_forbidden">Your carrier doesn\'t support disabling call forwarding when your phone is unreachable.</string>
 
     <!-- Title of the progress dialog displayed while updating Call settings -->
     <string name="updating_title">Call settings</string>
@@ -313,10 +268,11 @@
     <string name="response_error">Unexpected response from network.</string>
     <!-- Status message displayed in the "Call settings error" dialog -->
     <string name="exception_error">Network or SIM card error.</string>
-    <!-- Status message displayed in the "Call settings error" dialog when operation fails due to FDN -->
-    <string name="fdn_only_error">Operations are only allowed on fixed dialing numbers.</string>
+    <!-- Status message displayed in the "Call settings error" dialog when operation fails due to FDN
+         [CHAR LIMIT=NONE] -->
+    <string name="fdn_check_failure">Your Phone app\'s Fixed Dialing Numbers setting is turned on. As a result, some call-related features aren\'t working.</string>
     <!-- Status message displayed in the "Call settings error" dialog -->
-    <string name="radio_off_error">Please turn on the radio before viewing these settings.</string>
+    <string name="radio_off_error">Turn on the radio before viewing these settings.</string>
     <!-- Button label used to dismiss the "Call settings error" dialog -->
     <string name="close_dialog">OK</string>
     <!-- Button label used in several settings-related dialogs -->
@@ -336,7 +292,7 @@
         <item>Show number</item>
     </string-array>
     <!-- Phone settings: Internal keys used for Caller ID preference values.  DO NOT TRANSLATE. -->
-    <string-array name="clir_values">
+    <string-array name="clir_values" translatable="false">
         <!-- Phone settings: Internal key used for Caller ID preference values.  DO NOT TRANSLATE. -->
         <item><xliff:g>DEFAULT</xliff:g></item>
         <!-- Phone settings: Internal key used for Caller ID preference values.  DO NOT TRANSLATE. -->
@@ -345,15 +301,13 @@
         <item><xliff:g>SHOW</xliff:g></item>
     </string-array>
 
-    <!-- voicemail setting strings -->
-    <!-- Call settings screen, Label used in "Save voicemail number" dialog -->
-    <string name="vm_save_number">Save voicemail number</string>
+    <!-- voicemail setting strings --><skip/>
     <!-- Call settings screen, Set voicemail number dialog text -->
     <string name="vm_changed">Voicemail number changed.</string>
     <!-- Call settings screen, Set voicemail number dialog text -->
-    <string name="vm_change_failed">Voicemail number change unsuccessful.\nPlease contact your carrier if this problem persists.</string>
+    <string name="vm_change_failed">Couldn\'t change the voicemail number.\nContact your carrier if this problem persists.</string>
     <!-- Call settings screen, displayed when vm provider supplied forwarding number change fails-->
-    <string name="fw_change_failed">Forwarding number change unsuccessful.\nPlease contact your carrier if this problem persists.</string>
+    <string name="fw_change_failed">Couldn\'t change the forwarding number.\nContact your carrier if this problem persists.</string>
     <!-- Call settings screen, displayed when forwarding number read fails-->
     <string name="fw_get_in_vm_failed">Couldn\'t retrieve and save current forwarding number settings.\nSwitch to the new provider anyway?</string>
     <!-- Call settings screen, Set voicemail number dialog text -->
@@ -363,7 +317,7 @@
     <!-- Call settings screen, "Voicemail" screen, default option - My Carrier -->
     <string name="voicemail_default">My carrier</string>
 
-    <!-- networks setting strings -->
+    <!-- networks setting strings --><skip/>
     <!-- Mobile network settings screen title -->
     <string name="mobile_networks">Mobile network settings</string>
     <!-- Available networks screen title/heading -->
@@ -379,20 +333,20 @@
     <!-- Available networks screen, toast when registering on a specific network -->
     <string name="register_on_network">Registering on <xliff:g id="network">%s</xliff:g>\u2026</string>
     <!-- Available networks screen, toast when SIM card isn't allowed on a network -->
-    <string name="not_allowed">Your SIM card does not allow a connection to this network.</string>
+    <string name="not_allowed">Your SIM card doesn\'t allow a connection to this network.</string>
     <!-- Available networks screen, toast when unable to connect to a network temporarily -->
-    <string name="connect_later">Unable to connect to this network at this time. Please try again later.</string>
+    <string name="connect_later">Can\'t connect to this network right now. Try again later.</string>
     <!-- Available networks screen, toast when registered on a specific network -->
     <string name="registration_done">Registered on network.</string>
     <!-- Mobile network settings screen setting option summary text -->
-    <string name="sum_carrier_select">Select a network operator</string>
+    <string name="sum_carrier_select">Choose a network operator</string>
     <!-- Available networks screen, setting summary text -->
     <string name="sum_search_networks">Search for all available networks</string>
     <!-- Available networks screen, setting option name -->
-    <string name="select_automatically">Select automatically</string>
+    <string name="select_automatically">Choose automatically</string>
     <!-- Available networks screen, setting summary text -->
-    <string name="sum_select_automatically">Automatically select preferred network</string>
-    <string name="register_automatically">Automatic registration...</string>
+    <string name="sum_select_automatically">Automatically choose preferred network</string>
+    <string name="register_automatically">Automatic registration\u2026</string>
     <string name="preferred_network_mode_title">Network Mode</string>
     <string name="preferred_network_mode_summary">Change the network operating mode</string>
     <string name="preferred_network_mode_dialogtitle">Preferred network mode</string>
@@ -414,16 +368,22 @@
     <string name="preferred_network_mode_evdo_only_summary">Preferred network mode: EvDo only</string>
     <!-- Mobile network settings, summary for preferred network mode LTE / CDMA[CHAR LIMIT=100] -->
     <string name="preferred_network_mode_lte_cdma_summary">Preferred network mode: LTE / CDMA</string>
+    <!-- Mobile network settings, summary for preferred network mode LTE / GSM/WCDMA [CHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_gsm_summary">Preferred network mode: LTE / GSM/WCDMA</string>
+    <!-- Mobile network settings, summary for preferred network mode LTE / CDMA / EvDo [CHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_cdma_evdo_summary">Preferred network mode: LTE / CDMA / EvDo</string>
+    <!-- Mobile network settings, summary for preferred network mode LTE / CMDA / EvDo / GSM/WCDMA [CHAR LIMIT=100] -->
+    <string name="preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary">Preferred network mode: LTE / CMDA / EvDo / GSM/WCDMA</string>
 
     <string-array name="preferred_network_mode_choices">
-        <item>LTE / CDMA</item>
+        <item>Global</item>
         <item>EvDo only</item>
         <item>CDMA w/o EvDo</item>
-        <item>CDMA / EvDo auto</item>
-        <item>GSM / WCDMA auto</item>
+        <item>CDMA/EvDo auto</item>
+        <item>GSM/WCDMA auto</item>
         <item>WCDMA only</item>
         <item>GSM only</item>
-        <item>GSM / WCDMA preferred</item>
+        <item>GSM/WCDMA preferred</item>
     </string-array>
     <string-array name="preferred_network_mode_values"  translatable="false">
         <item>"7"</item>
@@ -437,13 +397,28 @@
     </string-array>
     <!-- Mobile network settings, network mode choices for a device supporting CDMA and LTE [CHAR LIMIT=25] -->
     <string-array name="preferred_network_mode_choices_lte">
-        <item>LTE / CDMA</item>
-        <item>CDMA</item>
+        <item>LTE only</item>
+        <item>LTE/CMDA/EvDo/GSM/WCDMA</item>
+        <item>LTE/CDMA/EvDo</item>
+        <item>LTE/CDMA</item>
+        <item>CDMA/EvDo auto</item>
     </string-array>
     <string-array name="preferred_network_mode_values_lte" translatable="false">
+        <item>"11"</item>
+        <item>"10"</item>
+        <item>"8"</item>
         <item>"7"</item>
         <item>"4"</item>
     </string-array>
+    <!-- Mobile network settings, network mode choices for a device supporting GSM and LTE [CHAR LIMIT=25] -->
+    <string-array name="preferred_network_mode_choices_lte_gsm">
+        <item>LTE/GSM/WCDMA</item>
+        <item>GSM/WCDMA preferred</item>
+    </string-array>
+    <string-array name="preferred_network_mode_values_lte_gsm" translatable="false">
+        <item>"9"</item>
+        <item>"0"</item>
+    </string-array>
     <!-- Mobile network settings screen, data enabling checkbox name -->
     <string name="data_enabled">Data enabled</string>
     <!-- Mobile network settings screen, setting summary text when check box is not selected (explains what selecting it would do) -->
@@ -453,11 +428,17 @@
     <!-- Mobile network settings screen, setting summary text when check box is selected -->
     <string name="roaming_enable">Connect to data services when roaming</string>
     <!-- Mobile network settings screen, setting summary text when check box is clear -->
-    <string name="roaming_disable">Connect to data services when roaming</string>
+    <string name="roaming_disable">Don\'t connect to data services when roaming</string>
+    <!-- Mobile network settings screen, setting check box name -->
+    <string name="national_roaming">National data roaming</string>
+    <!-- Mobile network settings screen, setting summary text when check box is selected -->
+    <string name="national_roaming_enable">Connect to data services when nationally roaming </string>
+    <!-- Mobile network settings screen, setting summary text when check box is clear -->
+    <string name="national_roaming_disable">Don\'t connect to data services when nationally roaming</string>
     <!-- Mobile network settings UI: notification message shown when you
          lose data connectivity because you're roaming and you have the
          "data roaming" feature turned off. -->
-    <string name="roaming_reenable_message">You have lost data connectivity because you left your home network with data roaming turned off.</string>
+    <string name="roaming_reenable_message">You\'ve lost data connectivity because you left your home network with data roaming turned off.</string>
     <!-- Mobile network settings screen, dialog message when user selects the Data roaming check box -->
     <string name="roaming_warning">Allow data roaming? You may incur significant roaming charges!</string>
     <string name="gsm_umts_options">GSM/UMTS Options</string>
@@ -465,8 +446,6 @@
 
     <!-- Screen option on the mobile network settings to go into data usage settings -->
     <string name="throttle_data_usage">Data usage</string>
-    <!-- Title for the data usage settings screen -->
-    <string name="throttle_settings_title">Carrier data policy</string>
     <!-- Data usage settings screen option for checking the current usage -->
     <string name="throttle_current_usage">Data used in current period</string>
     <!-- Data usage settings screen option for time frame-->
@@ -488,9 +467,6 @@
 
     <string name="throttle_help_subtext">More information about your carrier\'s mobile network data use policy</string>
 
-    <!-- Cell broadcast SMS strings -->
-    <string name="cdma_cell_broadcast_sms">Cell Broadcast SMS</string>
-
     <string name="cell_broadcast_sms">Cell Broadcast SMS</string>
 
     <string name="enable_disable_cell_bc_sms">Cell Broadcast SMS</string>
@@ -543,7 +519,7 @@
         <item>Chinese</item>
         <item>Hebrew</item>
     </string-array>
-    <string-array name="list_language_values">
+    <string-array name="list_language_values" translatable="false">
         <item>"1"</item>
         <item>"2"</item>
         <item>"3"</item>
@@ -590,9 +566,9 @@
     <string name="eo_enable">Employment Opportunities enabled</string>
     <string name="eo_disable">Employment Opportunities disabled</string>
 
-    <string name="enable_disable_mhh">Medical, Health and Hospital</string>
-    <string name="mhh_enable">Medical, Health and Hospital enabled</string>
-    <string name="mhh_disable">Medical, Health and Hospital disabled</string>
+    <string name="enable_disable_mhh">Medical, Health, and Hospital</string>
+    <string name="mhh_enable">Medical, Health, and Hospital enabled</string>
+    <string name="mhh_disable">Medical, Health, and Hospital disabled</string>
 
     <string name="enable_disable_technology_news">Technology News</string>
     <string name="technology_news_enable">Technology News enabled</string>
@@ -602,9 +578,8 @@
     <string name="multi_category_enable">Multi-category enabled</string>
     <string name="multi_category_disable">Multi-category disabled</string>
 
-    <!-- GSM/UMTS Options strings -->
-    <string name="gsm_umts_network_preferences_title">GSM/UMTS Network Preferences</string>
-    <string name="gsm_umts_network_preferneces_summary">Not implemented yet! </string>
+    <string name="gsm_umts_network_preferences_title">Network Preferences</string>
+    <string name="gsm_umts_network_preferneces_summary">Change the network operating mode</string>
     <string name="gsm_umts_network_preferences_dialogtitle">GSM/UMTS network preferences</string>
     <string-array name="gsm_umts_network_preferences_choices">
         <item>GSM/WCDMA (auto mode)</item>
@@ -612,11 +587,11 @@
         <item>GSM only</item>
         <item>GSM/WCDA (WCDMA preferred)</item>
     </string-array>
-    <string-array name="gsm_umts_network_preferences_values">
-        <item>"0"</item>
-        <item>"1"</item>
-        <item>"2"</item>
+    <string-array name="gsm_umts_network_preferences_values" translatable="false">
         <item>"3"</item>
+        <item>"2"</item>
+        <item>"1"</item>
+        <item>"0"</item>
     </string-array>
 
     <!-- Mobile network settings screen, setting option name -->
@@ -628,7 +603,7 @@
     <!-- Mobile network settings screen, setting option name -->
     <string name="cdma_system_select_title">System select</string>
     <!-- Mobile network settings screen, setting summary text -->
-    <string name="cdma_system_select_summary">Change the cdma roaming mode</string>
+    <string name="cdma_system_select_summary">Change the CDMA roaming mode</string>
     <!-- System select settings screen title -->
     <string name="cdma_system_select_dialogtitle">System select</string>
     <string-array name="cdma_system_select_choices">
@@ -648,41 +623,27 @@
         <item>"2"</item>
     </string-array>
 
-    <!-- CDMA Options strings -->
-    <string name="cdma_roaming_mode_title">CDMA Roaming Mode</string>
-    <string name="cdma_roaming_mode_summary">Change the cdma roaming mode</string>
-    <string name="cdma_roaming_mode_dialogtitle">CDMA roaming mode</string>
-    <string-array name="cdma_roaming_mode_choices">
-        <item>Home Networks only</item>
-        <item>Affiliated Networks</item>
-        <item>Any Network</item>
-    </string-array>
-    <string-array name="cdma_roaming_mode_values">
-        <item>"0"</item>
-        <item>"1"</item>
-        <item>"2"</item>
-    </string-array>
-    <string name="cdma_network_preferences_title">CDMA Network Preferences</string>
-    <string name="cdma_network_preferneces_summary">Not implemented yet! </string>
+    <string name="cdma_subscription_title">CDMA subscription</string>
+    <string name="cdma_network_preferences_title">Network Preferences</string>
+    <string name="cdma_network_preferneces_summary">Change the network operating mode</string>
     <string name="cdma_network_preferences_dialogtitle">CDMA network preferences</string>
     <string-array name="cdma_network_preferences_choices">
         <item>CDMA/EvDo</item>
         <item>CDMA only</item>
         <item>EvDo only</item>
     </string-array>
-    <string-array name="cdma_network_preferences_values">
-        <item>"0"</item>
-        <item>"1"</item>
+    <string-array name="cdma_network_preferences_values" translatable="false"> 
         <item>"2"</item>
+        <item>"1"</item>
+        <item>"0"</item>
     </string-array>
-    <string name="cdma_subscription_title">CDMA Subscription</string>
     <string name="cdma_subscription_summary">Change between RUIM/SIM and NV</string>
     <string name="cdma_subscription_dialogtitle">subscription</string>
     <string-array name="cdma_subscription_choices">
         <item>RUIM/SIM</item>
         <item>NV</item>
     </string-array>
-    <string-array name="cdma_subscription_values">
+    <string-array name="cdma_subscription_values" translatable="false">
         <item>"0"</item>
         <item>"1"</item>
     </string-array>
@@ -719,14 +680,13 @@
     <string name="sum_fdn_change_pin">Change PIN for FDN access</string>
     <!-- Call settings, FDN screen, setting option name -->
     <string name="sum_fdn_manage_list">Manage phone number list</string>
-    <string name="voice_privacy">Voice Privacy</string>
+    <!-- Voice privacy on CDMA is an added layer of voice encryption. Theoretically, it would be harder to break in to a phone call with this feature enabled. -->
+    <string name="voice_privacy">Voice privacy</string>
     <string name="voice_privacy_summary">Enable enhanced privacy mode</string>
-    <string name="tty_mode_title">TTY mode</string>
-    <string name="tty_mode_summary">Enable TTY mode</string>
     <string name="tty_mode_option_title">TTY mode</string>
     <string name="tty_mode_option_summary">Set TTY mode</string>
-    <string name="auto_retry_mode_title">Auto Retry</string>
-    <string name="auto_retry_mode_summary">Enable Auto Retry mode</string>
+    <string name="auto_retry_mode_title">Auto-retry</string>
+    <string name="auto_retry_mode_summary">Enable Auto-retry mode</string>
 
     <!-- FDN list screen: menu item label -->
     <string name="menu_add">Add contact</string>
@@ -737,7 +697,7 @@
 
     <!-- FDN related strings -->
     <!-- Label for PIN2 entry screen -->
-    <string name="get_pin2">Enter PIN2</string>
+    <string name="get_pin2">Type PIN2</string>
     <!-- "Edit FDN Contact" screen: Label for the "name" text field -->
     <string name="name">Name</string>
     <!-- "Edit FDN Contact" screen: Label for the "number" text field -->
@@ -763,9 +723,15 @@
     <!-- "Delete FDN Contact" screen: status message displayed in a popup (toast) -->
     <string name="fdn_contact_deleted">Fixed dialing number deleted.</string>
     <!-- FDN settings: error message displayed in a popup (toast) -->
-    <string name="pin2_invalid">FDN not updated: you entered an incorrect PIN.</string>
+    <string name="pin2_invalid">FDN wasn\'t updated because you typed an incorrect PIN.</string>
     <!-- FDN settings: error message displayed in a popup (toast) -->
-    <string name="fdn_invalid_number">FDN not updated: number cannot exceed 20 digits.</string>
+    <string name="fdn_invalid_number">FDN wasn\'t updated because the number can\'t exceed 20 digits.</string>
+    <!-- FDN settings: error message displayed in a popup (toast), when the entered
+         FDN number was inappropriate, OR, PIN2 the user entered was incorrect.
+         Because of API restriction, there's no way to determine which is the exact
+         cause of the failure.
+         [CHAR LIMIT=NONE] -->
+    <string name="pin2_or_fdn_invalid">FDN wasn\'t updated. The PIN2 was incorrect, or the phone number was rejected.</string>
 
     <!-- ADN related strings -->
     <!-- Placeholder text displayed while loading the list of SIM contacts -->
@@ -776,7 +742,7 @@
     <string name="simContacts_title">Select contacts to import</string>
     <!-- Appears when user tries to import contacts in SIM during Airplane mode
       [CHAR LIMIT=NONE] -->
-    <string name="simContacts_airplaneMode">To import contacts from SIM card, please turn off Airplane mode.</string>
+    <string name="simContacts_airplaneMode">To import contacts from the SIM card, first turn off Airplane mode.</string>
 
     <!-- SIM PIN strings -->
     <!-- Title of "Enable/disable SIM PIN" screen -->
@@ -792,9 +758,9 @@
     <!-- SIM PIN screen: label for PIN entry widget -->
     <string name="confirmPinLabel">Confirm new PIN</string>
     <!-- SIM PIN screen: error message -->
-    <string name="badPin">The old PIN you typed is not correct. Please try again.</string>
+    <string name="badPin">The old PIN you typed isn\'t correct. Try again.</string>
     <!-- SIM PIN screen: error message -->
-    <string name="mismatchPin">The PINs you entered do not match. Please try again.</string>
+    <string name="mismatchPin">The PINs you typed don\'t match. Try again.</string>
     <!-- SIM PIN screen: error message when PIN is too short or too long -->
     <string name="invalidPin">Type a PIN that is 4 to 8 numbers.</string>
     <!-- Title of "Disable SIM PIN" screen -->
@@ -804,13 +770,13 @@
     <!-- SIM PIN screen: progress message displayed while enabling -->
     <string name="enable_in_progress">Please wait\u2026</string>
     <!-- SIM PIN screen: status message displayed in a popup (toast) -->
-    <string name="enable_pin_ok">SIM PIN enabled</string>
+    <string name="enable_pin_ok">SIM PIN enabled.</string>
     <!-- SIM PIN screen: status message displayed in a popup (toast) -->
-    <string name="disable_pin_ok">SIM PIN disabled</string>
+    <string name="disable_pin_ok">SIM PIN disabled.</string>
     <!-- SIM PIN screen: error message displayed in a popup (toast) -->
-    <string name="pin_failed">The PIN you typed was incorrect</string>
+    <string name="pin_failed">The PIN you typed was incorrect.</string>
     <!-- SIM PIN screen: status message displayed in a popup (toast) -->
-    <string name="pin_changed">SIM PIN changed successfully</string>
+    <string name="pin_changed">SIM PIN changed successfully.</string>
     <!-- SIM PIN screen: error message displayed in a dialog -->
     <string name="puk_requested">Password incorrect, SIM is locked! PUK2 requested.</string>
 
@@ -824,50 +790,36 @@
     <!-- SIM PIN2 screen: label for PIN entry widget -->
     <string name="confirmPin2Label">Confirm new PIN2</string>
     <!-- SIM PIN2 screen: error message -->
-    <string name="badPuk2">The PUK2 you typed is not correct. Please try again. </string>
+    <string name="badPuk2">The PUK2 you typed isn\'t correct. Try again. </string>
     <!-- SIM PIN2 screen: error message -->
-    <string name="badPin2">The old PIN2 you typed is not correct. Please try again.</string>
+    <string name="badPin2">The old PIN2 you typed isn\'t correct. Try again.</string>
     <!-- SIM PIN2 screen: error message -->
-    <string name="mismatchPin2">The PIN2s you entered do not match. Please try again.</string>
+    <string name="mismatchPin2">The PIN2s you typed don\'t match. Try again.</string>
     <!-- SIM PIN2 screen: error message -->
     <string name="invalidPin2">Type a PIN2 that is 4 to 8 numbers.</string>
     <!-- SIM PIN2 screen: error message -->
     <string name="invalidPuk2">Type a PUK2 that is 8 numbers.</string>
     <!-- SIM PIN2 screen: status message displayed in a popup (toast) -->
-    <string name="pin2_changed">PIN2 changed successfully</string>
+    <string name="pin2_changed">PIN2 changed successfully.</string>
     <!-- SIM PIN2 screen: label for PUK2 entry widget -->
     <string name="label_puk2_code">Type PUK2 code</string>
     <!-- SIM PIN2 screen: error message displayed in a dialog -->
-    <string name="fdn_enable_puk2_requested">Password incorrect, please change PIN2 and retry!</string>
+    <string name="fdn_enable_puk2_requested">Password incorrect. Change PIN2 and retry.</string>
     <!-- SIM PIN2 screen: error message displayed in a dialog -->
-    <string name="puk2_requested">Password incorrect, SIM is locked! PUK2 requested.</string>
+    <string name="puk2_requested">Password incorrect, SIM is locked. PUK2 requested.</string>
 
     <!-- SIM PIN screen: button label -->
     <string name="doneButton">Done</string>
 
     <!-- In-call screen: status label for a conference call -->
     <string name="caller_manage_header">Conference call <xliff:g id="conf_call_time">%s</xliff:g></string>
-    <!-- In-call screen: Button label on "Manage conference" panel -->
-    <string name="caller_manage_manage_done_text">Back to call</string>
 
     <!-- Used in FakePhoneActivity test code.  DO NOT TRANSLATE. -->
-    <string name="fake_phone_activity_phoneNumber_text">(650) 555-1234</string>
+    <string name="fake_phone_activity_phoneNumber_text" translatable="false">(650) 555-1234</string>
     <!-- Used in FakePhoneActivity test code.  DO NOT TRANSLATE. -->
-    <string name="fake_phone_activity_infoText_text">Incoming phone number</string>
+    <string name="fake_phone_activity_infoText_text" translatable="false">Incoming phone number</string>
     <!-- Used in FakePhoneActivity test code.  DO NOT TRANSLATE. -->
-    <string name="fake_phone_activity_placeCall_text">Fake Incoming Call</string>
-
-    <!-- Button label on "SIM Missing" screen -->
-    <string name="sim_missing_continueView_text">Continue without SIM card</string>
-    <!-- Message displayed on "SIM Missing" screen -->
-    <string name="sim_missing_msg_text">No SIM card found. Please insert a SIM card into the phone.</string>
-
-    <!-- Button label on "SIM Unlock" screen -->
-    <string name="sim_unlock_dismiss_text">Dismiss</string>
-    <!-- Button label on "SIM Unlock" screen -->
-    <string name="sim_unlock_unlock_text">Unlock</string>
-    <!-- Progress message displayed on "SIM Unlock" screen -->
-    <string name="sim_unlock_status_text">Authenticating PIN\u2026</string>
+    <string name="fake_phone_activity_placeCall_text" translatable="false">Fake Incoming Call</string>
 
     <!-- Call settings screen, Set voicemail dialog title -->
     <string name="voicemail_settings_number_label">Voicemail number</string>
@@ -881,8 +833,6 @@
     <string name="card_title_conf_call">Conference call</string>
     <!-- In-call screen: status label for an incoming call -->
     <string name="card_title_incoming_call">Incoming call</string>
-    <!-- In-call screen: status label for an cdma call waiting -->
-    <string name="card_title_cdma_call_waiting">Cdma callwaiting </string>
     <!-- In-call screen: status label displayed briefly after a call ends -->
     <string name="card_title_call_ended">Call ended</string>
     <!-- In-call screen: status label for call that's on hold -->
@@ -906,8 +856,8 @@
          the caller-id info from the missed call -->
     <string name="notification_missedCallTicker">Missed call from <xliff:g id="missed_call_from">%s</xliff:g></string>
     <!-- The "label" of the in-call Notification for an ongoing call, used
-         as the format string for a Chronometer widget. -->
-    <string name="notification_ongoing_call_format">Current call (<xliff:g id="duration">%s</xliff:g>)</string>
+         as the format string for a Chronometer widget. [CHAR LIMIT=60] -->
+    <string name="notification_ongoing_call">Ongoing call</string>
     <!-- The "label" of the in-call Notification for a call that's on hold -->
     <string name="notification_on_hold">On hold</string>
     <!-- The "label" of the in-call Notification for an incoming ringing call -->
@@ -928,6 +878,19 @@
     <!-- Label for the expanded "No service" notification item, including the
          operator name set by user -->
     <string name="notification_network_selection_text">Selected network (<xliff:g id="operator_name">%s</xliff:g>) unavailable</string>
+    <!-- Message for "end call" Action.
+         It is displayed in the "Ongoing call" notification, which is shown
+         when the user is outside the in-call screen while the phone call is still
+         active. [CHAR LIMIT=40] -->
+    <string name="notification_action_end_call">Hang up</string>
+    <!-- Message for "call back" Action, which is displayed in the missed call notificaiton.
+         The user will be able to call back to the person or the phone number.
+         [CHAR LIMIT=60] -->
+    <string name="notification_missedCall_call_back">Call back</string>
+    <!-- Message for "reply via sms" action, which is displayed in the missed call notification.
+         The user will be able to send text messages using the phone number.
+         [CHAR LIMIT=60] -->
+    <string name="notification_missedCall_message">Message</string>
 
     <!-- In-call screen: call failure message displayed in an error dialog -->
     <string name="incall_error_power_off">To place a call, first turn off Airplane mode.</string>
@@ -942,8 +905,6 @@
     <string name="incall_error_call_failed">Call not sent.</string>
     <!-- In-call screen: status message displayed in a dialog when starting an MMI -->
     <string name="incall_status_dialed_mmi">Starting MMI sequence\u2026</string>
-    <!-- In-call screen: status message displayed in a dialog when starting a feature code -->
-    <string name="incall_status_dialed_fc">Starting feature code sequence\u2026</string>
     <!-- In-call screen: message displayed in an error dialog -->
     <string name="incall_error_supp_service_unknown">Unsupported service.</string>
     <!-- In-call screen: message displayed in an error dialog -->
@@ -971,35 +932,22 @@
 
     <!-- Dialer text on Emergency Dialer -->
     <!-- Emergency dialer: message displayed in an error dialog -->
-    <string name="dial_emergency_error">Call not sent, <xliff:g id="non_emergency_number">%s</xliff:g> is not an emergency number!</string>
+    <string name="dial_emergency_error">Call not sent. <xliff:g id="non_emergency_number">%s</xliff:g> is not an emergency number!</string>
     <!-- Emergency dialer: message displayed in an error dialog -->
-    <string name="dial_emergency_empty_error">Call not sent, please dial an emergency number!</string>
+    <string name="dial_emergency_empty_error">Call not sent. Dial an emergency number!</string>
 
     <!-- Displayed in the text entry box in the dialer when in landscape mode to guide the user
          to dial using the physical keyboard -->
     <string name="dialerKeyboardHintText">Use keyboard to dial</string>
 
-    <!-- Hint text displayed in the "digits" field at the top of the
-         in-call DTMF dialpad.  (This hint reminds the user that the
-         dialpad is there to generate tones, not to add a new call.) -->
-    <string name="dtmfDialpadHintText">Touch tone keypad</string>
-
     <!-- Text for the onscreen "Hold" button -->
     <string name="onscreenHoldText">Hold</string>
-    <!-- Text for the onscreen "Hold" button in the "Unhold" state -->
-    <string name="onscreenUnholdText">Unhold</string>
     <!-- Text for the onscreen "End call" button -->
     <string name="onscreenEndCallText">End</string>
     <!-- Text for the onscreen "Show Dialpad" button -->
     <string name="onscreenShowDialpadText">Dialpad</string>
-    <!-- Text for the onscreen "Hide Dialpad" button -->
-    <string name="onscreenHideDialpadText">Hide</string>
-    <!-- Text for the onscreen "Speaker" button -->
-    <string name="onscreenSpeakerText">Speaker</string>
     <!-- Text for the onscreen "Mute" button -->
     <string name="onscreenMuteText">Mute</string>
-    <!-- Text for the onscreen "Bluetooth" button -->
-    <string name="onscreenBluetoothText">Bluetooth</string>
     <!-- Text for the onscreen "Add call" button -->
     <string name="onscreenAddCallText">Add call</string>
     <!-- Text for the onscreen "Merge calls" button -->
@@ -1047,12 +995,9 @@
         <item>3</item>
     </string-array>
 
-    <!-- Label for ERI text widget, shown in list of all gadgets -->
-    <string name="eri_text_label">ERI text</string>
-
     <!-- Dtmf tones settings -->
     <!-- Title for the DTMF Tones options displayed in Call Settings -->
-    <string name="dtmf_tones_title">DTMF Tones</string>
+    <string name="dtmf_tones_title">DTMF tones</string>
     <!-- Summary for the DTMF Tones options displayed in Call Settings -->
     <string name="dtmf_tones_summary">Set the length of DTMF tones</string>
     <!-- Options displayed as part of DTMF Tones in Call Settings -->
@@ -1061,13 +1006,13 @@
       <item>Long</item>
     </string-array>
     <!-- Do not translate. -->
-    <string-array name="dtmf_tone_values">
+    <string-array name="dtmf_tone_values" translatable="false">
        <item>0</item>
        <item>1</item>
     </string-array>
 
     <!-- Title for the dialog used to display CDMA DisplayInfo -->
-    <string name="network_message">Network Message</string>
+    <string name="network_message">Network message</string>
 
     <!-- OTA-specific strings -->
     <!-- Title shown on OTA screen -->
@@ -1076,21 +1021,17 @@
     <string name="ota_touch_activate">A special call needs to be made to activate your phone service.
     \n\nAfter pressing \u201CActivate\u201D, listen to the instructions provided to activate your phone.</string>
 
-    <!-- Message displayed on the OTA activation screen -->
-    <string name="ota_touch_activate_new">Touch \u201CActivate\u201D to place a special call that activates your phone on your carrier\'s mobile network, so you can place calls and connect to mobile data networks.</string>
     <!-- Title of skip activation dialog -->
     <string name="ota_skip_activation_dialog_title">Skip activation\?</string>
     <!-- Message displayed in skip activation dialog  -->
     <string name="ota_skip_activation_dialog_message">If you skip activation, you can\'t place calls or connect to mobile data networks (though you can connect to Wi-Fi networks). Until you activate your phone, you are asked to activate it each time you turn it on.</string>
     <!-- Label shown on dialog button that allows the user to skip activation -->
     <string name="ota_skip_activation_dialog_skip_label">Skip</string>
-    <!-- Label shown on dialog button that continues with activation -->
-    <string name="ota_skip_activation_dialog_continue_label">Activate</string>
 
     <!-- Button label within the OTA activation screen -->
     <string name="ota_activate">Activate</string>
     <!-- Title text shown when phone activation is successful -->
-    <string name="ota_title_activate_success">Phone is activated!</string>
+    <string name="ota_title_activate_success">Phone is activated.</string>
     <!-- Title text shown on screen where activation fails -->
     <string name="ota_title_problem_with_activation">Problem with activation</string>
     <!-- Message displayed on the OTA "listening" screen. This message
@@ -1098,19 +1039,17 @@
          enough room for the dialpad. [CHAR LIMIT=80] -->
     <string name="ota_listen">Follow the spoken instructions until you hear that activation is complete.</string>
 
-    <!-- Button label within the OTA listen screen -->
-    <string name="ota_dialpad">Keypad</string>
     <!-- Button label within the OTA listen screen -->
     <string name="ota_speaker">Speaker</string>
     <!-- String to be displayed on OTA listen screen once user has selected the
          correct option to begin provisioning -->
-    <string name="ota_progress">Please wait while your phone is being programmed.</string>
+    <string name="ota_progress">Wait while your phone is being programmed.</string>
     <!-- String to display within the OTA Fail Notice dialog -->
-    <string name="ota_failure">Programming Unsuccessful</string>
+    <string name="ota_failure">Programming unsuccessful</string>
     <!-- String to be displayed on the OTA Fail/Success screen upon successful provisioning -->
     <string name="ota_successful">Your phone is now activated.  It may take up to 15 minutes for service to start.</string>
     <!-- String to be displayed on the OTA Fail/Success screen upon unsuccessful provisioning -->
-    <string name="ota_unsuccessful">Your phone did not activate.
+    <string name="ota_unsuccessful">Your phone didn\'t activate.
     \nYou may need to find an area with better coverage (near a window, or outside).
     \n\nTry again or call customer service for more options.</string>
     <!-- String to display within the OTA SPC Fail Notice dialog -->
@@ -1121,8 +1060,6 @@
     <string name="ota_try_again">Try again</string>
     <!-- Button label shown on OTA screens that have a next screen -->
     <string name="ota_next">Next</string>
-    <!-- Button label shown on OTA screens to go back to the previous screen -->
-    <string name="ota_back">Back</string>
 
     <!-- Emergency Callback Mode (ECM) -->
     <string name="ecm_exit_dialog">EcmExitDialog</string>
@@ -1141,21 +1078,21 @@
     <!-- ECM: Dialog box message for exiting from the notifications screen -->
     <plurals name="alert_dialog_exit_ecm">
         <!-- number of minutes is one -->
-        <item quantity="one">The phone will be in emergency callback mode for <xliff:g id="count">%s</xliff:g> minute. While in this mode no applications using a data connection can be used. Would you like to exit now?</item>
+        <item quantity="one">The phone will be in Emergency Callback mode for <xliff:g id="count">%s</xliff:g> minute. While in this mode no apps using a data connection can be used. Do you want to exit now?</item>
         <!-- number of minutes is not equal to one -->
-        <item quantity="other">The phone will be in emergency callback mode for <xliff:g id="count">%s</xliff:g> minutes. While in this mode no applications using a data connection can be used. Would you like to exit now?</item>
+        <item quantity="other">The phone will be in Emergency Callback mode for <xliff:g id="count">%s</xliff:g> minutes. While in this mode no applications using a data connection can be used. Do you want to exit now?</item>
     </plurals>
     <!-- ECM: Dialog box message for exiting from any other app -->
     <plurals name="alert_dialog_not_avaialble_in_ecm">
         <!-- number of minutes is one -->
-        <item quantity="one">The selected action is not available while in the emergency callback mode. The phone will be in this mode for <xliff:g id="count">%s</xliff:g> minute. Would you like to exit now?</item>
+        <item quantity="one">The selected action isn\'t available while in the Emergency Callback mode. The phone will be in this mode for <xliff:g id="count">%s</xliff:g> minute. Do you want to exit now?</item>
         <!-- number of minutes is not equal to one -->
-        <item quantity="other">The selected action is not available while in the emergency callback mode. The phone will be in this mode for <xliff:g id="count">%s</xliff:g> minutes. Would you like to exit now?</item>
+        <item quantity="other">The selected action isn\'t available while in the Emergency Callback mode. The phone will be in this mode for <xliff:g id="count">%s</xliff:g> minutes. Do you want to exit now?</item>
     </plurals>
     <!-- ECM: Dialog box message while in emergency call -->
-    <string name="alert_dialog_in_ecm_call">The selected action is not available while in an emergency call</string>
+    <string name="alert_dialog_in_ecm_call">The selected action isn\'t available while in an emergency call.</string>
     <!-- ECM: Progress text -->
-    <string name="progress_dialog_exiting_ecm">Exiting Emergency Callback Mode</string>
+    <string name="progress_dialog_exiting_ecm">Exiting Emergency Callback mode</string>
     <!-- ECM: ECM exit dialog choice -->
     <string name="alert_dialog_yes">Yes</string>
     <!-- ECM: ECM exit dialog choice -->
@@ -1165,53 +1102,29 @@
 
     <!-- For incoming calls, this is a string we can get from a CDMA network instead of
          the actual phone number, to indicate there's no number present.  DO NOT TRANSLATE. -->
-    <string name="absent_num">ABSENT NUMBER</string>
+    <string name="absent_num" translatable="false">ABSENT NUMBER</string>
 
-    <!-- Voicemail dialog title -->
-    <string name="voicemail_settings">Voicemail settings</string>
-
-    <!-- String to display in voicemail number summary when no voicemail num is set -->
-    <string name="voicemail_number_not_set">&lt;not set&gt;</string>
+    <!-- Preference for Voicemail service provider under "Voicemail" settings.
+         [CHAR LIMIT=40] -->
+    <string name="voicemail_provider">Service</string>
 
-    <!-- Voicemail service pref title -->
-    <string name="voicemail_provider">Voicemail service</string>
+    <!-- Preference for Voicemail setting of each provider.
+         [CHAR LIMIT=40] -->
+    <string name="voicemail_settings">Setup</string>
 
-    <!-- Prefix on the voicemail settings preference. The full string will be Settings for <provider name> -->
-    <string name="voicemail_settings_for">Settings for <xliff:g id="provider_name">%s</xliff:g></string>
+    <!-- String to display in voicemail number summary when no voicemail num is set -->
+    <string name="voicemail_number_not_set">&lt;Not set&gt;</string>
 
     <!-- Title displayed above settings coming after voicemail in the call features screen -->
     <string name="other_settings">Other call settings</string>
 
-    <!-- Label for onscreen "Dial" button used in the EmergencyDialer -->
-    <string name="dial_button_label">Dial</string>
+    <!-- Dialer UI Settings -->
+    <string name="dialer_ui_settings_title">Dialpad settings</string>
+    <string name="dialer_ui_settings_summary">Settings for the dialpad</string>
 
     <!-- Title displayed in the overlay when a call is placed using a 3rd party provider.
-         ^1 is the localized name of the provider obtained from the package manager.
-         ^2 is a phone number.
-         E.g: "Calling via Google Voice\n 1-800-666-1234"
-    -->
-    <string name="calling_via_template">Calling via ^1\n<b>^2</b></string>
-
-    <!-- Onscreen hints used for various states of the SlidingTab
-         widget used for incoming calls. -->
-    <eat-comment />
-    <!-- Incoming call hint: drag the tab right to answer -->
-    <string name="slide_to_answer">Drag right to answer</string>
-    <!-- Incoming call hint: drag the tab left to silence ringer -->
-    <string name="slide_to_silence">Drag left to silence ringer</string>
-    <!-- Incoming call hint: drag the tab left to decline the incoming call -->
-    <string name="slide_to_decline">Drag left to decline</string>
-    <!-- Incoming call hint: drag the tab right to answer and hold the active call -->
-    <string name="slide_to_answer_and_hold">Drag right to answer and\nhold active call</string>
-    <!-- Incoming call hint: drag the tab right to answer and end the active call -->
-    <string name="slide_to_answer_and_end_active">Drag right to answer and\nend active call</string>
-    <!-- Incoming call hint: drag the tab right to answer and end the call on hold -->
-    <string name="slide_to_answer_and_end_onhold">Drag right to answer and\nend call on hold</string>
-
-    <!-- Incoming call hint shown on tab (must be kept very short): answer incoming call -->
-    <string name="slide_to_answer_hint">Answer</string>
-    <!-- Incoming call hint shown on tab (must be kept very short): decline incoming call -->
-    <string name="slide_to_decline_hint">Decline</string>
+         [CHAR LIMIT=40] -->
+    <string name="calling_via_template">Calling via <xliff:g id="provider_name">%s</xliff:g></string>
 
     <!-- Use this as a default to describe the contact photo; currently for screen readers through accessibility. -->
     <string name="contactPhoto">contact photo</string>
@@ -1229,14 +1142,10 @@
     <string name="sip_accounts">Internet calling (SIP) accounts</string>
     <!-- Title displayed SIP account settings in the sip settings category. [CHAR LIMIT=NONE] -->
     <string name="sip_accounts_title">Accounts</string>
-    <!-- The Sip Account Settings's summary. [CHAR LIMIT=NONE] -->
-    <string name="sip_accounts_summary">Manage Internet calling (SIP) accounts and status</string>
     <!-- Title displayed for the button of receiving incoming SIP calls flag. Enabled for receiving calls. [CHAR LIMIT=NONE] -->
     <string name="sip_receive_calls">Receive incoming calls</string>
     <!-- Help user to understand that it will require more battery usage if the 'receiving incoming call' is enabled. [CHAR LIMIT=NONE] -->
     <string name="sip_receive_calls_summary">Reduces battery life</string>
-    <!-- Title for the button of configuring the way we handle an outgoing call. [CHAR LIMIT=NONE] -->
-    <string name="sip_call_options">Configure call options</string>
     <!-- Title for the dialog of selecting the way we handle an outgoing call. [CHAR LIMIT=NONE] -->
     <string name="sip_call_options_title">Use Internet calling</string>
     <!-- Title for the dialog of selecting the way we handle an outgoing call (Wi-Fi only). [CHAR LIMIT=NONE] -->
@@ -1251,11 +1160,6 @@
     <!-- Item of the Internet call (Wi-Fi only) option dialog: for routing all outgoing calls via SIP. [CHAR LIMIT=NONE] -->
     <string name="sip_call_options_wifi_only_entry_1">For all calls</string>
 
-    <!-- Title for enabling the auto registration for all sip accounts.  [CHAR LIMIT=NONE] -->
-    <string name="auto_reg">Auto-registration</string>
-    <!-- Title for enabling the routing all outgoing calls via SIP. [CHAR LIMIT=NONE] -->
-    <string name="call_priority">Outgoing call via SIP</string>
-
     <!-- Title of the dialog to select the phone type for the outgoing call. [CHAR LIMIT=NONE] -->
     <string name ="pick_outgoing_call_phone_type">Place call</string>
 
@@ -1266,7 +1170,7 @@
     <string name ="remember_my_choice">Always use to place Internet calls</string>
 
     <!-- Help text of checkbox to unset the default sip phone for all outbound calls. [CHAR LIMIT=NONE] -->
-    <string name ="reset_my_choice_hint">You can use the Call Settings to change which Internet calling account to use by default when placing calls, by selecting a different account under Internet call settings</string>
+    <string name ="reset_my_choice_hint">You can change which Internet calling account to use by default from the Phone &gt; Settings &gt; Internet call settings &gt; Accounts screen.</string>
 
     <!-- Item of the dialog to select the phone type for outgoing call. [CHAR LIMIT=NONE] -->
     <string name ="pstn_phone">Cell phone call</string>
@@ -1277,7 +1181,7 @@
     <!-- Title of the dialog to redirect the user to SIP settings. [CHAR LIMIT=NONE] -->
     <string name ="no_sip_account_found_title">No Internet calling account</string>
     <!-- Message of the dialog to redirect the user to SIP settings. [CHAR LIMIT=NONE] -->
-    <string name ="no_sip_account_found">There are no Internet calling accounts on this phone.  Add one now?</string>
+    <string name ="no_sip_account_found">There are no Internet calling accounts on this phone. Do you want to add one now?</string>
     <!-- Menu item for no sip account found dialog -->
     <string name="sip_menu_add">Add</string>
 
@@ -1288,9 +1192,9 @@
     <!-- String of the category which lists all sip accounts. [CHAR LIMIT=NONE] -->
     <string name="sip_account_list">SIP accounts</string>
     <!-- Toast message to indicate that the system is saving the account. [CHAR LIMIT=NONE] -->
-    <string name="saving_account">Saving the account...</string>
+    <string name="saving_account">Saving the account\u2026</string>
     <!-- Toast message to indicate that the system is removing the account. [CHAR LIMIT=NONE] -->
-    <string name="removing_account">Removing the account...</string>
+    <string name="removing_account">Removing the account\u2026</string>
 
     <!-- Menu item when the menu button is pressed in the sip account editor. [CHAR LIMIT=NONE] -->
     <string name="sip_menu_save">Save</string>
@@ -1304,40 +1208,32 @@
     <!-- Title of the button to show in a alert dialog. [CHAR LIMIT=NONE] -->
     <string name="close_profile">Close</string>
 
-    <!-- Text of the account type. 'Primary' means the account is the one for sending all outgoing calls through. [CHAR LIMIT=NONE] -->
-    <string name="primary_account">Primary</string>
-    <!-- Title of the account type checkbox. Once the box is checked, the account will be the only 'primary' one among the accounts. [CHAR LIMIT=NONE] -->
-    <string name="primary_account_title">Make this my primary account</string>
-    <!-- Summary text of the account type checkbox. [CHAR LIMIT=NONE] -->
-    <string name="primary_account_summary">Used for outbound calls</string>
-    <!-- Title of the advanced settings button. The button will show the advanced settings of a SIP account in the SIP editor [CHAR LIMIT=NONE] -->
-    <string name="advanced_settings_title">Advanced settings</string>
     <!-- Summary of a SIP account in the list of SIP accounts, consists of primary account status and registration status. This string indicates that this SIP account is a primary account and the string placeholder is the registration status, which will be one of the strings with name starting with "registration_status_" below. [CHAR LIMIT=NONE] -->
     <string name="primary_account_summary_with">Primary account. <xliff:g id="registration_status" example="Registering...">%s</xliff:g></string>
     <!-- Text of Internet-call registration status, checking current registration status with SIP service [CHAR LIMIT=NONE] -->
     <string name="registration_status_checking_status">Checking status...</string>
     <!-- Text of Internet-call registration status, registering with SIP server in order to receive calls on this account [CHAR LIMIT=NONE] -->
-    <string name="registration_status_registering">Registering...</string>
+    <string name="registration_status_registering">Registering\u2026</string>
     <!-- Text of Internet-call registration status, still trying to register with SIP server [CHAR LIMIT=NONE] -->
-    <string name="registration_status_still_trying">Still trying...</string>
+    <string name="registration_status_still_trying">Still trying\u2026</string>
     <!-- Text of Internet-call registration status, currently not receiving calls on this account [CHAR LIMIT=NONE] -->
-    <string name="registration_status_not_receiving">Not receiving calls</string>
+    <string name="registration_status_not_receiving">Not receiving calls.</string>
     <!-- Text of Internet-call registration status, no data connection [CHAR LIMIT=NONE] -->
-    <string name="registration_status_no_data">Account registration stopped because there is no Internet connection</string>
+    <string name="registration_status_no_data">Account registration stopped because there is no Internet connection.</string>
     <!-- Text of Internet-call registration status, no Wi-Fi connection [CHAR LIMIT=NONE] -->
-    <string name="registration_status_no_wifi_data">Account registration stopped because there is no Wi-Fi connection</string>
+    <string name="registration_status_no_wifi_data">Account registration stopped because there is no Wi-Fi connection.</string>
     <!-- Text of Internet-call registration status, registration process is not running due to some error [CHAR LIMIT=NONE] -->
-    <string name="registration_status_not_running">Account registration unsuccessful</string>
+    <string name="registration_status_not_running">Account registration unsuccessful.</string>
     <!-- Text of Internet-call registration status, currently we can receive calls on this account [CHAR LIMIT=NONE] -->
-    <string name="registration_status_done">Receiving calls</string>
+    <string name="registration_status_done">Receiving calls.</string>
     <!-- Text of Internet-call registration status, registration failed with a reason; will try again later [CHAR LIMIT=NONE] -->
     <string name="registration_status_failed_try_later">Account registration unsuccessful: (<xliff:g id="registration_error_message" example="timed out">%s</xliff:g>); will try later</string>
     <!-- Text of Internet-call registration status, registration failed due to invalid credentials [CHAR LIMIT=NONE] -->
-    <string name="registration_status_invalid_credentials">Account registration unsuccessful: incorrect username or password</string>
+    <string name="registration_status_invalid_credentials">Account registration unsuccessful: Incorrect username or password.</string>
     <!-- Text of Internet-call registration status, registration failed due to unknown host exception [CHAR LIMIT=NONE] -->
-    <string name="registration_status_server_unreachable">Account registration unsuccessful: check the server name</string>
+    <string name="registration_status_server_unreachable">Account registration unsuccessful: Check the server name.</string>
     <!-- Text for describing the account's owner and status. For example, 'Active, in use by Google Talk', it means that the account managed by SIP service was registered by the application 'Google Talk' and the status is active. [CHAR LIMIT=NONE] -->
-    <string name="third_party_account_summary">This account is currently in use by the <xliff:g id="account_owner" example="Google Talk">%s</xliff:g> application</string>
+    <string name="third_party_account_summary">This account is currently in use by the <xliff:g id="account_owner" example="Google Talk">%s</xliff:g> app.</string>
 
 
     <!-- Title of the sip editor screen. [CHAR LIMIT=NONE] -->
@@ -1361,12 +1257,6 @@
     <string name="transport_title">Transport type</string>
     <!-- Text of the keepalive preference. [CHAR LIMIT=NONE] -->
     <string name="send_keepalive_title">Send keep-alive</string>
-    <!-- Text of the keepalive preference summary. [CHAR LIMIT=NONE] -->
-    <string name="send_keepalive_summary">Send SIP keep-alive messages</string>
-    <!-- Text of the auto registration preference. [CHAR LIMIT=NONE] -->
-    <string name="auto_registration_title">Auto-registration</string>
-    <!-- Text of the auto registration preference summary. [CHAR LIMIT=NONE] -->
-    <string name="auto_registration_summary">Register the profile automatically</string>
     <!-- Text of the set-primary preference. Simplified from "Make this my primary account". [CHAR LIMIT=NONE] -->
     <string name="set_primary_title">Set as primary account</string>
     <!-- Text of the set-primary preference summary. [CHAR LIMIT=NONE] -->
@@ -1397,18 +1287,18 @@
     <string name="advanced_settings_hide">▽ Touch to hide all</string>
 
     <!-- Text in an alert dialog telling the user that some input field (name of which is also part of the strings being translated above) is required and can not be left blank. [CHAR LIMIT=NONE] -->
-    <string name="empty_alert"><xliff:g id="input_field_name" example="Username, Password...">%s</xliff:g> is required, cannot be left blank</string>
+    <string name="empty_alert"><xliff:g id="input_field_name" example="Username, Password...">%s</xliff:g> is required and can\'t be left blank.</string>
     <!-- Showing that port number is out of range in an alert dialog. [CHAR LIMIT=NONE] -->
-    <string name="not_a_valid_port">Port number should be within 1000 and 65534</string>
+    <string name="not_a_valid_port">Port number should be within 1000 and 65534.</string>
 
     <!-- Title of the alert dialog to notify user that there is no Internet connectivity. [CHAR LIMIT=40] -->
     <string name="no_internet_available_title">No Internet connection</string>
     <!-- Title of the alert dialog to notify user that there is no Wi-Fi connectivity. [CHAR LIMIT=40] -->
     <string name="no_wifi_available_title">No Wi-Fi connection</string>
     <!-- Message of the alert dialog to notify user that there is no Internet connectivity. [CHAR LIMIT=NONE] -->
-    <string name="no_internet_available">To place an Internet call, check your Internet connection first</string>
+    <string name="no_internet_available">To place an Internet call, check your Internet connection first.</string>
     <!-- Message of the alert dialog to notify user that there is no Wi-Fi connectivity. [CHAR LIMIT=NONE] -->
-    <string name="no_wifi_available">You must be connected to a Wi-Fi network for Internet calls (use the Wireless &amp; Network settings)</string>
+    <string name="no_wifi_available">You need to be connected to a Wi-Fi network for Internet calls (use the Wireless &amp; Network settings).</string>
     <!-- Title of the alert dialog to notify user that Internet call is not supported. [CHAR LIMIT=40] -->
     <string name="no_voip">Internet calling not supported</string>
 
@@ -1431,7 +1321,6 @@
     <string translatable="false" name="port">Port</string>
     <string translatable="false" name="transport">Protocol</string>
     <string translatable="false" name="send_keepalive">SendKeepAlive</string>
-    <string translatable="false" name="auto_registration">AutoRegistration</string>
     <string translatable="false" name="set_primary">SetPrimary</string>
     <string translatable="false" name="advanced_settings_container">advanced settings container</string>
     <string translatable="false" name="auth_username">AuthUserName</string>
@@ -1450,7 +1339,7 @@
     <!-- Canned response for the "Respond via SMS" feature for incoming calls. [CHAR LIMIT=35] -->
     <string name="respond_via_sms_canned_response_4">Can\'t talk now. Call me later?</string>
     <!-- "Respond via SMS" option that lets you compose a custom response. [CHAR LIMIT=30] -->
-    <string name="respond_via_sms_custom_message">Custom message...</string>
+    <string name="respond_via_sms_custom_message">Custom message</string>
 
     <!-- Title of settings screen for managing the "Respond via SMS" feature. [CHAR LIMIT=30] -->
     <string name="respond_via_sms_setting_title">Quick responses</string>
@@ -1562,13 +1451,6 @@
     -->
     <string name="description_image_button_pound">pound</string>
 
-    <!-- String describing the Search ImageButton
-
-         Used by AccessibilityService to announce the purpose of the button.
-         [CHAR LIMIT=NONE]
-    -->
-    <string name="description_search_button">search</string>
-
     <!-- String describing the Dial ImageButton
 
          Used by AccessibilityService to announce the purpose of the button.
@@ -1601,6 +1483,9 @@
     <!-- Dialog title for the vibration settings for voice mail notifications [CHAR LIMIT=40]-->
     <string name="voicemail_notification_vibarte_when_dialog_title" msgid="8995274609647451109">Vibrate</string>
 
+    <!-- Voicemail ringtone title [CHAR LIMIT=40] -->
+    <string name="voicemail_notification_ringtone_title">Ringtone</string>
+
     <!-- The vibrate notification modes for voicemail notifications -->
     <string-array name="voicemail_notification_vibrate_when_entries">
         <!-- Always [CHAR LIMIT=40] -->
@@ -1620,4 +1505,53 @@
         <item>silent</item>
         <item>never</item>
     </string-array>
+
+    <!-- Setting option name to pick ringtone (a list dialog comes up). [CHAR LIMIT=30] -->
+    <string name="ringtone_title" msgid="5379026328015343686">Phone ringtone</string>
+
+    <!-- Setting option name to enable or disable vibration when ringing
+         the phone.
+         [CHAR LIMIT=40] -->
+    <string name="vibrate_on_ring_title">Vibrate when ringing</string>
+
+    <!-- Setting option name to enable or disable DTMF tone sound
+         [CHAR LIMIT=40] -->
+    <string name="dtmf_tone_enable_title">Dial pad touch tones</string>
+
+    <!-- Title for the category "ringtone", which is shown above ringote settings
+         [CHAR LIMIT=40] -->
+    <string name="preference_category_ringtone">Ringtone</string>
+
+    <!-- Voice quality filter -->
+    <string name="voice_quality_preferences_title">Voice quality</string>
+    <string name="voice_quality_summary">Voice profile is currently set to: %s</string>
+    <!-- Do not remove those, they're used from overlays -->
+    <string name="voice_quality_entry_normal">Normal</string>
+    <string name="voice_quality_entry_clear">Clear</string>
+    <string name="voice_quality_entry_crisp">Crisp</string>
+    <string name="voice_quality_entry_bright">Bright</string>
+
+    <string name="perm_change_mobile_network">Change network (2G/3G)</string>
+    <string name="perm_change_mobile_network_desc">Application with this permission can, at any time, change between 2G data and 3G data. 3G is faster, consumes more battery, and can also cost you more money.</string>
+
+    <!-- Noise suppression -->
+    <string name="noise_suppression_title">Noise suppression</string>
+    <string name="noise_suppression_summary">Enable noise suppression for calls</string>
+    <!-- End Noise suppression -->
+
+    <string name="phone_number_label">My phone number</string>
+    <string name="phone_number_summary">Set the phone number for this device</string>
+
+    <!-- Advanced Settings -->
+    <string name="advanced_setting">Advanced Settings</string>
+    <string name="keep_proximity_sensor_on">Keep proximity sensor on</string>
+    <string name="keep_proximity_sensor_on_sum">Do not turn off the proximity sensor during calls using a headset</string>
+    <string name="lockscreen_if_call_ends_with_screenoff">Lock when call ends</string>
+    <string name="lockscreen_if_call_ends_with_screenoff_sum">Lock automatically when a call ends and the screen is off</string>
+    <string name="vibrate_outgoing">Vibrate on answer</string>
+    <string name="vibrate_call_waiting">Vibrate on call waiting</string>
+    <string name="vibrate_hangup">Vibrate on hang up</string>
+    <string name="vibrate_45">Vibrate every 45 seconds</string>
+    <string name="vibrate_45_sum">Vibrates at the 45 second mark of every minute during outgoing calls</string>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fd1ebce59..798cf0724 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -15,25 +15,13 @@
 -->
 
 <resources>
-    <drawable name="separator_red">#FFAE1200</drawable>
-    <drawable name="separator_green">#FF008115</drawable>
     <drawable name="grayBg">#FF333333</drawable>
 
-    <style name="Incoming">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowBackground">@null</item>
-    </style>
-
     <style name="IccPanel">
         <item name="android:windowFrame">@null</item>
         <item name="android:windowBackground">@drawable/grayBg</item>
     </style>
 
-    <style name="AlertPanel">
-        <item name="android:windowFrame">@null</item>
-        <item name="android:windowBackground">@drawable/grayBg</item>
-    </style>
-
     <style name="info_label">
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
@@ -65,37 +53,6 @@
         <item name="android:textStyle">bold</item>
     </style>
 
-    <style name="incall_top_button" parent="android:Widget.Button">
-        <item name="android:gravity">center_vertical</item>
-        <item name="android:layout_width">0sp</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:padding">0dip</item>
-        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
-        <item name="android:textColor">#000</item>
-    </style>
-
-    <style name="TextAppearance.DialerLine1" parent="@android:style/TextAppearance.Widget.Button">
-        <item name="android:textSize">32sp</item>
-        <item name="android:textColor">@color/dialer_button_text</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="TextAppearance.DialerLine2" parent="@android:style/TextAppearance.Widget.Button">
-        <item name="android:textSize">18sp</item>
-        <item name="android:textColor">@color/dialer_button_text</item>
-    </style>
-
-    <style name="TextAppearance.EmergencyDialerLine1" parent="@android:style/TextAppearance.Widget.Button">
-        <item name="android:textSize">22sp</item>
-        <item name="android:textColor">#ffffff</item>
-    </style>
-
-    <style name="TextAppearance.EmergencyDialerLine2" parent="@android:style/TextAppearance.Widget.Button">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">#ffffff</item>
-    </style>
-
     <!-- Preference Style for the phone number preferences -->
     <style name="EditPhoneNumberPreference">
         <item name="enableButtonText">@string/enable</item>
@@ -104,25 +61,6 @@
         <item name="confirmMode">activation</item>
     </style>
 
-    <!-- Preference Style for the emergency callback mode -->
-    <!-- This styles is currently not used and just prepared for further usage -->
-    <style name="EmergencyCallBack">
-        <item name="android:textSize">20sp</item>
-        <item name="android:textColor">#ffffff</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:colorForeground">#fff</item>
-    </style>
-
-    <!-- Preference Style for the ERI text -->
-    <style name="EriWidgetBackground">
-    </style>
-
-    <style name="TextAppearance.EriWidget">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:textColor">@android:color/black</item>
-    </style>
-
     <!-- OTA Call Card styles -->
     <style name="ccOtaButtonBar">
         <!-- TODO: change height to 'wrap_content' when layout bug is fixed -->
@@ -153,10 +91,6 @@
         <item name="android:layout_marginLeft">4dip</item>
     </style>
 
-    <style name="ccOtaDialVisible">
-        <item name="android:visibility">visible</item>
-    </style>
-
     <style name="ccOtaWizardTitle">
         <item name="android:textSize">22sp</item>
         <item name="android:textColor">@color/ota_title_color</item>
@@ -169,8 +103,9 @@
 
     <!-- Buttons in the main "button row" of the in-call onscreen touch UI. -->
     <style name="InCallButton">
-        <item name="android:layout_width">@dimen/in_call_button_width</item>
+        <item name="android:layout_width">0px</item>
         <item name="android:layout_height">@dimen/in_call_button_height</item>
+        <item name="android:layout_weight">1</item>
         <item name="android:background">?android:attr/selectableItemBackground</item>
     </style>
 
@@ -184,12 +119,24 @@
         <item name="android:textOff">@null</item>
     </style>
 
+    <style name="VerticalSeparator">
+        <item name="android:layout_width">2dp</item>
+        <item name="android:layout_height">match_parent</item>
+        <item name="android:background">@android:color/black</item>
+    </style>
+
     <!-- "End" button; similar to InCallButton. -->
     <style name="InCallEndButton">
         <item name="android:layout_width">0dip</item>
         <item name="android:layout_height">@dimen/in_call_end_button_height</item>
         <item name="android:layout_weight">1</item>
-        <item name="android:background">?android:attr/selectableItemBackground</item>
+    </style>
+
+    <!-- Buttons in extra button row. -->
+    <style name="InCallExtraRowButton">
+        <item name="android:layout_width">@dimen/extra_row_button_width</item>
+        <item name="android:layout_height">@dimen/extra_row_button_height</item>
+        <item name="android:background">@null</item>
     </style>
 
     <!-- Text label drawn alongside buttons in the "extra button row" of
@@ -213,12 +160,41 @@
         <item name="android:windowCloseOnTouchOutside">true</item>
     </style>
 
+    <style name="InCallAnimationStyle" parent="@*android:style/Animation.Holo.Activity">
+        <!-- Suppress task-to-task animation happening during the transition from
+             OutgoingCallBroadcaster (and SipOptionHandler) to InCallScreen.
+             The transition unexpectedly happens during the transition (inside the phone task),
+             because InCallScreen is using android:launchMode="singleInstance".
+
+             - taskOpenEnterAnimation/taskOpenExitAnimation is used for the first time
+               InCallScreen instance is created.
+
+             - taskToFrontEnterAnimation/taskToFrontExitAnimation is used when InCallScreen
+               is already available.
+               (Note that InCallScreen won't be destroyed once it is created)
+
+             TODO: try removing the flag instead -->
+        <item name="*android:taskOpenEnterAnimation">@*android:anim/activity_open_enter</item>
+        <item name="*android:taskOpenExitAnimation">@*android:anim/activity_open_exit</item>
+        <item name="*android:taskToFrontEnterAnimation">@*android:anim/activity_open_enter</item>
+        <item name="*android:taskToFrontExitAnimation">@*android:anim/activity_open_exit</item>
+    </style>
+
+    <style name="OutgoingAnimationStyle" parent="@*android:style/Animation.Holo.Activity">
+        <!-- Suppress task-to-task transition animation happening from
+             DialtactsActivity to OutgoingCallBroadcaster. -->
+        <item name="*android:taskOpenEnterAnimation">@*android:anim/activity_open_enter</item>
+        <item name="*android:taskOpenExitAnimation">@*android:anim/activity_open_exit</item>
+    </style>
+
     <!-- Theme for the InCallScreen activity.  This gives us a totally black
          window background instead of the default dark grey.  (We don't just use
          Theme.Black.NoTitleBar directly, since we want any popups or dialogs
          from the InCallScreen to have the correct holo style. -->
     <style name="Theme.InCallScreen" parent="@android:style/Theme.Holo.NoActionBar">
         <item name="android:windowBackground">@android:color/black</item>
+
+        <item name="*android:windowAnimationStyle">@style/InCallAnimationStyle</item>
     </style>
 
     <style name="DialpadButtonStyle">
@@ -244,4 +220,22 @@
         <item name="android:windowBackground">@android:color/black</item>
     </style>
 
+    <style name="OutgoingCallBroadcasterTheme" parent="@android:style/Theme.Holo.NoActionBar">
+        <item name="android:windowBackground">@android:color/black</item>
+
+        <item name="*android:windowAnimationStyle">@style/OutgoingAnimationStyle</item>
+    </style>
+
+    <style name="SipCallOptionHandlerTheme" parent="@android:style/Theme.Holo.NoActionBar">
+        <item name="android:windowBackground">@android:color/black</item>
+    </style>
+
+    <style name="DialtactsDigitsTextAppearance">
+        <item name="android:maxLines">1</item>
+        <item name="android:textSize">@dimen/dialpad_digits_text_size</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:freezesText">true</item>
+        <item name="android:editable">true</item>
+        <item name="android:cursorVisible">false</item>
+    </style>
 </resources>
diff --git a/res/xml/call_feature_setting.xml b/res/xml/call_feature_setting.xml
index 56ca1528a..33f6a21c6 100644
--- a/res/xml/call_feature_setting.xml
+++ b/res/xml/call_feature_setting.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2008 The Android Open Source Project
+     Advanced Settings (C) 2012 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,64 +16,114 @@
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:phone="http://schemas.android.com/apk/res/com.android.phone"
-        android:title="@string/call_settings">
+    android:title="@string/call_settings">
 
-    <PreferenceScreen
-        android:key="button_fdn_key"
-        android:title="@string/fdn"
-        android:summary="@string/sum_fdn"
+    <PreferenceCategory
+        android:key="button_ringtone_category_key"
+        android:title="@string/preference_category_ringtone"
         android:persistent="false">
 
-        <intent android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.phone"
-            android:targetClass="com.android.phone.FdnSetting" />
-
-    </PreferenceScreen>
-
-    <PreferenceScreen
-        android:key="button_respond_via_sms_key"
-        android:title="@string/respond_via_sms_setting_title"
-        android:summary="@string/respond_via_sms_setting_summary"
-        android:persistent="false">
+        <com.android.phone.DefaultRingtonePreference
+            android:key="button_ringtone_key"
+            android:title="@string/ringtone_title"
+            android:dialogTitle="@string/ringtone_title"
+            android:persistent="false"
+            android:ringtoneType="ringtone" />
 
-        <intent android:action="android.intent.action.MAIN"
-            android:targetPackage="com.android.phone"
-            android:targetClass="com.android.phone.RespondViaSmsManager$Settings" />
-    </PreferenceScreen>
+        <CheckBoxPreference
+            android:key="button_vibrate_on_ring"
+            android:title="@string/vibrate_on_ring_title"
+            android:persistent="false"
+            android:defaultValue="false" />
+    </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="button_voicemail_category_key"
-        android:title="@string/voicemail"
-        android:persistent="false">
+        android:key="pref_advanced_settings"
+        android:title="@string/advanced_setting">
+
+        <CheckBoxPreference
+            android:key="keep_proximity_sensor_on"
+            android:title="@string/keep_proximity_sensor_on"
+            android:persistent="true"
+            android:summary="@string/keep_proximity_sensor_on_sum"/>
+        <CheckBoxPreference
+            android:key="lockscreen_if_call_ends_with_screenoff"
+            android:title="@string/lockscreen_if_call_ends_with_screenoff"
+            android:persistent="false"
+            android:summary="@string/lockscreen_if_call_ends_with_screenoff_sum"/>
+        <CheckBoxPreference
+            android:key="button_vibrate_outgoing"
+            android:title="@string/vibrate_outgoing"
+            android:persistent="true" />
+        <CheckBoxPreference
+            android:key="button_vibrate_call_waiting"
+            android:title="@string/vibrate_call_waiting"
+            android:persistent="true" />
+        <CheckBoxPreference
+            android:key="button_vibrate_hangup"
+            android:title="@string/vibrate_hangup"
+            android:persistent="true" />
+        <CheckBoxPreference
+            android:key="button_vibrate_45"
+            android:title="@string/vibrate_45"
+            android:persistent="true"
+            android:summary="@string/vibrate_45_sum" />
+    </PreferenceCategory>
+
+  <PreferenceCategory
+      android:key="button_misc_category_key"
+      android:title="@string/other_settings"
+      android:persistent="false" />
+
+  <PreferenceScreen
+      android:key="button_voicemail_category_key"
+      android:title="@string/voicemail"
+      android:persistent="false">
+
+      <CheckBoxPreference
+          android:defaultValue="false"
+          android:key="button_mwi_notification_key"
+          android:title="@string/mwi_notification_title"
+          android:persistent="false"
+          android:summary="@string/mwi_notification_summary" />
+
       <ListPreference
           android:key="button_voicemail_provider_key"
           android:title="@string/voicemail_provider"
           android:summary="@string/sum_voicemail_choose_provider"
           android:defaultValue=""
-          android:persistent="true"
-      />
-      <PreferenceScreen android:key="button_voicemail_setting_key"
-            android:title="@string/voicemail_settings"
-            android:persistent="false">
-
-            <!-- Note for all com.android.phone.EditPhoneNumberPreference objects
-
-           The last several attributes are for use with the EditText field
-           in the dialog.  These attributes are forwarded to that field
-           when the edittext is created.  The attributes include:
-             1. android:singleLine
-             2. android:autoText
-             3. android:background -->
-
-              <com.android.phone.EditPhoneNumberPreference
-                android:key="button_voicemail_key"
-                android:title="@string/voicemail_settings_number_label"
-                android:persistent="false"
-                android:dialogTitle="@string/voicemail"
-                phone:confirmMode="confirm"
-                android:singleLine="true"
-                android:autoText="false" />
+          android:persistent="true" />
+      <PreferenceScreen
+          android:key="button_voicemail_setting_key"
+          android:title="@string/voicemail_settings"
+          android:persistent="false">
+
+          <!-- Note for all com.android.phone.EditPhoneNumberPreference objects
+
+               The last several attributes are for use with the EditText field
+               in the dialog.  These attributes are forwarded to that field
+               when the edittext is created.  The attributes include:
+               1. android:singleLine
+               2. android:autoText
+               3. android:background -->
+
+          <com.android.phone.EditPhoneNumberPreference
+              android:key="button_voicemail_key"
+              android:title="@string/voicemail_settings_number_label"
+              android:persistent="false"
+              android:dialogTitle="@string/voicemail"
+              phone:confirmMode="confirm"
+              android:singleLine="true"
+              android:autoText="false" />
       </PreferenceScreen>
+
+      <RingtonePreference
+          android:key="button_voicemail_notification_ringtone_key"
+          android:title="@string/voicemail_notification_ringtone_title"
+          android:persistent="true"
+          android:ringtoneType="notification"
+          android:defaultValue="content://settings/system/notification_sound" />
+
       <ListPreference
           android:key="button_voicemail_notification_vibrate_when_key"
           android:title="@string/voicemail_notification_vibrate_when_title"
@@ -81,11 +132,33 @@
           android:entryValues="@array/voicemail_notification_vibrate_when_values"
           android:defaultValue="@string/voicemail_notification_vibrate_when_default"
           android:dialogTitle="@string/voicemail_notification_vibarte_when_dialog_title" />
-  </PreferenceCategory>
-
-  <PreferenceCategory android:key="button_misc_category_key"
-        android:title="@string/other_settings"
-        android:persistent="false" />
+  </PreferenceScreen>
+
+  <CheckBoxPreference
+      android:key="button_play_dtmf_tone"
+      android:title="@string/dtmf_tone_enable_title"
+      android:persistent="false"
+      android:defaultValue="true" />
+
+  <PreferenceScreen
+      android:key="button_respond_via_sms_key"
+      android:title="@string/respond_via_sms_setting_title"
+      android:summary="@string/respond_via_sms_setting_summary"
+      android:persistent="false">
+      <intent
+          android:action="android.intent.action.MAIN"
+          android:targetPackage="com.android.phone"
+          android:targetClass="com.android.phone.RespondViaSmsManager$Settings" />
+  </PreferenceScreen>
+
+  <PreferenceScreen
+      android:key="button_fdn_key"
+      android:title="@string/fdn"
+      android:persistent="false">
+      <intent android:action="android.intent.action.MAIN"
+          android:targetPackage="com.android.phone"
+          android:targetClass="com.android.phone.FdnSetting" />
+  </PreferenceScreen>
 
     <CheckBoxPreference
         android:key="button_auto_retry_key"
@@ -114,6 +187,12 @@
         android:entries="@array/dtmf_tone_entries"
         android:entryValues="@array/dtmf_tone_values"/>
 
+    <CheckBoxPreference
+        android:key="button_noise_suppression_key"
+        android:title="@string/noise_suppression_title"
+        android:summary="@string/noise_suppression_summary"
+        android:defaultValue="1"/>
+
     <PreferenceScreen
         android:key="button_gsm_more_expand_key"
         android:title="@string/labelGSMMore"
@@ -135,4 +214,25 @@
             android:targetPackage="com.android.phone"
             android:targetClass="com.android.phone.CdmaCallOptions"/>
     </PreferenceScreen>
+
+    <ListPreference
+	        android:key="button_voice_quality_key"
+        android:title="@string/voice_quality_preferences_title"
+        android:summary="@string/voice_quality_summary"
+        android:entries="@array/voice_quality_entries"
+        android:entryValues="@array/voice_quality_values"
+        android:dialogTitle="@string/voice_quality_preferences_title"/>
+
+    <PreferenceScreen
+        android:title="@string/dialer_ui_settings_title"
+        android:summary="@string/dialer_ui_settings_summary"
+        android:persistent="false">
+
+        <intent android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.contacts"
+            android:targetClass="com.android.contacts.preference.DialpadPreferenceActivity"/>
+    </PreferenceScreen>
+
+
+
 </PreferenceScreen>
diff --git a/res/xml/callforward_options.xml b/res/xml/callforward_options.xml
index 1669d5cfc..0ff1e9033 100644
--- a/res/xml/callforward_options.xml
+++ b/res/xml/callforward_options.xml
@@ -25,7 +25,8 @@
         phone:serviceClass="voice"
         phone:reason="unconditional"
         android:singleLine="true"
-        android:autoText="false"/>
+        android:autoText="false"
+        android:enabled="false" />
 
     <!-- See note on com.android.phone.EditPreference above -->
     <com.android.phone.CallForwardEditPreference
@@ -41,7 +42,8 @@
         phone:reason="busy"
         android:dependency="button_cfu_key"
         android:singleLine="true"
-        android:autoText="false"/>
+        android:autoText="false"
+        android:enabled="false" />
 
     <!-- See note on com.android.phone.EditPreference above -->
     <com.android.phone.CallForwardEditPreference
@@ -57,7 +59,8 @@
         phone:reason="no_reply"
         android:dependency="button_cfu_key"
         android:singleLine="true"
-        android:autoText="false"/>
+        android:autoText="false"
+        android:enabled="false" />
 
     <!-- See note on com.android.phone.EditPreference above -->
     <com.android.phone.CallForwardEditPreference
@@ -73,5 +76,6 @@
         phone:reason="not_reachable"
         android:dependency="button_cfu_key"
         android:singleLine="true"
-        android:autoText="false"/>
+        android:autoText="false"
+        android:enabled="false" />
 </PreferenceScreen>
diff --git a/res/xml/gsm_umts_additional_options.xml b/res/xml/gsm_umts_additional_options.xml
index fc80f791a..47f265153 100644
--- a/res/xml/gsm_umts_additional_options.xml
+++ b/res/xml/gsm_umts_additional_options.xml
@@ -10,12 +10,24 @@
         android:defaultValue="DEFAULT"
         android:entries="@array/clir_display_values"
         android:entryValues="@array/clir_values"
-        android:dialogTitle="@string/labelCallerId"/>
+        android:dialogTitle="@string/labelCallerId"
+        android:summary="@string/sum_loading_settings"
+        android:enabled="false"/>
 
     <com.android.phone.CallWaitingCheckBoxPreference
         android:key="button_cw_key"
         android:title="@string/labelCW"
         android:persistent="false"
         android:summaryOn="@string/sum_cw_enabled"
-        android:summaryOff="@string/sum_cw_disabled"/>
+        android:summaryOff="@string/sum_cw_disabled"
+        android:enabled="false"/>
+
+    <com.android.phone.MSISDNEditPreference
+        android:key="button_pn_key"
+        android:title="@string/phone_number_label"
+        android:summary="@string/phone_number_summary"
+        android:dialogTitle="@string/phone_number_label"
+        android:dialogMessage="@string/phone_number_summary"
+        android:negativeButtonText="@string/cancel"
+        android:positiveButtonText="@string/ok" />
 </PreferenceScreen>
diff --git a/res/xml/gsm_umts_options.xml b/res/xml/gsm_umts_options.xml
index afdd0d30f..fd0b676de 100644
--- a/res/xml/gsm_umts_options.xml
+++ b/res/xml/gsm_umts_options.xml
@@ -24,7 +24,7 @@
 
         <intent android:action="android.intent.action.MAIN"
             android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.ApnSettings" />
+            android:targetClass="com.android.settings.Settings$ApnSettingsActivity" />
 
     </PreferenceScreen>
 
diff --git a/res/xml/network_setting.xml b/res/xml/network_setting.xml
index b24b82cc8..0870cf086 100644
--- a/res/xml/network_setting.xml
+++ b/res/xml/network_setting.xml
@@ -35,6 +35,13 @@
         android:summaryOn="@string/roaming_enable"
         android:summaryOff="@string/roaming_disable"/>
 
+    <CheckBoxPreference
+        android:key="button_national_roaming_key"
+        android:title="@string/national_roaming"
+        android:persistent="false"
+        android:summaryOn="@string/national_roaming_enable"
+        android:summaryOff="@string/national_roaming_disable"/>
+
     <PreferenceScreen
         android:key="button_data_usage_key"
         android:title="@string/throttle_data_usage"
@@ -53,4 +60,20 @@
         android:entryValues="@array/preferred_network_mode_values"
         android:dialogTitle="@string/preferred_network_mode_dialogtitle" />
 
+    <ListPreference
+        android:key="preferred_umts_network_mode_key"
+        android:title="@string/gsm_umts_network_preferences_title"
+        android:summary="@string/preferred_network_mode_summary"
+        android:entries="@array/gsm_umts_network_preferences_choices"
+        android:entryValues="@array/gsm_umts_network_preferences_values"
+        android:dialogTitle="@string/gsm_umts_network_preferences_dialogtitle" />
+
+    <ListPreference
+        android:key="preferred_cdma_network_mode_key"
+        android:title="@string/cdma_network_preferences_title"
+        android:summary="@string/preferred_network_mode_summary"
+        android:entries="@array/cdma_network_preferences_choices"
+        android:entryValues="@array/cdma_network_preferences_values"
+        android:dialogTitle="@string/cdma_network_preferences_dialogtitle" />
+
 </PreferenceScreen>
diff --git a/res/xml/sip_edit.xml b/res/xml/sip_edit.xml
index 2a59d8829..f091fc179 100644
--- a/res/xml/sip_edit.xml
+++ b/res/xml/sip_edit.xml
@@ -24,7 +24,8 @@
         android:dialogTitle="@string/username_title"
         android:summary="@string/default_preference_summary"
         android:persistent="false"
-        android:singleLine="true"/>
+        android:singleLine="true"
+        android:inputType="textNoSuggestions"/>
 
     <EditTextPreference
         android:key="@string/password"
@@ -41,7 +42,8 @@
         android:dialogTitle="@string/domain_address_title"
         android:summary="@string/default_preference_summary"
         android:persistent="false"
-        android:singleLine="true"/>
+        android:singleLine="true"
+        android:inputType="textNoSuggestions"/>
 
     <CheckBoxPreference
         android:key="@string/set_primary"
diff --git a/src/com/android/phone/ADNList.java b/src/com/android/phone/ADNList.java
index 21e1bd435..b4e8ac745 100644
--- a/src/com/android/phone/ADNList.java
+++ b/src/com/android/phone/ADNList.java
@@ -160,15 +160,15 @@ protected CursorAdapter newAdapter() {
                     mCursor, COLUMN_NAMES, VIEW_NAMES);
     }
 
-    private void displayProgress(boolean flag) {
-        if (DBG) log("displayProgress: " + flag);
+    private void displayProgress(boolean loading) {
+        if (DBG) log("displayProgress: " + loading);
 
-        mEmptyText.setText(flag ? R.string.simContacts_emptyLoading:
+        mEmptyText.setText(loading ? R.string.simContacts_emptyLoading:
             (isAirplaneModeOn(this) ? R.string.simContacts_airplaneMode :
                 R.string.simContacts_empty));
         getWindow().setFeatureInt(
                 Window.FEATURE_INDETERMINATE_PROGRESS,
-                flag ? PROGRESS_VISIBILITY_ON : PROGRESS_VISIBILITY_OFF);
+                loading ? PROGRESS_VISIBILITY_ON : PROGRESS_VISIBILITY_OFF);
     }
 
     private static boolean isAirplaneModeOn(Context context) {
@@ -187,11 +187,13 @@ protected void onQueryComplete(int token, Object cookie, Cursor c) {
             mCursor = c;
             setAdapter();
             displayProgress(false);
+
+            // Cursor is refreshed and inherited classes may have menu items depending on it.
+            invalidateOptionsMenu();
         }
 
         @Override
-        protected void onInsertComplete(int token, Object cookie,
-                                        Uri uri) {
+        protected void onInsertComplete(int token, Object cookie, Uri uri) {
             if (DBG) log("onInsertComplete: requery");
             reQuery();
         }
diff --git a/src/com/android/phone/AnimationUtils.java b/src/com/android/phone/AnimationUtils.java
new file mode 100644
index 000000000..f7d9e2e1f
--- /dev/null
+++ b/src/com/android/phone/AnimationUtils.java
@@ -0,0 +1,279 @@
+/*
+ * Copyright (C) 2012 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.phone;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ObjectAnimator;
+import android.graphics.Canvas;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewPropertyAnimator;
+import android.widget.ImageView;
+
+/**
+ * Utilities for Animation.
+ */
+public class AnimationUtils {
+    private static final String LOG_TAG = AnimationUtils.class.getSimpleName();
+    /**
+     * Turn on when you're interested in fading animation. Intentionally untied from other debug
+     * settings.
+     */
+    private static final boolean FADE_DBG = false;
+
+    /**
+     * Duration for animations in msec, which can be used with
+     * {@link ViewPropertyAnimator#setDuration(long)} for example.
+     */
+    public static final int ANIMATION_DURATION = 250;
+
+    private AnimationUtils() {
+    }
+
+    /**
+     * Simple Utility class that runs fading animations on specified views.
+     */
+    public static class Fade {
+
+        // View tag that's set during the fade-out animation; see hide() and
+        // isFadingOut().
+        private static final int FADE_STATE_KEY = R.id.fadeState;
+        private static final String FADING_OUT = "fading_out";
+
+        /**
+         * Sets the visibility of the specified view to View.VISIBLE and then
+         * fades it in. If the view is already visible (and not in the middle
+         * of a fade-out animation), this method will return without doing
+         * anything.
+         *
+         * @param view The view to be faded in
+         */
+        public static void show(final View view) {
+            if (FADE_DBG) log("Fade: SHOW view " + view + "...");
+            if (FADE_DBG) log("Fade: - visibility = " + view.getVisibility());
+            if ((view.getVisibility() != View.VISIBLE) || isFadingOut(view)) {
+                view.animate().cancel();
+                // ...and clear the FADE_STATE_KEY tag in case we just
+                // canceled an in-progress fade-out animation.
+                view.setTag(FADE_STATE_KEY, null);
+
+                view.setAlpha(0);
+                view.setVisibility(View.VISIBLE);
+                view.animate().setDuration(ANIMATION_DURATION);
+                view.animate().alpha(1);
+                if (FADE_DBG) log("Fade: ==> SHOW " + view
+                                  + " DONE.  Set visibility = " + View.VISIBLE);
+            } else {
+                if (FADE_DBG) log("Fade: ==> Ignoring, already visible AND not fading out.");
+            }
+        }
+
+        /**
+         * Fades out the specified view and then sets its visibility to the
+         * specified value (either View.INVISIBLE or View.GONE). If the view
+         * is not currently visibile, the method will return without doing
+         * anything.
+         *
+         * Note that *during* the fade-out the view itself will still have
+         * visibility View.VISIBLE, although the isFadingOut() method will
+         * return true (in case the UI code needs to detect this state.)
+         *
+         * @param view The view to be hidden
+         * @param visibility The value to which the view's visibility will be
+         *                   set after it fades out.
+         *                   Must be either View.INVISIBLE or View.GONE.
+         */
+        public static void hide(final View view, final int visibility) {
+            if (FADE_DBG) log("Fade: HIDE view " + view + "...");
+            if (view.getVisibility() == View.VISIBLE &&
+                (visibility == View.INVISIBLE || visibility == View.GONE)) {
+
+                // Use a view tag to mark this view as being in the middle
+                // of a fade-out animation.
+                view.setTag(FADE_STATE_KEY, FADING_OUT);
+
+                view.animate().cancel();
+                view.animate().setDuration(ANIMATION_DURATION);
+                view.animate().alpha(0f).setListener(new AnimatorListenerAdapter() {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        view.setAlpha(1);
+                        view.setVisibility(visibility);
+                        view.animate().setListener(null);
+                        // ...and we're done with the fade-out, so clear the view tag.
+                        view.setTag(FADE_STATE_KEY, null);
+                        if (FADE_DBG) log("Fade: HIDE " + view
+                                + " DONE.  Set visibility = " + visibility);
+                    }
+                });
+            }
+        }
+
+        /**
+         * @return true if the specified view is currently in the middle
+         * of a fade-out animation.  (During the fade-out, the view's
+         * visibility is still VISIBLE, although in many cases the UI
+         * should behave as if it's already invisible or gone.  This
+         * method allows the UI code to detect that state.)
+         *
+         * @see #hide(View, int)
+         */
+        public static boolean isFadingOut(final View view) {
+            if (FADE_DBG) {
+                log("Fade: isFadingOut view " + view + "...");
+                log("Fade:   - getTag() returns: " + view.getTag(FADE_STATE_KEY));
+                log("Fade:   - returning: " + (view.getTag(FADE_STATE_KEY) == FADING_OUT));
+            }
+            return (view.getTag(FADE_STATE_KEY) == FADING_OUT);
+        }
+
+    }
+
+    /**
+     * Drawable achieving cross-fade, just like TransitionDrawable. We can have
+     * call-backs via animator object (see also {@link CrossFadeDrawable#getAnimator()}).
+     */
+    private static class CrossFadeDrawable extends LayerDrawable {
+        private final ObjectAnimator mAnimator;
+
+        public CrossFadeDrawable(Drawable[] layers) {
+            super(layers);
+            mAnimator = ObjectAnimator.ofInt(this, "crossFadeAlpha", 0xff, 0);
+        }
+
+        private int mCrossFadeAlpha;
+
+        /**
+         * This will be used from ObjectAnimator.
+         * Note: this method is protected by proguard.flags so that it won't be removed
+         * automatically.
+         */
+        @SuppressWarnings("unused")
+        public void setCrossFadeAlpha(int alpha) {
+            mCrossFadeAlpha = alpha;
+            invalidateSelf();
+        }
+
+        public ObjectAnimator getAnimator() {
+            return mAnimator;
+        }
+
+        @Override
+        public void draw(Canvas canvas) {
+            Drawable first = getDrawable(0);
+            Drawable second = getDrawable(1);
+
+            if (mCrossFadeAlpha > 0) {
+                first.setAlpha(mCrossFadeAlpha);
+                first.draw(canvas);
+                first.setAlpha(255);
+            }
+
+            if (mCrossFadeAlpha < 0xff) {
+                second.setAlpha(0xff - mCrossFadeAlpha);
+                second.draw(canvas);
+                second.setAlpha(0xff);
+            }
+        }
+    }
+
+    private static CrossFadeDrawable newCrossFadeDrawable(Drawable first, Drawable second) {
+        Drawable[] layers = new Drawable[2];
+        layers[0] = first;
+        layers[1] = second;
+        return new CrossFadeDrawable(layers);
+    }
+
+    /**
+     * Starts cross-fade animation using TransitionDrawable. Nothing will happen if "from" and "to"
+     * are the same.
+     */
+    public static void startCrossFade(
+            final ImageView imageView, final Drawable from, final Drawable to) {
+        // We skip the cross-fade when those two Drawables are equal, or they are BitmapDrawables
+        // pointing to the same Bitmap.
+        final boolean areSameImage = from.equals(to) ||
+                ((from instanceof BitmapDrawable)
+                        && (to instanceof BitmapDrawable)
+                        && ((BitmapDrawable) from).getBitmap()
+                                .equals(((BitmapDrawable) to).getBitmap()));
+        if (!areSameImage) {
+            if (FADE_DBG) {
+                log("Start cross-fade animation for " + imageView
+                        + "(" + Integer.toHexString(from.hashCode()) + " -> "
+                        + Integer.toHexString(to.hashCode()) + ")");
+            }
+
+            CrossFadeDrawable crossFadeDrawable = newCrossFadeDrawable(from, to);
+            ObjectAnimator animator = crossFadeDrawable.getAnimator();
+            imageView.setImageDrawable(crossFadeDrawable);
+            animator.setDuration(ANIMATION_DURATION);
+            animator.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationStart(Animator animation) {
+                    if (FADE_DBG) {
+                        log("cross-fade animation start ("
+                                + Integer.toHexString(from.hashCode()) + " -> "
+                                + Integer.toHexString(to.hashCode()) + ")");
+                    }
+                }
+
+                @Override
+                public void onAnimationEnd(Animator animation) {
+                    if (FADE_DBG) {
+                        log("cross-fade animation ended ("
+                                + Integer.toHexString(from.hashCode()) + " -> "
+                                + Integer.toHexString(to.hashCode()) + ")");
+                    }
+                    animation.removeAllListeners();
+                    // Workaround for issue 6300562; this will force the drawable to the
+                    // resultant one regardless of animation glitch.
+                    imageView.setImageDrawable(to);
+                }
+            });
+            animator.start();
+
+            /* We could use TransitionDrawable here, but it may cause some weird animation in
+             * some corner cases. See issue 6300562
+             * TODO: decide which to be used in the long run. TransitionDrawable is old but system
+             * one. Ours uses new animation framework and thus have callback (great for testing),
+             * while no framework support for the exact class.
+
+            Drawable[] layers = new Drawable[2];
+            layers[0] = from;
+            layers[1] = to;
+            TransitionDrawable transitionDrawable = new TransitionDrawable(layers);
+            imageView.setImageDrawable(transitionDrawable);
+            transitionDrawable.startTransition(ANIMATION_DURATION); */
+            imageView.setTag(to);
+        } else {
+            if (FADE_DBG) {
+                log("*Not* start cross-fade. " + imageView);
+            }
+        }
+    }
+
+    // Debugging / testing code
+
+    private static void log(String msg) {
+        Log.d(LOG_TAG, msg);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/BluetoothHandsfree.java b/src/com/android/phone/BluetoothHandsfree.java
index 3e2f73a03..59fa21d93 100755
--- a/src/com/android/phone/BluetoothHandsfree.java
+++ b/src/com/android/phone/BluetoothHandsfree.java
@@ -47,6 +47,7 @@
 import android.telephony.PhoneNumberUtils;
 import android.telephony.ServiceState;
 import android.telephony.SignalStrength;
+import android.telephony.TelephonyManager;
 import android.util.Log;
 
 import com.android.internal.telephony.Call;
@@ -125,6 +126,7 @@ public class BluetoothHandsfree {
 
     private final BluetoothPhoneState mBluetoothPhoneState;  // for CIND and CIEV updates
     private final BluetoothAtPhonebook mPhonebook;
+    private final BluetoothSMSAccess mSMSAccess;
     private Phone.State mPhoneState = Phone.State.IDLE;
     CdmaPhoneCallState.PhoneCallState mCdmaThreeWayCallState =
                                             CdmaPhoneCallState.PhoneCallState.IDLE;
@@ -250,6 +252,7 @@ private BluetoothHandsfree(Context context, CallManager cm) {
         mVirtualCallStarted = false;
         mVoiceRecognitionStarted = false;
         mPhonebook = new BluetoothAtPhonebook(mContext, this);
+        mSMSAccess = new BluetoothSMSAccess(mContext, this);
         mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         cdmaSetSecondCallState(false);
 
@@ -611,6 +614,7 @@ private boolean isIncallAudio() {
         }
         mRemoteBrsf = 0;
         mPhonebook.resetAtState();
+        mSMSAccess.resetAtState();
     }
 
     /* package */ HeadsetBase getHeadset() {
@@ -822,8 +826,8 @@ private int cdmaDbmEcioToSignal(SignalStrength signalStrength) {
             cdmaIconLevel = (levelDbm < levelEcio) ? levelDbm : levelEcio;
 
             if (mServiceState != null &&
-                  (mServiceState.getRadioTechnology() == ServiceState.RADIO_TECHNOLOGY_EVDO_0 ||
-                   mServiceState.getRadioTechnology() == ServiceState.RADIO_TECHNOLOGY_EVDO_A)) {
+                  (mServiceState.getNetworkType() == TelephonyManager.NETWORK_TYPE_EVDO_0 ||
+                   mServiceState.getNetworkType() == TelephonyManager.NETWORK_TYPE_EVDO_A)) {
                   int evdoEcio = signalStrength.getEvdoEcio();
                   int evdoSnr = signalStrength.getEvdoSnr();
                   int levelEvdoEcio = 0;
@@ -1034,6 +1038,9 @@ private synchronized void handlePreciseCallStateChange(boolean sendUpdate,
                 }
             }
 
+            /* phone not setup yet */
+            if (foregroundCall == null) return;
+
             switch(foregroundCall.getState()) {
             case ACTIVE:
                 call = 1;
@@ -1639,12 +1646,24 @@ private boolean isA2dpMultiProfile() {
         mBluetoothPhoneState.ignoreRing();
     }
 
-    private void sendURC(String urc) {
+    /* package */ void sendURC(String urc) {
         if (isHeadsetConnected()) {
             mHeadset.sendURC(urc);
         }
     }
 
+    /**
+     * Allows a mechanism to override the default line by line input handling with a custom handler
+     * @param stringToSend - initial string of characters to send out
+     * @param inputHandler - callback for handling the specialized input
+     */
+    void setSpecialPDUInputHandler(String stringToSend, HeadsetBase.SpecialPDUInputHandler inputHandler) {
+        if ((null != inputHandler) && (null != stringToSend) && (0 < stringToSend.length())) {
+            mHeadset.sendURCChars(stringToSend);
+        }
+        mHeadset.specialPDUInputHandler = inputHandler;
+    }
+
     /** helper to redial last dialled number */
     private AtCommandResult redial() {
         String number = mPhonebook.getLastDialledNumber();
@@ -2693,6 +2712,7 @@ public AtCommandResult handleActionCommand() {
         });
 
         mPhonebook.register(parser);
+        mSMSAccess.register(parser);
     }
 
     public void sendScoGainUpdate(int gain) {
@@ -2942,31 +2962,31 @@ synchronized boolean terminateScoUsingVirtualVoiceCall() {
      *  are polled and mock updates sent every 1 second */
     private class DebugThread extends Thread {
         /** Turns on/off handsfree profile debugging mode */
-        private static final String DEBUG_HANDSFREE = "debug.bt.hfp";
+        static final String DEBUG_HANDSFREE = "debug.bt.hfp";
 
         /** Mock battery level change - use 0 to 5 */
-        private static final String DEBUG_HANDSFREE_BATTERY = "debug.bt.hfp.battery";
+        static final String DEBUG_HANDSFREE_BATTERY = "debug.bt.hfp.battery";
 
         /** Mock no cellular service when false */
-        private static final String DEBUG_HANDSFREE_SERVICE = "debug.bt.hfp.service";
+        static final String DEBUG_HANDSFREE_SERVICE = "debug.bt.hfp.service";
 
         /** Mock cellular roaming when true */
-        private static final String DEBUG_HANDSFREE_ROAM = "debug.bt.hfp.roam";
+        static final String DEBUG_HANDSFREE_ROAM = "debug.bt.hfp.roam";
 
         /** false to true transition will force an audio (SCO) connection to
          *  be established. true to false will force audio to be disconnected
          */
-        private static final String DEBUG_HANDSFREE_AUDIO = "debug.bt.hfp.audio";
+        static final String DEBUG_HANDSFREE_AUDIO = "debug.bt.hfp.audio";
 
         /** true allows incoming SCO connection out of call.
          */
-        private static final String DEBUG_HANDSFREE_AUDIO_ANYTIME = "debug.bt.hfp.audio_anytime";
+        static final String DEBUG_HANDSFREE_AUDIO_ANYTIME = "debug.bt.hfp.audio_anytime";
 
         /** Mock signal strength change in ASU - use 0 to 31 */
-        private static final String DEBUG_HANDSFREE_SIGNAL = "debug.bt.hfp.signal";
+        static final String DEBUG_HANDSFREE_SIGNAL = "debug.bt.hfp.signal";
 
         /** Debug AT+CLCC: print +CLCC result */
-        private static final String DEBUG_HANDSFREE_CLCC = "debug.bt.hfp.clcc";
+        static final String DEBUG_HANDSFREE_CLCC = "debug.bt.hfp.clcc";
 
         /** Debug AT+BSIR - Send In Band Ringtones Unsolicited AT command.
          * debug.bt.unsol.inband = 0 => AT+BSIR = 0 sent by the AG
@@ -2974,8 +2994,7 @@ private class DebugThread extends Thread {
          * Other values are ignored.
          */
 
-        private static final String DEBUG_UNSOL_INBAND_RINGTONE =
-            "debug.bt.unsol.inband";
+        static final String DEBUG_UNSOL_INBAND_RINGTONE = "debug.bt.unsol.inband";
 
         @Override
         public void run() {
diff --git a/src/com/android/phone/BluetoothSMSAccess.java b/src/com/android/phone/BluetoothSMSAccess.java
new file mode 100644
index 000000000..d739ae2c4
--- /dev/null
+++ b/src/com/android/phone/BluetoothSMSAccess.java
@@ -0,0 +1,875 @@
+/*
+ * Copyright (C) 2012 by Gary L Dezern
+ *
+ * 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.phone;
+
+import java.io.ByteArrayOutputStream;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import com.android.internal.telephony.EncodeException;
+import com.android.internal.telephony.GsmAlphabet;
+import com.android.internal.util.HexDump;
+import android.bluetooth.AtCommandHandler;
+import android.bluetooth.AtCommandResult;
+import android.bluetooth.AtParser;
+import android.bluetooth.HeadsetBase;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.database.Cursor;
+import android.telephony.PhoneNumberUtils;
+import android.telephony.SmsManager;
+import android.text.format.Time;
+import android.provider.Telephony.Sms;
+import android.util.Log;
+
+
+public class BluetoothSMSAccess {
+
+    private static final boolean DBG = false;
+
+    /** helper structure for passing around info about an sms message */
+    class SMSMsgInfo {
+        int _id;
+        int type;
+        int read;
+        // instead of using read/unread, use seen/unseen.  The reason is that
+        // the AT spec dictates a message pulled from the handset should be
+        // marked as read as soon as the radio (or whatever) pulls it.
+        // However, many modern devices pull the message only to see the header
+        // and might not even be capable of displaying the full message.
+        // using the 'seen' (or notification) flag gives a consistent way of
+        // having a secondary 'read' type flag and lets the radio or whatever
+        // BT device "notify" the user.  Having a msg marked on the phone as
+        // unread when it was read on the radio is a better solution than
+        // having a message marked as read on the phone when it was never read.
+        int seen;
+        String SMSCAddress;
+        String OriginAddress;
+        long date;
+        String body;
+    };
+
+    /** constants for CMS errors */
+    public static final int CMS_ME_FAILURE = 300;
+    public static final int CMS_SERVICE_RESERVED = 301;
+    public static final int CMS_OP_NOT_ALLOWED = 302;
+    public static final int CMS_OP_NOT_SUPPORTED = 303;
+    public static final int CMS_INVALID_PDU_PARAM = 304;
+    public static final int CMS_INVALID_TEXT_PARAM = 305;
+    public static final int CMS_SIM_NOT_INSERTED = 310;
+    public static final int CMS_SIM_FAILURE = 313;
+    public static final int CMS_INVALID_INDEX = 321;
+    public static final int CMS_SMSC_ADDR_UNKNOWN = 330;
+    public static final int CMS_NO_NETWORK_SERVICE = 331;
+    public static final int CMS_NETWORK_TIMEOUT = 332;
+    public static final int CMS_UNKNOWN_ERROR = 500;
+
+    /** specific 4 char sequence to prompt CMGS sender to stream PDU (CR, LF, GreaterThan, Space) */
+    private static final String CMGS_PDU_PROMPT = "\r\n> ";
+
+    // TODO:  does it make sense to re-factor these mNMI_ variables into a local class?
+    private int mNMI_mode;
+    private int mNMI_mt;
+    private int mNMI_bfr;
+    private int mNMI_bm;
+    private int mNMI_ds;
+
+    private String mServiceCenterAddress;
+    private int mServiceCenterType;
+
+    // dummy service center number used to satisfy GSM requirements when we don't
+    // have access to the actual service center number
+    public static final String DUMMY_SERVICE_CENTER = "0000";
+
+    private static final String TAG = "BluetoothSMSAccess";
+
+    private final Context mContext;
+    private final BluetoothHandsfree mHandsfree;
+
+    // android messaging hooks
+    private SmsContentObserverClass smsContentObserver = new SmsContentObserverClass();
+
+    // the highest seen message date (used to determine what messages are newly received)
+    private long mLastSeenSMSDate = 0;
+
+
+    public BluetoothSMSAccess(Context context, BluetoothHandsfree handsfree) {
+        mContext = context;
+        mHandsfree = handsfree;
+
+        mNMI_mode = 0;
+        mNMI_mt = 0;
+        mNMI_bm = mNMI_ds = 0;
+        mNMI_bfr = 1;
+
+        mServiceCenterAddress = DUMMY_SERVICE_CENTER;
+        mServiceCenterType = 129;
+
+    }
+
+    /** registers SMS specific AT command parsers */
+    public void register(AtParser parser) {
+
+        // +CMFG: (0)
+        parser.register("+CMGF", new AtCommandHandler() {
+            @Override
+            public AtCommandResult handleSetCommand(Object[] args) {
+                if (DBG) Log.d(TAG, "IN: +CMGF= " + Arrays.toString(args));
+
+                if ((1 == args.length) && (args[0].equals(0))) {
+                    return new AtCommandResult(AtCommandResult.OK);
+                } else {
+                    return new AtCommandResult(AtCommandResult.ERROR);
+                }
+            }
+            @Override
+            public AtCommandResult handleTestCommand() {
+                return new AtCommandResult("+CMFG: (0)");
+            }
+            @Override
+            public AtCommandResult handleReadCommand() {
+                return new AtCommandResult("+CPMS: 0");
+            }
+        });
+
+        // +CNMI: (0-2),(0-1),(0),(0),(0-1)
+        parser.register("+CNMI", new AtCommandHandler() {
+            @Override
+            public AtCommandResult handleSetCommand(Object[] args) {
+                if (DBG) Log.d(TAG, "IN: +CNMI= " + Arrays.toString(args));
+
+                if ((5 == args.length) &&
+                        (args[0] instanceof Integer) &&
+                        (args[1] instanceof Integer) &&
+                        (args[2] instanceof Integer) &&
+                        (args[3] instanceof Integer) &&
+                        (args[4] instanceof Integer)) {
+                    // validate the parameters so "OK" can be sent before initializing
+                    // NMI - so that any notifications sent as a result of bfr=0 are
+                    // sent AFTER the "OK" final result code.
+                    if (((Integer)args[0] >= 0) && ((Integer)args[0] <= 2) &&
+                            ((Integer)args[1] >= 0) && ((Integer)args[1] <= 1) &&
+                            args[2].equals(0) && args[3].equals(0) &&
+                            ((Integer)args[4] >= 0) && ((Integer)args[4] <= 1)) {
+                        // return OK before actually initializing!
+                        mHandsfree.sendURC("OK");
+                        InitializeNMI((Integer)args[0], (Integer)args[1], 0, 0, (Integer)args[4]);
+                        return new AtCommandResult(AtCommandResult.UNSOLICITED);
+                    } else {
+                        return reportCmsError(CMS_OP_NOT_SUPPORTED);
+                    }
+                } else {
+                    return new AtCommandResult(AtCommandResult.ERROR);
+                }
+            }
+            @Override
+            public AtCommandResult handleTestCommand() {
+                return new AtCommandResult("+CNMI: (0-2),(0-1),(0),(0),(0-1)");
+            }
+            @Override
+            public AtCommandResult handleReadCommand() {
+                return new AtCommandResult("+CNMI: " +
+                        mNMI_mode + "," +
+                        mNMI_mt + "," +
+                        mNMI_bm + "," +
+                        mNMI_ds + "," +
+                        mNMI_bfr);
+            }
+        });
+
+        // +CPMS: ("ME"),("ME"),("ME")
+        parser.register("+CPMS", new AtCommandHandler() {
+            // order of storage spaces.
+            //  1.  storage area used when reading or deleting SMS messages
+            //  2.  storage area used when sending or writing SMS messages
+            //  3.  preferred storage area for storing newly rcvd SMS messages
+
+            // storage area "ME" means the primary message storage.  We don't support
+            // any other storage areas, so returns errors if they are seen.
+            // The parameters are "# msgs" and "total # msg slots".  Being that
+            // there are essentially an unlimited number of message "slots", just
+            // return the current msg count + 10 so it always looks like there is
+            // more room available.
+            @Override
+            public AtCommandResult handleSetCommand(Object[] args) {
+                if (DBG) Log.d(TAG, "IN: +CPMS= " + Arrays.toString(args));
+
+                if ((1 <= args.length) && (3 >= args.length)) {
+                    // if any args are passed, they each must be "\"ME\""
+                    if (args[0].equals("\"ME\"") &&
+                            ((2 > args.length) || args[1].equals("\"ME\"")) &&
+                            ((3 > args.length) || args[2].equals("\"ME\""))
+                            ) {
+                        int msgCount = getMessageVirtualCount();
+                        return new AtCommandResult("+CPMS: " + msgCount + "," + (msgCount + 10) +
+                                "," + msgCount + "," + (msgCount + 10) +
+                                "," + msgCount + "," + (msgCount + 10));
+                    } else {
+                        return reportCmsError(CMS_OP_NOT_ALLOWED);
+                    }
+                } else {
+                    return new AtCommandResult(AtCommandResult.ERROR);
+                }
+            }
+            @Override
+            public AtCommandResult handleTestCommand() {
+                return new AtCommandResult("+CPMS: (\"ME\"),(\"ME\"),(\"ME\")");
+            }
+            @Override
+            public AtCommandResult handleReadCommand() {
+                int msgCount = getMessageVirtualCount();
+                return new AtCommandResult("+CPMS: \"ME\"," + msgCount + "," + (msgCount + 10) +
+                        ",\"ME\"," + msgCount + "," + (msgCount + 10) +
+                        ",\"ME\"," + msgCount + "," + (msgCount + 10));
+            }
+        });
+
+        // +CSMS: <service>, <mt>, <mo>, <bm>
+        parser.register("+CSMS", new AtCommandHandler() {
+            @Override
+            public AtCommandResult handleSetCommand(Object[] args) {
+                if (DBG) Log.d(TAG, "IN: +CSMS= " + Arrays.toString(args));
+                // only service '0' is supported
+                if ((1 == args.length) && (args[0] instanceof Integer)) {
+                    if (args[0].equals(0))
+                        return new AtCommandResult("+CSMS: 1,1,0");
+                    else
+                        return reportCmsError(CMS_OP_NOT_SUPPORTED);
+                } else {
+                    return new AtCommandResult(AtCommandResult.ERROR);
+                }
+            }
+            @Override
+            public AtCommandResult handleReadCommand() {
+                // service 0, mt (mobile term msgs) support, mo (mobile origin msgs) support,
+                // bm (broadcast type not support)
+                return new AtCommandResult("+CSMS: 0,1,1,0");
+            }
+            @Override
+            public AtCommandResult handleTestCommand() {
+                return new AtCommandResult("+CSMS: (0)");
+            }
+
+        });
+
+        // +CSCA: (setting the service center)
+        parser.register("+CSCA", new AtCommandHandler() {
+            // NOTE:  it doesn't appear possible to set/override the service center address
+            // with android devices.  However, support of +CSCA is required in the gsm spec.
+            // Therefore, fake it.
+            @Override
+            public AtCommandResult handleSetCommand(Object[] args) {
+                if (DBG) Log.d(TAG, "IN: +CSCA= " + Arrays.toString(args));
+
+                if ((1 <= args.length) && (2 >= args.length)) {
+                    mServiceCenterAddress = args[0].toString();
+                    if (2 == args.length)
+                        mServiceCenterType = (Integer)args[1];
+                    return new AtCommandResult(AtCommandResult.OK);
+                } else {
+                    return new AtCommandResult(AtCommandResult.ERROR);
+                }
+            }
+            @Override
+            public AtCommandResult handleReadCommand() {
+                return new AtCommandResult("+CSCA: " + mServiceCenterAddress + "," + mServiceCenterType);
+            }
+        });
+
+        // TODO:  implement +CMGL (list messages)
+
+        // +CMGS (send message)
+        parser.register("+CMGS", new AtCommandHandler() {
+            // NOTE:  Implementing this command requires a deviation from the the
+            // pre-existing bluetooth line-based communication.  All other AT+ style
+            // commands communicate line-based with CR line terminators. However,
+            // +CMGS requires that the TE (radio, headset, etc) sends two lines: the
+            // first terminated by CR and the second terminated by either ESC or
+            // Ctrl-Z.  That required some low level modifications...
+            @Override
+            public AtCommandResult handleSetCommand(Object[] args) {
+                if (DBG) Log.d(TAG, "IN: +CMGS= " + Arrays.toString(args));
+
+                if ((1 == args.length) && (args[0] instanceof Integer)) {
+                    // record the parameter (should be the length of TPDU)
+                    final int parameter = (Integer)args[0];
+                    // a very specific string of chars should be sent to "prompt" the PDU stream
+
+                    mHandsfree.setSpecialPDUInputHandler(CMGS_PDU_PROMPT,
+                            new HeadsetBase.SpecialPDUInputHandler() {
+                        @Override
+                        public void handleInput(String input) {
+                            // clear the special handler
+                            mHandsfree.setSpecialPDUInputHandler(null, null);
+                            if (DBG) {
+                                Log.d(TAG, "InputHandler param: " + parameter);
+                                Log.d(TAG, "InputHandler input: " + input);
+                            }
+                            // parsing the PDU is annoying, and must block
+                            // the BT channel until a response.  This
+                            // function should send any response(s) back.
+                            HandleSMSSubmitInput(parameter, input);
+                        }
+                    });
+                    // the setSpecialInputHandler call will send the CMGS_PDU_PROMPT, so
+                    // do nothing here.
+                    return new AtCommandResult(AtCommandResult.UNSOLICITED);
+                } else {
+                    return new AtCommandResult(AtCommandResult.ERROR);
+                }
+            }
+        });
+
+        // +CMGR
+        parser.register("+CMGR", new AtCommandHandler() {
+            @Override
+            public AtCommandResult handleSetCommand(Object[] args) {
+                if (DBG) Log.d(TAG, "IN: +CMGR= " + Arrays.toString(args));
+
+                if ((1 == args.length) && (args[0] instanceof Integer)) {
+                    SMSMsgInfo smsInfo = new SMSMsgInfo();
+                    // gather the sms message info
+                    int iRet = getMessageAtIndex((Integer) args[0], smsInfo, true);
+                    if (iRet < 0) {    // unknown error
+                        return new AtCommandResult(AtCommandResult.ERROR);
+                    } else if (iRet > 0) {    // specific CMS error
+                        return reportCmsError(iRet);
+                    }
+                    // create the response with PDU stream
+                    return CreatePDUResponse(smsInfo);
+                } else {
+                    return new AtCommandResult(AtCommandResult.ERROR);
+                }
+            }
+            @Override
+            public AtCommandResult handleTestCommand() {
+                return new AtCommandResult("+CMGR: (1-" + getMessageVirtualCount() + ")");
+            }
+        });
+    }
+
+    /** called on disconnected bluetooth */
+    synchronized void resetAtState() {
+        TurnOffNMI();
+    }
+
+    /** helper similar to Integer.parseInt(string, 16), but specialized for PDU processing */
+    private static int CharToByte(char c)
+    {
+        if (c >= '0' && c <= '9') return (c - '0');
+        if (c >= 'A' && c <= 'F') return (c - 'A' + 10);
+        if (c >= 'a' && c <= 'f') return (c - 'a' + 10);
+        throw new RuntimeException ("Invalid hex char '" + c + "'");
+    }
+
+    /** helper that uses CharToByte to generate pdu octets */
+    private static byte TwoCharToByte(char firstC, char secondC)
+    {
+        return (byte)((CharToByte(firstC) << 4) | CharToByte(secondC));
+    }
+
+    /** handles the PDU stream when creating/sending an SMS message */
+    private void HandleSMSSubmitInput(int cmdParameter, String input)
+    {
+        AtCommandResult result = null;
+        // first, validate the data from the TE before trying to parse
+        // much of it.
+        if ((1 == input.length()) && (27 == (int)input.charAt(0))) {
+            result = new AtCommandResult(AtCommandResult.OK);
+        } else if (2 > input.length()) {
+            if (DBG) Log.d(TAG, "handleInput: <2 length input");
+            result = new AtCommandResult(AtCommandResult.ERROR);
+        } else  {
+            // might be valid... do a bit more checking.
+
+            // NOTE:  Some TE's (kenwood head units) are buggy in that they
+            // may embed invalid characters in the destination address of the
+            // PDU stream.  In particular, it won't strip invalid characters
+            // from a destination phone number before shoving it into the PDU
+            // stream.  Instead of "1234567890" in the stream, I'll get other
+            // punctuation such as "(123) 456-7890".  For that reason, the entire
+            // pdu stream can't be converted to a byte array at one time.
+
+            boolean bError = false;
+            String scAddress = null;
+            String destAddress = null;
+            String msgBody = null;
+
+            char[] inputArray = input.toCharArray();
+            int curInputChar = 0;  // where in "input" currently parsing
+
+            int msgRefNum = 99;
+
+            if (DBG) Log.d(TAG, "input stream: " + input);
+
+            // first byte (pair of chars) should be the length of the SC address
+            try {
+                int scAddressLen = TwoCharToByte(inputArray[curInputChar++], inputArray[curInputChar++]);
+                // ensure the input length is long enough for the scAddresslen, scaddress, and
+                // at least 3 more pairs. (first octet, msg ref, dest addr len)
+                if (((4 + scAddressLen) * 2) >= input.length()) {
+                    // input too short
+                    Log.e(TAG, "Input too short after SC Length");
+                    result = reportCmsError(CMS_INVALID_PDU_PARAM);
+                    bError = true;
+                } else {
+                    if (DBG) Log.d(TAG, "Parsing Status A:  curInputChar=" + curInputChar + ", scAddressLen=" + scAddressLen);
+
+                    // actually extract the scAddress along with the 2 next bytes/pairs
+                    byte[] pdu = new byte[scAddressLen + 2];
+                    for (int i = 0; i <  (scAddressLen + 2); i++)
+                    {
+                        pdu[i] = TwoCharToByte(inputArray[curInputChar++], inputArray[curInputChar++]);
+                    }
+                    if (0 != scAddressLen) {
+                        scAddress = PhoneNumberUtils.calledPartyBCDToString(pdu, 0, scAddressLen);
+                    }
+                    // next byte is the "first octet" flags - most ignored, but
+                    // make sure bits 0-1 are set to 0x1
+                    if (1 != (pdu[scAddressLen] & 0x3)) {
+                        Log.e(TAG, "Invalid TP-Message-Type-Indicator flag");
+                        result = reportCmsError(CMS_OP_NOT_SUPPORTED);
+                        bError = true;
+                    }
+                    // the next byte (TP-Message-Reference) is completely ignored
+                }
+            }
+            catch (RuntimeException ex) {
+                Log.e(TAG, "Invalid SC Address");
+                // fall through for CMS unknown err
+                bError = true;
+            }
+
+            if (!bError) {
+                try {
+                    if (DBG) Log.d(TAG, "Parsing Status B:  curInputChar=" + curInputChar);
+                    // curInputChar should point to the length of the destination address now...
+                    int destAddrLen = TwoCharToByte(inputArray[curInputChar++], inputArray[curInputChar++]);
+                    int destAddrBytes = (((destAddrLen + 1) / 2));
+                    // ensure there's still enough input space for the destination address
+                    // and 4 more pairs (destAddrType, protocol ID, data coding scheme, length of user data)
+                    if (((4 + destAddrBytes) * 2) >= (input.length() - curInputChar)) {
+                        // input too short
+                        Log.e(TAG, "Input too short after Destination Address Length");
+                        bError = true;
+                    } else {
+                        if (DBG) Log.d(TAG, "Parsing Status C:  curInputChar=" + curInputChar + ", destAddrLen=" + destAddrLen);
+
+                        curInputChar += 2; // skip the dest address type.
+
+                        // actually work to pull out the destination phone number.
+                        StringBuilder sb = new StringBuilder(destAddrLen + 1);
+
+                        for (int i = 0; i < destAddrBytes; i++) {
+                            // get two characters and swap them
+                            sb.append(inputArray[curInputChar + 1]);
+                            sb.append(inputArray[curInputChar]);
+                            curInputChar += 2;
+                        }
+                        destAddress = sb.substring(0, destAddrLen);
+
+                        if (DBG) Log.d(TAG, "Parsing Status D:  curInputChar=" + curInputChar + ", destAddress=" + destAddress);
+
+                        // the next byte contains the protocol identifier.  enforce this being 0
+                        if (!bError && (0 != TwoCharToByte(inputArray[curInputChar++], inputArray[curInputChar++]))) {
+                            Log.e(TAG, "Invalid TP-Protocol-Identifer");
+                            result = reportCmsError(CMS_OP_NOT_SUPPORTED);
+                            bError = true;
+                        }
+                        // next is a data coding scheme.  Handle any scheme the user wants, as
+                        // long as they want 7bit GSM with no special features.
+                        if (!bError && (0 != TwoCharToByte(inputArray[curInputChar++], inputArray[curInputChar++]))) {
+                            Log.e(TAG, "Unsupported TP-Data-Coding-Scheme");
+                            result = reportCmsError(CMS_OP_NOT_SUPPORTED);
+                            bError = true;
+                        }
+                        // TP-Validy-Period bits not set, so don't try to read the period
+                    }
+                }
+                catch (RuntimeException ex) {
+                    Log.e(TAG, "Invalid Destination Address");
+                    // fall through to result being cms unknown
+                    bError = true;
+                }
+            }
+            if (!bError) {
+                try {
+                    // only thing left is the user data length and actual user data...
+                    int userDataLen = TwoCharToByte(inputArray[curInputChar++], inputArray[curInputChar++]);
+
+                    msgBody = GsmAlphabet.gsm7BitPackedToString(
+                            HexDump.hexStringToByteArray(input.substring(curInputChar)),
+                            0, userDataLen);
+                }
+                catch (RuntimeException ex) {
+                    Log.e(TAG, "Invalid Message Body");
+                    // fall through to result being cms unknown
+                    bError = true;
+                }
+            }
+
+            if (!bError) {
+                // send the message
+                if (DBG) {
+                    Log.d(TAG, "To: " + destAddress);
+                    Log.d(TAG, "Body: " + msgBody);
+                }
+                SmsManager.getDefault().sendTextMessage(destAddress, scAddress, msgBody, null, null);
+
+                // according to the spec, the code should block until the message sends or fails..
+                //  not sure how to deal with that here.
+
+                // some debugging code to allow testing for TE response to errors.
+                if (DBG && (-1 != msgBody.toUpperCase().indexOf("CMSERROR"))) {
+                    Log.d(TAG, "Forced CMS error final result");
+                    result = reportCmsError(CMS_NO_NETWORK_SERVICE);
+                }
+                else if (DBG && (-1 != msgBody.toUpperCase().indexOf("ERROR"))) {
+                    Log.d(TAG, "Forced non-CMS error final result");
+                    result = new AtCommandResult(AtCommandResult.ERROR);
+                } else {
+                    if (DBG) Log.d(TAG, "OUT: +CMGS: " + msgRefNum);
+                    mHandsfree.sendURC("+CMGS: " + msgRefNum);
+                    result = new AtCommandResult(AtCommandResult.OK);
+                }
+            }
+            if (null == result)
+            {
+                result = reportCmsError(CMS_UNKNOWN_ERROR);
+            }
+        }
+        if (null == result)
+            result = new AtCommandResult(AtCommandResult.OK);
+
+        if (DBG) Log.d(TAG, "OUT: " + result.toString());
+        mHandsfree.sendURC(result.toString());
+    }
+
+    /** generate +CMS ERROR: final responses. */
+    private AtCommandResult reportCmsError(int error) {
+        AtCommandResult result = new AtCommandResult(AtCommandResult.UNSOLICITED);
+        result.addResponse("+CMS ERROR: " + error);
+        return result;
+    }
+
+    /** helper function for creating PDU response */
+    private static int swapBCDForTime( int inbyte )
+    {
+        inbyte = inbyte & 0xFF;
+
+        int high = inbyte / 10;
+        return ((inbyte - (high * 10)) << 4) | high;
+    }
+
+    /** given an smsInfo, creates +CMGR response including PDU stream */
+    private AtCommandResult CreatePDUResponse(SMSMsgInfo smsInfo) {
+        // Format of response:
+
+        // +CMGR: <stat>,[<alpha>],<length><cr><lf><pdu>
+        //        <stat> = 0 (incoming unread)
+        //                 1 (incoming read)
+        //                 2 (stored/unsent)
+        //                 3 (stored/sent)
+        //        <alpha> - string type alphanumeric representation of TP-Destination address or TP-originating address corresponding to the entry found in the phonebook
+        //        <length> - length of the actual TP data unit in octets (bytes) (the SMSC address octets are not counted in the length)
+        //        <pdu> - SC address followed by the TPDU in hex format
+
+        ByteArrayOutputStream bo = new ByteArrayOutputStream(300);
+
+        byte[] scData = PhoneNumberUtils.networkPortionToCalledPartyBCDWithLength("0000");
+        bo.write(scData, 0, scData.length);
+        bo.write(4);    // flags
+
+        byte[] destData = PhoneNumberUtils.networkPortionToCalledPartyBCD(smsInfo.OriginAddress);
+        if( destData == null )
+            return new AtCommandResult(AtCommandResult.ERROR);
+
+        int destLength = ((destData.length - 1) * 2
+                - ((destData[destData.length - 1] & 0xf0) == 0xf0 ? 1 : 0));
+
+        bo.write(destLength);
+        bo.write(destData, 0, destData.length);
+        bo.write(0);    // protocol ID
+        bo.write(0);    // data coding scheme
+
+        Time msgTime = new Time(Time.TIMEZONE_UTC);
+        msgTime.set(smsInfo.date); // this is a UTC date!!
+        msgTime.switchTimezone(Time.getCurrentTimezone()); // now its a local time
+
+        bo.write(swapBCDForTime(msgTime.year % 100));
+        bo.write(swapBCDForTime(msgTime.month + 1));
+        bo.write(swapBCDForTime(msgTime.monthDay));
+        bo.write(swapBCDForTime(msgTime.hour));
+        bo.write(swapBCDForTime(msgTime.minute));
+        if (msgTime.second > 59) msgTime.second = 59;
+        bo.write(swapBCDForTime(msgTime.second));
+        // tzoffset... measured in quarter hours with a plus/minus bit
+        long tzOffset = (msgTime.gmtoff) / (60 * 15);
+        // tzOffset is now the number of 15 minute intervals between UTC and local
+        bo.write(swapBCDForTime((int) (tzOffset < 0 ? 128 - tzOffset : tzOffset)));
+
+        if (smsInfo.body.length() >= 160)
+            smsInfo.body = smsInfo.body.substring(0, 159);
+        byte[] userData = {};
+        try {
+            userData = GsmAlphabet.stringToGsm7BitPacked(smsInfo.body, 0, false, 0, 0);
+            bo.write(userData, 0, userData.length);
+        }
+        catch (EncodeException ex)
+        {
+            return new AtCommandResult(AtCommandResult.ERROR);
+        }
+        // the length of the PDU is bo size minus the scData length
+        int pduSize = bo.size() - scData.length;
+
+        int stat = 2; // outgoing unsent default
+        if (Sms.MESSAGE_TYPE_SENT == smsInfo.type) {
+            stat = 3;    // out/sent
+        } else if (Sms.MESSAGE_TYPE_INBOX == smsInfo.type) {
+            // see comment about 'seen' at the declaration of SMSMsgInfo
+            stat = (0 == smsInfo.seen) ? 0 : 1;
+        }
+        return new AtCommandResult("+CMGR: " + stat + ",," + pduSize + "\r\n" +
+                HexDump.toHexString(bo.toByteArray()));
+    }
+
+    /** shortcut to turn off new message indicators */
+    private void TurnOffNMI() {
+        InitializeNMI(0, 0, 0, 0, 1);
+    }
+
+    /** handles turning on/off new message indicator mode(s) */
+    private void InitializeNMI(int mode, int mt, int bm, int ds, int bfr) {
+        mNMI_mt = mt;    // only 0/1/2 supported
+        mNMI_bm = bm;    // only 0 supported
+        mNMI_ds = ds;    // only 0 supported
+        mNMI_bfr = bfr;
+
+        if (0 == mode) {
+            // only unregister the observer if it exists to begin with
+            if (0 != mNMI_mode) {
+                mContext.getContentResolver().unregisterContentObserver(smsContentObserver);
+                mNMI_mode = 0;
+            }
+        } else {
+            // modes 1 thru 3 are all the same the BT connection as there isn't ever
+            // any type of "reserved" mode (no DUN shares the link)
+
+            // for the purpose of bfr, consider any message that is not "seen" to be buffered.
+
+            mNMI_mode = mode;
+            // oddly, mt=0 will result in no messages being sent, but still hook the content
+            // observer for the purposes of future support of cell broadcast and/or delivery
+            // reports.  Setting a non-0 mode and leaving bm/ds/mt all at zero is silly.
+
+            Cursor sms = mContext.getContentResolver().query(Sms.CONTENT_URI,
+                    new String[] {"_id", Sms.DATE},
+                    Sms.TYPE + " + " + Sms.MESSAGE_TYPE_INBOX,
+                    null, Sms.DATE + " desc, _id desc");
+            if (null != sms) {
+                int dateColumn = sms.getColumnIndex(Sms.DATE);
+                mLastSeenSMSDate = 0;
+                if (sms.moveToFirst()) {
+                    mLastSeenSMSDate = sms.getLong(dateColumn);
+                }
+                sms.close();
+            }
+
+            // if bfr 0, anything marked as NOT SEEN should be notified (based on mt).
+            // In theory, only the newest will be unseen, so try to optimize things
+            // for that theory...  If I'm wrong, this will be out of spec.
+            if (0 == mNMI_bfr)
+            {
+                sms = mContext.getContentResolver().query(Sms.CONTENT_URI,
+                        new String[] {"_id", Sms.SEEN, Sms.TYPE},
+                        /* no filter - it'll mess up the index */
+                        null, null, Sms.DATE + " desc, _id desc");
+                if (null != sms) {
+                    int seenColumn = sms.getColumnIndex(Sms.SEEN);
+                    int typeColumn = sms.getColumnIndex(Sms.TYPE);
+                    int idColumn = sms.getColumnIndex("_id");
+
+                    int curMsgIdx = sms.getCount();
+                    if ((0 != curMsgIdx) && sms.moveToFirst()) {
+                        do {
+                            if (Sms.MESSAGE_TYPE_INBOX == sms.getLong(typeColumn)) {
+                                if (0 == sms.getLong(seenColumn)) {
+                                    // send notification
+                                    SendNMINofitication(sms.getInt(idColumn), curMsgIdx);
+                                    curMsgIdx--;
+                                } else {
+                                    // on the first seen message, break from the loop
+                                    break;
+                                }
+                            }
+                        } while (sms.moveToPrevious());
+                    }
+                    sms.close();
+                }
+            } // if 0 bfr
+
+            // registering on Sms.Inbox should be more efficient than on the entire SMS db, but
+            // it doesn't seem to get change notices when new SMS messages come in.
+            mContext.getContentResolver().registerContentObserver(Sms.CONTENT_URI, true, smsContentObserver);
+        }
+    }
+
+    /** gets a message count */
+    private int getMessageVirtualCount() {
+        int iRet = 0;
+        Cursor smsCursor =
+                mContext.getContentResolver().query(Sms.CONTENT_URI,
+                        new String[] {"_id"},
+                        null, null, null);
+        if (null != smsCursor)
+        {
+            iRet = smsCursor.getCount();
+            smsCursor.close();
+        }
+        return iRet;
+    }
+
+    /** find msg at a virtual index and populates smsInfo. Optionally marks msg as seen */
+    private int getMessageAtIndex(int index, SMSMsgInfo smsInfo, boolean bMarkAsSeen) {
+
+        int iRet = -1;
+
+        // cursor is 0 based, but the 'index' parameter is 1 based.
+        index--;
+
+        Cursor smsCursor =
+                mContext.getContentResolver().query(Sms.CONTENT_URI,
+                        new String[] {"_id", Sms.BODY, Sms.DATE, Sms.ADDRESS, Sms.SERVICE_CENTER, Sms.TYPE, Sms.READ, Sms.SEEN },
+                        null, null, Sms.DATE + " asc"); // in date ascending order for counting
+        if (null != smsCursor) {
+            if ((index < smsCursor.getCount()) && (smsCursor.moveToPosition(index))) {
+                int smsID = smsCursor.getInt(smsCursor.getColumnIndex("_id"));
+                smsInfo._id = smsID;
+                smsInfo.body = smsCursor.getString(smsCursor.getColumnIndex(Sms.BODY));
+                smsInfo.date = smsCursor.getLong(smsCursor.getColumnIndex(Sms.DATE));
+                smsInfo.OriginAddress = smsCursor.getString(smsCursor.getColumnIndex(Sms.ADDRESS));
+                smsInfo.SMSCAddress = smsCursor.getString(smsCursor.getColumnIndex(Sms.SERVICE_CENTER));
+                smsInfo.type = smsCursor.getInt(smsCursor.getColumnIndex(Sms.TYPE));
+                smsInfo.read = smsCursor.getInt(smsCursor.getColumnIndex(Sms.READ));
+                smsInfo.seen = smsCursor.getInt(smsCursor.getColumnIndex(Sms.SEEN));
+
+                //does java do ordered AND's?
+                if (null != smsInfo.SMSCAddress)
+                    if (smsInfo.SMSCAddress.trim().isEmpty())
+                        smsInfo.SMSCAddress = null;
+
+                iRet = 0; // success
+
+                if (bMarkAsSeen && (0 == smsCursor.getLong(smsCursor.getColumnIndex(Sms.SEEN)))) {
+                    if (DBG) Log.d(TAG, "Marking SMS record id " + smsInfo._id + " as seen.");
+                    ContentValues updateSeen = new ContentValues();
+                    updateSeen.put(Sms.SEEN, 1);
+                    mContext.getContentResolver().update(Sms.CONTENT_URI, updateSeen,
+                            "_id = " + smsInfo._id, null);
+                }
+
+            } else {
+                iRet = CMS_INVALID_INDEX;
+            }
+            smsCursor.close();
+        }
+        return iRet;
+    }
+
+    /** Actually sends the unsolicited response indicating a new incoming SMS */
+    private void SendNMINofitication(int _id, int index) {
+        if (1 == mNMI_mt) {
+            if (DBG) Log.d(TAG, "OUT: +CMTI: \"ME\"," + index);
+            mHandsfree.sendURC("+CMTI: \"ME\"," + index);
+        }
+        // if mt > 1, this might be a +CMT response with the actual message included.
+    }
+
+    /** ContentObserver for watching the sms content db (specifically for new records */
+    private class SmsContentObserverClass extends ContentObserver {
+        public SmsContentObserverClass() {
+            super(null);
+        }
+        @Override
+        public void onChange(boolean selfChange) {
+
+            // try to make things faster by first checking for new messages.  Only
+            // do the full query if there are messages since mLastSeenSMSDate that are
+            // also in the INBOX.  Funny how a content observer on Sms.Inbox.CONTENT_URI
+            // doesn't send a notification on a new message, but this query (on the same
+            // URI) will find it.
+            Cursor sms = mContext.getContentResolver().query(Sms.Inbox.CONTENT_URI,
+                    new String[] {"_id", Sms.DATE },
+                    Sms.DATE + " > " + mLastSeenSMSDate,
+                    null, null);
+
+            int nNewCount = sms.getCount();
+            if (DBG) Log.d(TAG, "content on change, new count = " + nNewCount);
+            sms.close();
+
+            if (nNewCount > 0) {
+                // there is at least one new message since LastSeenSMSDate.  In order
+                // to get the message index, the entire sms db has to be in a cursor
+                // for the count.  (msg idx 'N' is the Nth message in a list sorted by date)
+
+                sms = mContext.getContentResolver().query(Sms.CONTENT_URI,
+                        new String[] {"_id", Sms.DATE, Sms.TYPE },
+                        null, null, Sms.DATE + " desc, _id desc");
+
+                int nCurMsgIdx = sms.getCount(); // the latest dated message has this index
+
+                int dateColumn = sms.getColumnIndex(Sms.DATE);
+                int typeColumn = sms.getColumnIndex(Sms.TYPE);
+                int idColumn = sms.getColumnIndex("_id");
+
+                // record the largest date seen while looping
+                long nLatestDate = mLastSeenSMSDate;
+                long nMsgDate;
+
+                // this moveToFirst() should always succeed... but be paranoid
+                if (sms.moveToFirst()) {
+                    // the first seen will have the newest date stamp, so hang on to that
+                    // for updating mLastSeenSMSDate later on
+                    nMsgDate = nLatestDate = sms.getLong(dateColumn);
+
+                    // walk the cursor from the newest message to the oldest (desc sort order)
+                    while (nMsgDate > mLastSeenSMSDate) {
+                        // only concerned about stuff in the INBOX
+                        if (Sms.MESSAGE_TYPE_INBOX == sms.getLong(typeColumn)) {
+                            SendNMINofitication(sms.getInt(idColumn), nCurMsgIdx);
+                        }
+                        // get the previous message (next cursor row)
+                        if (sms.moveToPrevious()) {
+                            nCurMsgIdx--;
+                            // check if the date
+                            nMsgDate = sms.getLong(dateColumn);
+                        } else {
+                            // if moveToPrevious fails, there are no earlier msgs - so
+                            // a msg date of 0 actually makes sense (and results in the
+                            // loop terminating.)
+                            nMsgDate = 0;
+                        }
+                    }
+                    if (nLatestDate > mLastSeenSMSDate)
+                        mLastSeenSMSDate = nLatestDate;
+                } // if moveToFirst
+                sms.close();
+            } // if newCount > 0
+        }
+    }
+}
diff --git a/src/com/android/phone/CLIRListPreference.java b/src/com/android/phone/CLIRListPreference.java
index b83b52c96..b23277a32 100644
--- a/src/com/android/phone/CLIRListPreference.java
+++ b/src/com/android/phone/CLIRListPreference.java
@@ -14,20 +14,24 @@
 import android.util.AttributeSet;
 import android.util.Log;
 
+/**
+ * {@link ListPreference} for CLIR (Calling Line Identification Restriction).
+ * Right now this is used for "Caller ID" setting.
+ */
 public class CLIRListPreference extends ListPreference {
     private static final String LOG_TAG = "CLIRListPreference";
     private final boolean DBG = (PhoneApp.DBG_LEVEL >= 2);
 
-    private MyHandler mHandler = new MyHandler();
-    Phone phone;
-    TimeConsumingPreferenceListener tcpListener;
+    private final MyHandler mHandler = new MyHandler();
+    private final Phone mPhone;
+    private TimeConsumingPreferenceListener mTcpListener;
 
     int clirArray[];
 
     public CLIRListPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
 
-        phone = PhoneApp.getPhone();
+        mPhone = PhoneApp.getPhone();
     }
 
     public CLIRListPreference(Context context) {
@@ -38,27 +42,28 @@ public CLIRListPreference(Context context) {
     protected void onDialogClosed(boolean positiveResult) {
         super.onDialogClosed(positiveResult);
 
-        phone.setOutgoingCallerIdDisplay(findIndexOfValue(getValue()),
+        mPhone.setOutgoingCallerIdDisplay(findIndexOfValue(getValue()),
                 mHandler.obtainMessage(MyHandler.MESSAGE_SET_CLIR));
-        if (tcpListener != null) {
-            tcpListener.onStarted(this, false);
+        if (mTcpListener != null) {
+            mTcpListener.onStarted(this, false);
         }
     }
 
-    void init(TimeConsumingPreferenceListener listener, boolean skipReading) {
-        tcpListener = listener;
+    /* package */ void init(TimeConsumingPreferenceListener listener, boolean skipReading) {
+        mTcpListener = listener;
         if (!skipReading) {
-            phone.getOutgoingCallerIdDisplay(mHandler.obtainMessage(MyHandler.MESSAGE_GET_CLIR,
+            mPhone.getOutgoingCallerIdDisplay(mHandler.obtainMessage(MyHandler.MESSAGE_GET_CLIR,
                     MyHandler.MESSAGE_GET_CLIR, MyHandler.MESSAGE_GET_CLIR));
-            if (tcpListener != null) {
-                tcpListener.onStarted(this, true);
+            if (mTcpListener != null) {
+                mTcpListener.onStarted(this, true);
             }
         }
     }
 
-    void handleGetCLIRResult(int tmpClirArray[]) {
+    /* package */ void handleGetCLIRResult(int tmpClirArray[]) {
         clirArray = tmpClirArray;
-        final boolean enabled = tmpClirArray[1] == 1 || tmpClirArray[1] == 3 || tmpClirArray[1] == 4;
+        final boolean enabled =
+                tmpClirArray[1] == 1 || tmpClirArray[1] == 3 || tmpClirArray[1] == 4;
         setEnabled(enabled);
 
         // set the value of the preference based upon the clirArgs.
@@ -105,8 +110,8 @@ void handleGetCLIRResult(int tmpClirArray[]) {
     }
 
     private class MyHandler extends Handler {
-        private static final int MESSAGE_GET_CLIR = 0;
-        private static final int MESSAGE_SET_CLIR = 1;
+        static final int MESSAGE_GET_CLIR = 0;
+        static final int MESSAGE_SET_CLIR = 1;
 
         @Override
         public void handleMessage(Message msg) {
@@ -124,23 +129,26 @@ private void handleGetCLIRResponse(Message msg) {
             AsyncResult ar = (AsyncResult) msg.obj;
 
             if (msg.arg2 == MESSAGE_SET_CLIR) {
-                tcpListener.onFinished(CLIRListPreference.this, false);
+                mTcpListener.onFinished(CLIRListPreference.this, false);
             } else {
-                tcpListener.onFinished(CLIRListPreference.this, true);
+                mTcpListener.onFinished(CLIRListPreference.this, true);
             }
             clirArray = null;
             if (ar.exception != null) {
                 if (DBG) Log.d(LOG_TAG, "handleGetCLIRResponse: ar.exception="+ar.exception);
-                tcpListener.onException(CLIRListPreference.this, (CommandException) ar.exception);
+                mTcpListener.onException(CLIRListPreference.this, (CommandException) ar.exception);
             } else if (ar.userObj instanceof Throwable) {
-                tcpListener.onError(CLIRListPreference.this, RESPONSE_ERROR);
+                mTcpListener.onError(CLIRListPreference.this, RESPONSE_ERROR);
             } else {
                 int clirArray[] = (int[]) ar.result;
                 if (clirArray.length != 2) {
-                    tcpListener.onError(CLIRListPreference.this, RESPONSE_ERROR);
+                    mTcpListener.onError(CLIRListPreference.this, RESPONSE_ERROR);
                 } else {
-                    if (DBG) Log.d(LOG_TAG, "handleGetCLIRResponse: CLIR successfully queried, clirArray[0]="
-                            + clirArray[0] + ", clirArray[1]=" + clirArray[1]);
+                    if (DBG) {
+                        Log.d(LOG_TAG, "handleGetCLIRResponse: CLIR successfully queried,"
+                                + " clirArray[0]=" + clirArray[0]
+                                + ", clirArray[1]=" + clirArray[1]);
+                    }
                     handleGetCLIRResult(clirArray);
                 }
             }
@@ -155,8 +163,8 @@ private void handleSetCLIRResponse(Message msg) {
             }
             if (DBG) Log.d(LOG_TAG, "handleSetCallWaitingResponse: re get");
 
-            phone.getOutgoingCallerIdDisplay(obtainMessage(MESSAGE_GET_CLIR,
+            mPhone.getOutgoingCallerIdDisplay(obtainMessage(MESSAGE_GET_CLIR,
                     MESSAGE_SET_CLIR, MESSAGE_SET_CLIR, ar.exception));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/phone/CallCard.java b/src/com/android/phone/CallCard.java
old mode 100755
new mode 100644
index 0e34b9b58..413a697cd
--- a/src/com/android/phone/CallCard.java
+++ b/src/com/android/phone/CallCard.java
@@ -16,35 +16,37 @@
 
 package com.android.phone;
 
-import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
+import android.animation.LayoutTransition;
 import android.content.ContentUris;
 import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.pim.ContactsAsyncHelper;
+import android.os.Handler;
+import android.os.Message;
 import android.provider.ContactsContract.Contacts;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewStub;
 import android.view.accessibility.AccessibilityEvent;
-import android.widget.Button;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
-import android.widget.RelativeLayout;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.android.internal.telephony.Call;
+import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.CallerInfo;
 import com.android.internal.telephony.CallerInfoAsyncQuery;
 import com.android.internal.telephony.Connection;
 import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.CallManager;
 
 import java.util.List;
 
@@ -54,12 +56,30 @@
  * cards, each representing the state of a current "call" (ie. an active call,
  * a call on hold, or an incoming call.)
  */
-public class CallCard extends FrameLayout
+public class CallCard extends LinearLayout
         implements CallTime.OnTickListener, CallerInfoAsyncQuery.OnQueryCompleteListener,
                    ContactsAsyncHelper.OnImageLoadCompleteListener {
     private static final String LOG_TAG = "CallCard";
     private static final boolean DBG = (PhoneApp.DBG_LEVEL >= 2);
 
+    private static final int TOKEN_UPDATE_PHOTO_FOR_CALL_STATE = 0;
+    private static final int TOKEN_DO_NOTHING = 1;
+
+    /**
+     * Used with {@link ContactsAsyncHelper#startObtainPhotoAsync(int, Context, Uri,
+     * ContactsAsyncHelper.OnImageLoadCompleteListener, Object)}
+     */
+    private static class AsyncLoadCookie {
+        public final ImageView imageView;
+        public final CallerInfo callerInfo;
+        public final Call call;
+        public AsyncLoadCookie(ImageView imageView, CallerInfo callerInfo, Call call) {
+            this.imageView = imageView;
+            this.callerInfo = callerInfo;
+            this.call = call;
+        }
+    }
+
     /**
      * Reference to the InCallScreen activity that owns us.  This may be
      * null if we haven't been initialized yet *or* after the InCallScreen
@@ -71,10 +91,23 @@ public class CallCard extends FrameLayout
     private PhoneApp mApplication;
 
     // Top-level subviews of the CallCard
-    private ViewGroup mCallInfoContainer;  // Container for info about the current call(s)
-    private ViewGroup mPrimaryCallInfo;  // "Call info" block #1 (the foreground or ringing call)
-    private ViewGroup mPrimaryCallBanner;  // "Call banner" for the primary call
-    private ViewGroup mSecondaryCallInfo;  // "Call info" block #2 (the background "on hold" call)
+    /** Container for info about the current call(s) */
+    private ViewGroup mCallInfoContainer;
+    /** Primary "call info" block (the foreground or ringing call) */
+    private ViewGroup mPrimaryCallInfo;
+    /** "Call banner" for the primary call */
+    private ViewGroup mPrimaryCallBanner;
+    /** Secondary "call info" block (the background "on hold" call) */
+    private ViewStub mSecondaryCallInfo;
+
+    /**
+     * Container for both provider info and call state. This will take care of showing/hiding
+     * animation for those views.
+     */
+    private ViewGroup mSecondaryInfoContainer;
+    private ViewGroup mProviderInfo;
+    private TextView mProviderLabel;
+    private TextView mProviderAddress;
 
     // "Call state" widgets
     private TextView mCallStateLabel;
@@ -85,18 +118,26 @@ public class CallCard extends FrameLayout
 
     // The main block of info about the "primary" or "active" call,
     // including photo / name / phone number / etc.
-    private InCallContactPhoto mPhoto;
+    private ImageView mPhoto;
+    private View mPhotoDimEffect;
+
     private TextView mName;
     private TextView mPhoneNumber;
     private TextView mLabel;
     private TextView mCallTypeLabel;
-    private TextView mSocialStatus;
+    // private TextView mSocialStatus;
+
+    /**
+     * Uri being used to load contact photo for mPhoto. Will be null when nothing is being loaded,
+     * or a photo is already loaded.
+     */
+    private Uri mLoadingPersonUri;
 
     // Info about the "secondary" call, which is the "call on hold" when
     // two lines are in use.
     private TextView mSecondaryCallName;
-    private TextView mSecondaryCallStatus;
-    private InCallContactPhoto mSecondaryCallPhoto;
+    private ImageView mSecondaryCallPhoto;
+    private View mSecondaryCallPhotoDimEffect;
 
     // Onscreen hint for the incoming call RotarySelector widget.
     private int mIncomingCallWidgetHintTextResId;
@@ -110,6 +151,28 @@ public class CallCard extends FrameLayout
     // Cached DisplayMetrics density.
     private float mDensity;
 
+    /**
+     * Sent when it takes too long (MESSAGE_DELAY msec) to load a contact photo for the given
+     * person, at which we just start showing the default avatar picture instead of the person's
+     * one. Note that we will *not* cancel the ongoing query and eventually replace the avatar
+     * with the person's photo, when it is available anyway.
+     */
+    private static final int MESSAGE_SHOW_UNKNOWN_PHOTO = 101;
+    private static final int MESSAGE_DELAY = 500; // msec
+    private final Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MESSAGE_SHOW_UNKNOWN_PHOTO:
+                    showImage(mPhoto, R.drawable.picture_unknown);
+                    break;
+                default:
+                    Log.wtf(LOG_TAG, "mHandler: unexpected message: " + msg);
+                    break;
+            }
+        }
+    };
+
     public CallCard(Context context, AttributeSet attrs) {
         super(context, attrs);
 
@@ -117,13 +180,6 @@ public CallCard(Context context, AttributeSet attrs) {
         if (DBG) log("- this = " + this);
         if (DBG) log("- context " + context + ", attrs " + attrs);
 
-        // Inflate the contents of this CallCard, and add it (to ourself) as a child.
-        LayoutInflater inflater = LayoutInflater.from(context);
-        inflater.inflate(
-                R.layout.call_card,  // resource
-                this,                // root
-                true);
-
         mApplication = PhoneApp.getInstance();
 
         mCallTime = new CallTime(this);
@@ -135,18 +191,18 @@ public CallCard(Context context, AttributeSet attrs) {
         if (DBG) log("- Density: " + mDensity);
     }
 
-    void setInCallScreenInstance(InCallScreen inCallScreen) {
+    /* package */ void setInCallScreenInstance(InCallScreen inCallScreen) {
         mInCallScreen = inCallScreen;
     }
 
+    @Override
     public void onTickForCallTimeElapsed(long timeElapsed) {
         // While a call is in progress, update the elapsed time shown
         // onscreen.
         updateElapsedTimeWidget(timeElapsed);
     }
 
-    /* package */
-    void stopTimer() {
+    /* package */ void stopTimer() {
         mCallTime.cancelTimer();
     }
 
@@ -157,9 +213,13 @@ protected void onFinishInflate() {
         if (DBG) log("CallCard onFinishInflate(this = " + this + ")...");
 
         mCallInfoContainer = (ViewGroup) findViewById(R.id.call_info_container);
-        mPrimaryCallInfo = (ViewGroup) findViewById(R.id.call_info_1);
-        mPrimaryCallBanner = (ViewGroup) findViewById(R.id.call_banner_1);
-        mSecondaryCallInfo = (ViewGroup) findViewById(R.id.call_info_2);
+        mPrimaryCallInfo = (ViewGroup) findViewById(R.id.primary_call_info);
+        mPrimaryCallBanner = (ViewGroup) findViewById(R.id.primary_call_banner);
+
+        mSecondaryInfoContainer = (ViewGroup) findViewById(R.id.secondary_info_container);
+        mProviderInfo = (ViewGroup) findViewById(R.id.providerInfo);
+        mProviderLabel = (TextView) findViewById(R.id.providerLabel);
+        mProviderAddress = (TextView) findViewById(R.id.providerAddress);
         mCallStateLabel = (TextView) findViewById(R.id.callStateLabel);
         mElapsedTime = (TextView) findViewById(R.id.elapsedTime);
 
@@ -167,27 +227,24 @@ protected void onFinishInflate() {
         mTextColorCallTypeSip = getResources().getColor(R.color.incall_callTypeSip);
 
         // "Caller info" area, including photo / name / phone numbers / etc
-        mPhoto = (InCallContactPhoto) findViewById(R.id.photo);
-        ImageView inset = (ImageView) findViewById(R.id.insetPhoto);
-        mPhoto.setInsetImageView(inset);
+        mPhoto = (ImageView) findViewById(R.id.photo);
+        mPhotoDimEffect = findViewById(R.id.dim_effect_for_primary_photo);
 
         mName = (TextView) findViewById(R.id.name);
         mPhoneNumber = (TextView) findViewById(R.id.phoneNumber);
         mLabel = (TextView) findViewById(R.id.label);
         mCallTypeLabel = (TextView) findViewById(R.id.callTypeLabel);
-        mSocialStatus = (TextView) findViewById(R.id.socialStatus);
+        // mSocialStatus = (TextView) findViewById(R.id.socialStatus);
 
         // Secondary info area, for the background ("on hold") call
-        mSecondaryCallName = (TextView) findViewById(R.id.secondaryCallName);
-        mSecondaryCallStatus = (TextView) findViewById(R.id.secondaryCallStatus);
-        mSecondaryCallPhoto = (InCallContactPhoto) findViewById(R.id.secondaryCallPhoto);
+        mSecondaryCallInfo = (ViewStub) findViewById(R.id.secondary_call_info);
     }
 
     /**
      * Updates the state of all UI elements on the CallCard, based on the
      * current state of the phone.
      */
-    void updateState(CallManager cm) {
+    /* package */ void updateState(CallManager cm) {
         if (DBG) log("updateState(" + cm + ")...");
 
         // Update the onscreen UI based on the current state of the phone.
@@ -222,22 +279,32 @@ void updateState(CallManager cm) {
             // The normal "foreground call" code path handles both cases.
             updateForegroundCall(cm);
         } else {
-            // We don't have any DISCONNECTED calls, which means
-            // that the phone is *truly* idle.
-            //
-            // It's very rare to be on the InCallScreen at all in this
-            // state, but it can happen in some cases:
-            // - A stray onPhoneStateChanged() event came in to the
-            //   InCallScreen *after* it was dismissed.
-            // - We're allowed to be on the InCallScreen because
-            //   an MMI or USSD is running, but there's no actual "call"
-            //   to display.
-            // - We're displaying an error dialog to the user
-            //   (explaining why the call failed), so we need to stay on
-            //   the InCallScreen so that the dialog will be visible.
-            //
-            // In these cases, put the callcard into a sane but "blank" state:
-            updateNoCall(cm);
+            // We don't have any DISCONNECTED calls, which means that the phone
+            // is *truly* idle.
+            if (mApplication.inCallUiState.showAlreadyDisconnectedState) {
+                // showAlreadyDisconnectedState implies the phone call is disconnected
+                // and we want to show the disconnected phone call for a moment.
+                //
+                // This happens when a phone call ends while the screen is off,
+                // which means the user had no chance to see the last status of
+                // the call. We'll turn off showAlreadyDisconnectedState flag
+                // and bail out of the in-call screen soon.
+                updateAlreadyDisconnected(cm);
+            } else {
+                // It's very rare to be on the InCallScreen at all in this
+                // state, but it can happen in some cases:
+                // - A stray onPhoneStateChanged() event came in to the
+                //   InCallScreen *after* it was dismissed.
+                // - We're allowed to be on the InCallScreen because
+                //   an MMI or USSD is running, but there's no actual "call"
+                //   to display.
+                // - We're displaying an error dialog to the user
+                //   (explaining why the call failed), so we need to stay on
+                //   the InCallScreen so that the dialog will be visible.
+                //
+                // In these cases, put the callcard into a sane but "blank" state:
+                updateNoCall(cm);
+            }
         }
     }
 
@@ -298,15 +365,15 @@ private void updateForegroundCall(CallManager cm) {
             if ((mApplication.cdmaPhoneCallState.getCurrentCallState()
                     == CdmaPhoneCallState.PhoneCallState.THRWAY_ACTIVE)
                     && mApplication.cdmaPhoneCallState.IsThreeWayCallOrigStateDialing()) {
-                displayOnHoldCallStatus(cm, fgCall);
+                displaySecondaryCallStatus(cm, fgCall);
             } else {
                 //This is required so that even if a background call is not present
                 // we need to clean up the background call area.
-                displayOnHoldCallStatus(cm, bgCall);
+                displaySecondaryCallStatus(cm, bgCall);
             }
         } else if ((phoneType == Phone.PHONE_TYPE_GSM)
                 || (phoneType == Phone.PHONE_TYPE_SIP)) {
-            displayOnHoldCallStatus(cm, bgCall);
+            displaySecondaryCallStatus(cm, bgCall);
         }
     }
 
@@ -326,7 +393,35 @@ private void updateRingingCall(CallManager cm) {
         // the current ongoing call and/or the current call on hold.
         // (Since the caller-id info for the incoming call totally trumps
         // any info about the current call(s) in progress.)
-        displayOnHoldCallStatus(cm, null);
+        displaySecondaryCallStatus(cm, null);
+    }
+
+    /**
+     * Updates the UI for the state where an incoming call is just disconnected while we want to
+     * show the screen for a moment.
+     *
+     * This case happens when the whole in-call screen is in background when phone calls are hanged
+     * up, which means there's no way to determine which call was the last call finished. Right now
+     * this method simply shows the previous primary call status with a photo, closing the
+     * secondary call status. In most cases (including conference call or misc call happening in
+     * CDMA) this behaves right.
+     *
+     * If there were two phone calls both of which were hung up but the primary call was the
+     * first, this would behave a bit odd (since the first one still appears as the
+     * "last disconnected").
+     */
+    private void updateAlreadyDisconnected(CallManager cm) {
+        // For the foreground call, we manually set up every component based on previous state.
+        mPrimaryCallInfo.setVisibility(View.VISIBLE);
+        mSecondaryInfoContainer.setLayoutTransition(null);
+        mProviderInfo.setVisibility(View.GONE);
+        mCallStateLabel.setVisibility(View.VISIBLE);
+        mCallStateLabel.setText(mContext.getString(R.string.card_title_call_ended));
+        mElapsedTime.setVisibility(View.VISIBLE);
+        mCallTime.cancelTimer();
+
+        // Just hide it.
+        displaySecondaryCallStatus(cm, null);
     }
 
     /**
@@ -341,7 +436,7 @@ private void updateNoCall(CallManager cm) {
         if (DBG) log("updateNoCall()...");
 
         displayMainCallStatus(cm, null);
-        displayOnHoldCallStatus(cm, null);
+        displaySecondaryCallStatus(cm, null);
     }
 
     /**
@@ -553,6 +648,7 @@ private void displayMainCallStatus(CallManager cm, Call call) {
      * Implemented for CallerInfoAsyncQuery.OnQueryCompleteListener interface.
      * refreshes the CallCard data when it called.
      */
+    @Override
     public void onQueryComplete(int token, Object cookie, CallerInfo ci) {
         if (DBG) log("onQueryComplete: token " + token + ", cookie " + cookie + ", ci " + ci);
 
@@ -600,10 +696,43 @@ public void onQueryComplete(int token, Object cookie, CallerInfo ci) {
      * Implemented for ContactsAsyncHelper.OnImageLoadCompleteListener interface.
      * make sure that the call state is reflected after the image is loaded.
      */
-    public void onImageLoadComplete(int token, Object cookie, ImageView iView,
-            boolean imagePresent){
-        if (cookie != null) {
-            updatePhotoForCallState((Call) cookie);
+    @Override
+    public void onImageLoadComplete(int token, Drawable photo, Bitmap photoIcon, Object cookie) {
+        mHandler.removeMessages(MESSAGE_SHOW_UNKNOWN_PHOTO);
+        if (mLoadingPersonUri != null) {
+            // Start sending view notification after the current request being done.
+            // New image may possibly be available from the next phone calls.
+            //
+            // TODO: may be nice to update the image view again once the newer one
+            // is available on contacts database.
+            PhoneUtils.sendViewNotificationAsync(mApplication, mLoadingPersonUri);
+        } else {
+            // This should not happen while we need some verbose info if it happens..
+            Log.w(LOG_TAG, "Person Uri isn't available while Image is successfully loaded.");
+        }
+        mLoadingPersonUri = null;
+
+        AsyncLoadCookie asyncLoadCookie = (AsyncLoadCookie) cookie;
+        CallerInfo callerInfo = asyncLoadCookie.callerInfo;
+        ImageView imageView = asyncLoadCookie.imageView;
+        Call call = asyncLoadCookie.call;
+
+        callerInfo.cachedPhoto = photo;
+        callerInfo.cachedPhotoIcon = photoIcon;
+        callerInfo.isCachedPhotoCurrent = true;
+
+        // Note: previously ContactsAsyncHelper has done this job.
+        // TODO: We will need fade-in animation. See issue 5236130.
+        if (photo != null) {
+            showImage(imageView, photo);
+        } else if (photoIcon != null) {
+            showImage(imageView, photoIcon);
+        } else {
+            showImage(imageView, R.drawable.picture_unknown);
+        }
+
+        if (token == TOKEN_UPDATE_PHOTO_FOR_CALL_STATE) {
+            updatePhotoForCallState(call);
         }
     }
 
@@ -689,19 +818,40 @@ private void updateCallStateWidgets(Call call) {
             callStateLabel = getECMCardTitle(context, phone);
         }
 
-        if (DBG) log("==> callStateLabel: '" + callStateLabel
-                     + "', bluetoothIconId = " + bluetoothIconId);
+        final InCallUiState inCallUiState = mApplication.inCallUiState;
+        if (DBG) {
+            log("==> callStateLabel: '" + callStateLabel
+                    + "', bluetoothIconId = " + bluetoothIconId
+                    + ", providerInfoVisible = " + inCallUiState.providerInfoVisible);
+        }
+
+        // Animation will be done by mCallerDetail's LayoutTransition, but in some cases, we don't
+        // want that.
+        // - DIALING: This is at the beginning of the phone call.
+        // - DISCONNECTING, DISCONNECTED: Screen will disappear soon; we have no time for animation.
+        final boolean skipAnimation = (state == Call.State.DIALING
+                || state == Call.State.DISCONNECTING
+                || state == Call.State.DISCONNECTED);
+        LayoutTransition layoutTransition = null;
+        if (skipAnimation) {
+            // Evict LayoutTransition object to skip animation.
+            layoutTransition = mSecondaryInfoContainer.getLayoutTransition();
+            mSecondaryInfoContainer.setLayoutTransition(null);
+        }
+
+        if (inCallUiState.providerInfoVisible) {
+            mProviderInfo.setVisibility(View.VISIBLE);
+            mProviderLabel.setText(context.getString(R.string.calling_via_template,
+                    inCallUiState.providerLabel));
+            mProviderAddress.setText(inCallUiState.providerAddress);
 
-        // Update (or hide) the onscreen widget:
-        if (TextUtils.isEmpty(callStateLabel)) {
-            // When hiding, do a smooth fade-out animation.
-            Fade.hide(mCallStateLabel, View.GONE);
+            mInCallScreen.requestRemoveProviderInfoWithDelay();
         } else {
-            // ... but when becoming visible, never animate (mainly to be
-            // sure you don't see a fade-in at the very beginning of a
-            // call.)
-            mCallStateLabel.setVisibility(View.VISIBLE);
+            mProviderInfo.setVisibility(View.GONE);
+        }
 
+        if (!TextUtils.isEmpty(callStateLabel)) {
+            mCallStateLabel.setVisibility(View.VISIBLE);
             mCallStateLabel.setText(callStateLabel);
 
             // ...and display the icon too if necessary.
@@ -712,45 +862,72 @@ private void updateCallStateWidgets(Call call) {
                 // Clear out any icons
                 mCallStateLabel.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0);
             }
+        } else {
+            mCallStateLabel.setVisibility(View.GONE);
+        }
+        if (skipAnimation) {
+            // Restore LayoutTransition object to recover animation.
+            mSecondaryInfoContainer.setLayoutTransition(layoutTransition);
         }
 
         // ...and update the elapsed time widget too.
         switch (state) {
             case ACTIVE:
             case DISCONNECTING:
-                mElapsedTime.setVisibility(View.VISIBLE);
-                long duration = CallTime.getCallDuration(call);  // msec
-                updateElapsedTimeWidget(duration / 1000);
-                // Also see onTickForCallTimeElapsed(), which updates this
-                // widget once per second while the call is active.
+                // Show the time with fade-in animation.
+                AnimationUtils.Fade.show(mElapsedTime);
+                updateElapsedTimeWidget(call);
                 break;
 
             case DISCONNECTED:
                 // In the "Call ended" state, leave the mElapsedTime widget
                 // visible, but don't touch it (so we continue to see the
                 // elapsed time of the call that just ended.)
-                mElapsedTime.setVisibility(View.VISIBLE);
+                // Check visibility to keep possible fade-in animation.
+                if (mElapsedTime.getVisibility() != View.VISIBLE) {
+                    mElapsedTime.setVisibility(View.VISIBLE);
+                }
                 break;
 
             default:
-                // In all other states (DIALING, INCOMING, HOLDING, etc.),
-                // the "elapsed time" is meaningless, so don't show it.
-                mElapsedTime.setVisibility(View.INVISIBLE);
+                // Call state here is IDLE, ACTIVE, HOLDING, DIALING, ALERTING,
+                // INCOMING, or WAITING.
+                // In all of these states, the "elapsed time" is meaningless, so
+                // don't show it.
+                AnimationUtils.Fade.hide(mElapsedTime, View.INVISIBLE);
+
+                // Additionally, in call states that can only occur at the start
+                // of a call, reset the elapsed time to be sure we won't display
+                // stale info later (like if we somehow go straight from DIALING
+                // or ALERTING to DISCONNECTED, which can actually happen in
+                // some failure cases like "line busy").
+                if ((state ==  Call.State.DIALING) || (state == Call.State.ALERTING)) {
+                    updateElapsedTimeWidget(0);
+                }
+
                 break;
         }
     }
 
+    /**
+     * Updates mElapsedTime based on the given {@link Call} object's information.
+     *
+     * @see CallTime#getCallDuration(Call)
+     * @see Connection#getDurationMillis()
+     */
+    /* package */ void updateElapsedTimeWidget(Call call) {
+        long duration = CallTime.getCallDuration(call);  // msec
+        updateElapsedTimeWidget(duration / 1000);
+        // Also see onTickForCallTimeElapsed(), which updates this
+        // widget once per second while the call is active.
+    }
+
     /**
      * Updates mElapsedTime based on the specified number of seconds.
-     * A timeElapsed value of zero means to not show an elapsed time at all.
      */
     private void updateElapsedTimeWidget(long timeElapsed) {
         // if (DBG) log("updateElapsedTimeWidget: " + timeElapsed);
-        if (timeElapsed == 0) {
-            mElapsedTime.setText("");
-        } else {
-            mElapsedTime.setText(DateUtils.formatElapsedTime(timeElapsed));
-        }
+        mElapsedTime.setText(DateUtils.formatElapsedTime(timeElapsed));
     }
 
     /**
@@ -760,7 +937,7 @@ private void updateElapsedTimeWidget(long timeElapsed) {
      * Or, clear out the "on hold" box if the specified call
      * is null or idle.
      */
-    private void displayOnHoldCallStatus(CallManager cm, Call call) {
+    private void displaySecondaryCallStatus(CallManager cm, Call call) {
         if (DBG) log("displayOnHoldCallStatus(call =" + call + ")...");
 
         if ((call == null) || (PhoneApp.getInstance().isOtaCallInActiveState())) {
@@ -768,7 +945,6 @@ private void displayOnHoldCallStatus(CallManager cm, Call call) {
             return;
         }
 
-        boolean showSecondaryCallInfo = false;
         Call.State state = call.getState();
         switch (state) {
             case HOLDING:
@@ -778,6 +954,7 @@ private void displayOnHoldCallStatus(CallManager cm, Call call) {
                 // Note this case occurs only on GSM devices.  (On CDMA,
                 // the "call on hold" is actually the 2nd connection of
                 // that ACTIVE call; see the ACTIVE case below.)
+                showSecondaryCallInfo();
 
                 if (PhoneUtils.isConferenceCall(call)) {
                     if (DBG) log("==> conference call.");
@@ -807,8 +984,7 @@ private void displayOnHoldCallStatus(CallManager cm, Call call) {
                     }
                 }
 
-                showSecondaryCallInfo = true;
-
+                AnimationUtils.Fade.show(mSecondaryCallPhotoDimEffect);
                 break;
 
             case ACTIVE:
@@ -816,6 +992,8 @@ private void displayOnHoldCallStatus(CallManager cm, Call call) {
                 // although the Foreground call state is still ACTIVE in reality the network
                 // put the first call on hold.
                 if (mApplication.phone.getPhoneType() == Phone.PHONE_TYPE_CDMA) {
+                    showSecondaryCallInfo();
+
                     List<Connection> connections = call.getConnections();
                     if (connections.size() > 2) {
                         // This means that current Mobile Originated call is the not the first 3-Way
@@ -841,7 +1019,8 @@ private void displayOnHoldCallStatus(CallManager cm, Call call) {
                         boolean forceGenericPhoto = false;
                         if (info != null && info.numberPresentation !=
                                 Connection.PRESENTATION_ALLOWED) {
-                            name = getPresentationString(info.numberPresentation);
+                            name = PhoneUtils.getPresentationString(
+                                    getContext(), info.numberPresentation);
                             forceGenericPhoto = true;
                         }
                         mSecondaryCallName.setText(name);
@@ -858,25 +1037,50 @@ private void displayOnHoldCallStatus(CallManager cm, Call call) {
                             showImage(mSecondaryCallPhoto, R.drawable.picture_unknown);
                         }
                     }
-                    showSecondaryCallInfo = true;
-
                 } else {
                     // We shouldn't ever get here at all for non-CDMA devices.
                     Log.w(LOG_TAG, "displayOnHoldCallStatus: ACTIVE state on non-CDMA device");
-                    showSecondaryCallInfo = false;
+                    mSecondaryCallInfo.setVisibility(View.GONE);
                 }
+
+                AnimationUtils.Fade.hide(mSecondaryCallPhotoDimEffect, View.GONE);
                 break;
 
             default:
                 // There's actually no call on hold.  (Presumably this call's
                 // state is IDLE, since any other state is meaningless for the
                 // background call.)
-                showSecondaryCallInfo = false;
+                mSecondaryCallInfo.setVisibility(View.GONE);
                 break;
         }
+    }
 
-        // Show or hide the entire "secondary call" info area.
-        mSecondaryCallInfo.setVisibility(showSecondaryCallInfo ? View.VISIBLE : View.GONE);
+    private void showSecondaryCallInfo() {
+        // This will call ViewStub#inflate() when needed.
+        mSecondaryCallInfo.setVisibility(View.VISIBLE);
+        if (mSecondaryCallName == null) {
+            mSecondaryCallName = (TextView) findViewById(R.id.secondaryCallName);
+        }
+        if (mSecondaryCallPhoto == null) {
+            mSecondaryCallPhoto = (ImageView) findViewById(R.id.secondaryCallPhoto);
+        }
+        if (mSecondaryCallPhotoDimEffect == null) {
+            mSecondaryCallPhotoDimEffect = findViewById(R.id.dim_effect_for_secondary_photo);
+            mSecondaryCallPhotoDimEffect.setOnClickListener(mInCallScreen);
+            // Add a custom OnTouchListener to manually shrink the "hit target".
+            mSecondaryCallPhotoDimEffect.setOnTouchListener(new SmallerHitTargetTouchListener());
+        }
+        mInCallScreen.updateButtonStateOutsideInCallTouchUi();
+    }
+
+    /**
+     * Method which is expected to be called from
+     * {@link InCallScreen#updateButtonStateOutsideInCallTouchUi()}.
+     */
+    /* package */ void setSecondaryCallClickable(boolean clickable) {
+        if (mSecondaryCallPhotoDimEffect != null) {
+            mSecondaryCallPhotoDimEffect.setEnabled(clickable);
+        }
     }
 
     private String getCallFailedString(Call call) {
@@ -987,8 +1191,8 @@ private void updateDisplayForPerson(CallerInfo info,
         String displayNumber = null;
         String label = null;
         Uri personUri = null;
-        String socialStatusText = null;
-        Drawable socialStatusBadge = null;
+        // String socialStatusText = null;
+        // Drawable socialStatusBadge = null;
 
         if (info != null) {
             // It appears that there is a small change in behaviour with the
@@ -1027,13 +1231,13 @@ private void updateDisplayForPerson(CallerInfo info,
                 if (TextUtils.isEmpty(number)) {
                     // No name *or* number!  Display a generic "unknown" string
                     // (or potentially some other default based on the presentation.)
-                    displayName =  getPresentationString(presentation);
+                    displayName = PhoneUtils.getPresentationString(getContext(), presentation);
                     if (DBG) log("  ==> no name *or* number! displayName = " + displayName);
                 } else if (presentation != Connection.PRESENTATION_ALLOWED) {
                     // This case should never happen since the network should never send a phone #
                     // AND a restricted presentation. However we leave it here in case of weird
                     // network behavior
-                    displayName = getPresentationString(presentation);
+                    displayName = PhoneUtils.getPresentationString(getContext(), presentation);
                     if (DBG) log("  ==> presentation not allowed! displayName = " + displayName);
                 } else if (!TextUtils.isEmpty(info.cnapName)) {
                     // No name, but we do have a valid CNAP name, so use that.
@@ -1070,7 +1274,7 @@ private void updateDisplayForPerson(CallerInfo info,
                     // This case should never happen since the network should never send a name
                     // AND a restricted presentation. However we leave it here in case of weird
                     // network behavior
-                    displayName = getPresentationString(presentation);
+                    displayName = PhoneUtils.getPresentationString(getContext(), presentation);
                     if (DBG) log("  ==> valid name, but presentation not allowed!"
                                  + " displayName = " + displayName);
                 } else {
@@ -1085,7 +1289,7 @@ private void updateDisplayForPerson(CallerInfo info,
             if (DBG) log("- got personUri: '" + personUri
                          + "', based on info.person_id: " + info.person_id);
         } else {
-            displayName =  getPresentationString(presentation);
+            displayName = PhoneUtils.getPresentationString(getContext(), presentation);
         }
 
         if (call.isGeneric()) {
@@ -1106,14 +1310,48 @@ private void updateDisplayForPerson(CallerInfo info,
         // for cases where CallerInfo.photoResource may be set.  We can also avoid
         // the image load step if the image data is cached.
         if (isTemporary && (info == null || !info.isCachedPhotoCurrent)) {
+            mPhoto.setTag(null);
             mPhoto.setVisibility(View.INVISIBLE);
         } else if (info != null && info.photoResource != 0){
             showImage(mPhoto, info.photoResource);
         } else if (!showCachedImage(mPhoto, info)) {
-            // Load the image with a callback to update the image state.
-            // Use the default unknown picture while the query is running.
-            ContactsAsyncHelper.updateImageViewWithContactPhotoAsync(
-                info, 0, this, call, getContext(), mPhoto, personUri, R.drawable.picture_unknown);
+            if (personUri == null) {
+                Log.w(LOG_TAG, "personPri is null. Just use Unknown picture.");
+                showImage(mPhoto, R.drawable.picture_unknown);
+            } else if (personUri.equals(mLoadingPersonUri)) {
+                if (DBG) {
+                    log("The requested Uri (" + personUri + ") is being loaded already."
+                            + " Ignoret the duplicate load request.");
+                }
+            } else {
+                // Remember which person's photo is being loaded right now so that we won't issue
+                // unnecessary load request multiple times, which will mess up animation around
+                // the contact photo.
+                mLoadingPersonUri = personUri;
+
+                // Forget the drawable previously used.
+                mPhoto.setTag(null);
+                // Show empty screen for a moment.
+                mPhoto.setVisibility(View.INVISIBLE);
+                // Load the image with a callback to update the image state.
+                // When the load is finished, onImageLoadComplete() will be called.
+                ContactsAsyncHelper.startObtainPhotoAsync(TOKEN_UPDATE_PHOTO_FOR_CALL_STATE,
+                        getContext(), personUri, this, new AsyncLoadCookie(mPhoto, info, call));
+
+                // If the image load is too slow, we show a default avatar icon afterward.
+                // If it is fast enough, this message will be canceled on onImageLoadComplete().
+                mHandler.removeMessages(MESSAGE_SHOW_UNKNOWN_PHOTO);
+                mHandler.sendEmptyMessageDelayed(MESSAGE_SHOW_UNKNOWN_PHOTO, MESSAGE_DELAY);
+            }
+        }
+
+        // If the phone call is on hold, show it with darker status.
+        // Right now we achieve it by overlaying opaque View.
+        // Note: See also layout file about why so and what is the other possibilities.
+        if (call.getState() == Call.State.HOLDING) {
+            AnimationUtils.Fade.show(mPhotoDimEffect);
+        } else {
+            AnimationUtils.Fade.hide(mPhotoDimEffect, View.GONE);
         }
 
         if (displayNumber != null && !call.isGeneric()) {
@@ -1132,17 +1370,7 @@ private void updateDisplayForPerson(CallerInfo info,
 
         // Other text fields:
         updateCallTypeLabel(call);
-        updateSocialStatus(socialStatusText, socialStatusBadge, call);  // Currently unused
-    }
-
-    private String getPresentationString(int presentation) {
-        String name = getContext().getString(R.string.unknown);
-        if (presentation == Connection.PRESENTATION_RESTRICTED) {
-            name = getContext().getString(R.string.private_num);
-        } else if (presentation == Connection.PRESENTATION_PAYPHONE) {
-            name = getContext().getString(R.string.payphone);
-        }
-        return name;
+        // updateSocialStatus(socialStatusText, socialStatusBadge, call);  // Currently unused
     }
 
     /**
@@ -1188,7 +1416,7 @@ private void updateDisplayForConference(Call call) {
 
         // Other text fields:
         updateCallTypeLabel(call);
-        updateSocialStatus(null, null, null);  // socialStatus is never visible in this state
+        // updateSocialStatus(null, null, null);  // socialStatus is never visible in this state
 
         // TODO: for a GSM conference call, since we do actually know who
         // you're talking to, consider also showing names / numbers /
@@ -1293,15 +1521,25 @@ private void updatePhotoForCallState(Call call) {
                 //   3. If the load request has not been made [DISPLAY_DEFAULT], start the
                 //      request and note that it has started by updating photo state with
                 //      [DISPLAY_IMAGE].
-                // Load requests started in (3) use a placeholder image of -1 to hide the
-                // image by default.  Please refer to CallerInfoAsyncQuery.java for cases
-                // where CallerInfo.photoResource may be set.
                 if (photoImageResource == 0) {
                     if (!PhoneUtils.isConferenceCall(call)) {
                         if (!showCachedImage(mPhoto, ci) && (mPhotoTracker.getPhotoState() ==
                                 ContactsAsyncHelper.ImageTracker.DISPLAY_DEFAULT)) {
-                            ContactsAsyncHelper.updateImageViewWithContactPhotoAsync(ci,
-                                    getContext(), mPhoto, mPhotoTracker.getPhotoUri(), -1);
+                            Uri photoUri = mPhotoTracker.getPhotoUri();
+                            if (photoUri == null) {
+                                Log.w(LOG_TAG, "photoUri became null. Show default avatar icon");
+                                showImage(mPhoto, R.drawable.picture_unknown);
+                            } else {
+                                if (DBG) {
+                                    log("start asynchronous load inside updatePhotoForCallState()");
+                                }
+                                mPhoto.setTag(null);
+                                // Make it invisible for a moment
+                                mPhoto.setVisibility(View.INVISIBLE);
+                                ContactsAsyncHelper.startObtainPhotoAsync(TOKEN_DO_NOTHING,
+                                        getContext(), photoUri, this,
+                                        new AsyncLoadCookie(mPhoto, ci, null));
+                            }
                             mPhotoTracker.setPhotoState(
                                     ContactsAsyncHelper.ImageTracker.DISPLAY_IMAGE);
                         }
@@ -1341,30 +1579,27 @@ private static final boolean showCachedImage(ImageView view, CallerInfo ci) {
 
     /** Helper function to display the resource in the imageview AND ensure its visibility.*/
     private static final void showImage(ImageView view, int resource) {
-        view.setImageResource(resource);
-        view.setVisibility(View.VISIBLE);
+        showImage(view, view.getContext().getResources().getDrawable(resource));
     }
 
-    /** Helper function to display the drawable in the imageview AND ensure its visibility.*/
-    private static final void showImage(ImageView view, Drawable drawable) {
-        view.setImageDrawable(drawable);
-        view.setVisibility(View.VISIBLE);
+    private static final void showImage(ImageView view, Bitmap bitmap) {
+        showImage(view, new BitmapDrawable(view.getContext().getResources(), bitmap));
     }
 
-    /**
-     * Sets the left and right margins of the specified ViewGroup (whose
-     * LayoutParams object which must inherit from
-     * ViewGroup.MarginLayoutParams.)
-     *
-     * TODO: Is there already a convenience method like this somewhere?
-     */
-    private void setSideMargins(ViewGroup vg, int margin) {
-        ViewGroup.MarginLayoutParams lp =
-                (ViewGroup.MarginLayoutParams) vg.getLayoutParams();
-        // Equivalent to setting android:layout_marginLeft/Right in XML
-        lp.leftMargin = margin;
-        lp.rightMargin = margin;
-        vg.setLayoutParams(lp);
+    /** Helper function to display the drawable in the imageview AND ensure its visibility.*/
+    private static final void showImage(ImageView view, Drawable drawable) {
+        Resources res = view.getContext().getResources();
+        Drawable current = (Drawable) view.getTag();
+
+        if (current == null) {
+            if (DBG) log("Start fade-in animation for " + view);
+            view.setImageDrawable(drawable);
+            AnimationUtils.Fade.show(view);
+            view.setTag(drawable);
+        } else {
+            AnimationUtils.startCrossFade(view, current, drawable);
+            view.setVisibility(View.VISIBLE);
+        }
     }
 
     /**
@@ -1412,7 +1647,7 @@ private void updateCallTypeLabel(Call call) {
      * Updates the "social status" label with the specified text and
      * (optional) badge.
      */
-    private void updateSocialStatus(String socialStatusText,
+    /*private void updateSocialStatus(String socialStatusText,
                                     Drawable socialStatusBadge,
                                     Call call) {
         // The socialStatus field is *only* visible while an incoming call
@@ -1429,7 +1664,7 @@ private void updateSocialStatus(String socialStatusText,
         } else {
             mSocialStatus.setVisibility(View.GONE);
         }
-    }
+    }*/
 
     /**
      * Hides the top-level UI elements of the call card:  The "main
@@ -1464,15 +1699,24 @@ public void hideCallCardElements() {
     // get pronounced by a screen reader, for example.)
     @Override
     public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
+        if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
+            dispatchPopulateAccessibilityEvent(event, mName);
+            dispatchPopulateAccessibilityEvent(event, mPhoneNumber);
+            return true;
+        }
+
         dispatchPopulateAccessibilityEvent(event, mCallStateLabel);
         dispatchPopulateAccessibilityEvent(event, mPhoto);
         dispatchPopulateAccessibilityEvent(event, mName);
         dispatchPopulateAccessibilityEvent(event, mPhoneNumber);
         dispatchPopulateAccessibilityEvent(event, mLabel);
-        dispatchPopulateAccessibilityEvent(event, mSocialStatus);
-        dispatchPopulateAccessibilityEvent(event, mSecondaryCallName);
-        dispatchPopulateAccessibilityEvent(event, mSecondaryCallStatus);
-        dispatchPopulateAccessibilityEvent(event, mSecondaryCallPhoto);
+        // dispatchPopulateAccessibilityEvent(event, mSocialStatus);
+        if (mSecondaryCallName != null) {
+            dispatchPopulateAccessibilityEvent(event, mSecondaryCallName);
+        }
+        if (mSecondaryCallPhoto != null) {
+            dispatchPopulateAccessibilityEvent(event, mSecondaryCallPhoto);
+        }
         return true;
     }
 
@@ -1486,105 +1730,7 @@ private void dispatchPopulateAccessibilityEvent(AccessibilityEvent event, View v
         }
     }
 
-    /**
-     * Simple Utility class that runs fading animations on specified views.
-     */
-    public static class Fade {
-        private static final boolean FADE_DBG = false;
-        private static final long DURATION = 250;  // msec
-
-        // View tag that's set during the fade-out animation; see hide() and
-        // isFadingOut().
-        private static final int FADE_STATE_KEY = R.id.fadeState;
-        private static final String FADING_OUT = "fading_out";
-
-        /**
-         * Sets the visibility of the specified view to View.VISIBLE and then
-         * fades it in. If the view is already visible (and not in the middle
-         * of a fade-out animation), this method will return without doing
-         * anything.
-         *
-         * @param view The view to be faded in
-         */
-        public static void show(final View view) {
-            if (FADE_DBG) log("Fade: SHOW view " + view + "...");
-            if (FADE_DBG) log("Fade: - visibility = " + view.getVisibility());
-            if ((view.getVisibility() != View.VISIBLE) || isFadingOut(view)) {
-                view.animate().cancel();
-                // ...and clear the FADE_STATE_KEY tag in case we just
-                // canceled an in-progress fade-out animation.
-                view.setTag(FADE_STATE_KEY, null);
-
-                view.setAlpha(0);
-                view.setVisibility(View.VISIBLE);
-                view.animate().setDuration(DURATION);
-                view.animate().alpha(1);
-                if (FADE_DBG) log("Fade: ==> SHOW " + view
-                                  + " DONE.  Set visibility = " + View.VISIBLE);
-            } else {
-                if (FADE_DBG) log("Fade: ==> Ignoring, already visible AND not fading out.");
-            }
-        }
-
-        /**
-         * Fades out the specified view and then sets its visibility to the
-         * specified value (either View.INVISIBLE or View.GONE). If the view
-         * is not currently visibile, the method will return without doing
-         * anything.
-         *
-         * Note that *during* the fade-out the view itself will still have
-         * visibility View.VISIBLE, although the isFadingOut() method will
-         * return true (in case the UI code needs to detect this state.)
-         *
-         * @param view The view to be hidden
-         * @param visibility The value to which the view's visibility will be
-         *                   set after it fades out.
-         * Must be either View.VISIBLE or View.INVISIBLE.
-         */
-        public static void hide(final View view, final int visibility) {
-            if (FADE_DBG) log("Fade: HIDE view " + view + "...");
-            if (view.getVisibility() == View.VISIBLE &&
-                (visibility == View.INVISIBLE || visibility == View.GONE)) {
-
-                // Use a view tag to mark this view as being in the middle
-                // of a fade-out animation.
-                view.setTag(FADE_STATE_KEY, FADING_OUT);
-
-                view.animate().cancel();
-                view.animate().setDuration(DURATION);
-                view.animate().alpha(0f).setListener(new AnimatorListenerAdapter() {
-                        public void onAnimationEnd(Animator animation) {
-                            view.setAlpha(1);
-                            view.setVisibility(visibility);
-                            view.animate().setListener(null);
-                            // ...and we're done with the fade-out, so clear the view tag.
-                            view.setTag(FADE_STATE_KEY, null);
-                            if (FADE_DBG) log("Fade: HIDE " + view
-                                              + " DONE.  Set visibility = " + visibility);
-                        }
-                    });
-            }
-        }
 
-        /**
-         * @return true if the specified view is currently in the middle
-         * of a fade-out animation.  (During the fade-out, the view's
-         * visibility is still VISIBLE, although in many cases the UI
-         * should behave as if it's already invisible or gone.  This
-         * method allows the UI code to detect that state.)
-         *
-         * @see hide()
-         */
-        public static boolean isFadingOut(final View view) {
-            if (FADE_DBG) {
-                log("Fade: isFadingOut view " + view + "...");
-                log("Fade:   - getTag() returns: " + view.getTag(FADE_STATE_KEY));
-                log("Fade:   - returning: " + (view.getTag(FADE_STATE_KEY) == FADING_OUT));
-            }
-            return (view.getTag(FADE_STATE_KEY) == FADING_OUT);
-        }
-
-    }
 
 
     // Debugging / testing code
diff --git a/src/com/android/phone/CallController.java b/src/com/android/phone/CallController.java
index 4a9cbad84..f27296321 100644
--- a/src/com/android/phone/CallController.java
+++ b/src/com/android/phone/CallController.java
@@ -18,6 +18,7 @@
 
 import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.TelephonyCapabilities;
 import com.android.phone.Constants.CallStatusCode;
 import com.android.phone.InCallUiState.InCallScreenMode;
 import com.android.phone.OtaUtils.CdmaOtaScreenState;
@@ -33,7 +34,6 @@
 import android.util.Log;
 import android.widget.Toast;
 
-
 /**
  * Phone app module in charge of "call control".
  *
@@ -167,7 +167,7 @@ public void handleMessage(Message msg) {
      *      (2) as the "intent" parameter.
      *
      *  (4) Here in CallController.placeCall() we read the phone number or SIP
-     *      address out of the intent and actually initate the call, and
+     *      address out of the intent and actually initiate the call, and
      *      simultaneously launch the InCallScreen to display the in-call UI.
      *
      *  (5) We handle various errors by directing the InCallScreen to
@@ -243,9 +243,9 @@ public void placeCall(Intent intent) {
         // overlay and route the call.  The overlay will be
         // displayed when the InCallScreen becomes visible.
         if (PhoneUtils.hasPhoneProviderExtras(intent)) {
-            inCallUiState.setProviderOverlayInfo(intent);
+            inCallUiState.setProviderInfo(intent);
         } else {
-            inCallUiState.clearProviderOverlayInfo();
+            inCallUiState.clearProviderInfo();
         }
 
         CallStatusCode status = placeCallInternal(intent);
@@ -305,6 +305,9 @@ public void placeCall(Intent intent) {
         //   and if so simply call updateInCallScreen() instead.
 
         mApp.displayCallScreen();
+
+        // enable noise suppression
+        PhoneUtils.turnOnNoiseSuppression(mApp.getApplicationContext(), true);
     }
 
     /**
@@ -327,6 +330,8 @@ private CallStatusCode placeCallInternal(Intent intent) {
         // manageable chunks.
 
         final InCallUiState inCallUiState = mApp.inCallUiState;
+        final Uri uri = intent.getData();
+        final String scheme = (uri != null) ? uri.getScheme() : null;
         String number;
         Phone phone = null;
 
@@ -343,7 +348,7 @@ private CallStatusCode placeCallInternal(Intent intent) {
         //   around *only* the call that can throw that exception.
 
         try {
-            number = getInitialNumber(intent);
+            number = PhoneUtils.getInitialNumber(intent);
             if (VDBG) log("- actual number to dial: '" + number + "'");
 
             // find the phone first
@@ -352,16 +357,20 @@ private CallStatusCode placeCallInternal(Intent intent) {
             // or by number, i.e. for international,
             // or by user selection, i.e., dialog query,
             // or any of combinations
-            Uri uri = intent.getData();
-            String scheme = (uri != null) ? uri.getScheme() : null;
             String sipPhoneUri = intent.getStringExtra(
                     OutgoingCallBroadcaster.EXTRA_SIP_PHONE_URI);
             phone = PhoneUtils.pickPhoneBasedOnNumber(mCM, scheme, number, sipPhoneUri);
             if (VDBG) log("- got Phone instance: " + phone + ", class = " + phone.getClass());
 
             // update okToCallStatus based on new phone
-            okToCallStatus = checkIfOkToInitiateOutgoingCall(
-                    phone.getServiceState().getState());
+            if (phone.getServiceState() != null) {
+                okToCallStatus = checkIfOkToInitiateOutgoingCall(
+                        phone.getServiceState().getState());
+            }
+            else {
+                log(">>>> phone.getServiceState == NULL, setting CallStatusCode.OUT_OF_SERVICE");
+                return CallStatusCode.OUT_OF_SERVICE;
+            }
 
         } catch (PhoneUtils.VoiceMailNumberMissingException ex) {
             // If the call status is NOT in an acceptable state, it
@@ -496,11 +505,19 @@ private CallStatusCode placeCallInternal(Intent intent) {
                             CdmaOtaScreenState.OtaScreenState.OTA_STATUS_LISTENING;
                 }
 
-                // Any time we initiate a call, force the DTMF dialpad to
-                // close.  (We want to make sure the user can see the regular
+                boolean voicemailUriSpecified = scheme != null && scheme.equals("voicemail");
+                // When voicemail is requested most likely the user wants to open
+                // dialpad immediately, so we show it in the first place.
+                // Otherwise we want to make sure the user can see the regular
                 // in-call UI while the new call is dialing, and when it
                 // first gets connected.)
-                inCallUiState.showDialpad = false;
+                inCallUiState.showDialpad = voicemailUriSpecified;
+
+                // For voicemails, we add context text to let the user know they
+                // are dialing their voicemail.
+                // TODO: This is only set here and becomes problematic when swapping calls
+                inCallUiState.dialpadContextText = voicemailUriSpecified ?
+                    phone.getVoiceMailAlphaTag() : "";
 
                 // Also, in case a previous call was already active (i.e. if
                 // we just did "Add call"), clear out the "history" of DTMF
@@ -625,53 +642,7 @@ private CallStatusCode checkIfOkToInitiateOutgoingCall(int state) {
         }
     }
 
-    /**
-     * Given an Intent (which is presumably the ACTION_CALL intent that
-     * initiated this outgoing call), figure out the actual phone number we
-     * should dial.
-     *
-     * Note that the returned "number" may actually be a SIP address,
-     * if the specified intent contains a sip: URI.
-     *
-     * This method is basically a wrapper around PhoneUtils.getNumberFromIntent(),
-     * except it's also aware of the EXTRA_ACTUAL_NUMBER_TO_DIAL extra.
-     * (That extra, if present, tells us the exact string to pass down to the
-     * telephony layer.  It's guaranteed to be safe to dial: it's either a PSTN
-     * phone number with separators and keypad letters stripped out, or a raw
-     * unencoded SIP address.)
-     *
-     * @return the phone number corresponding to the specified Intent, or null
-     *   if the Intent has no action or if the intent's data is malformed or
-     *   missing.
-     *
-     * @throws VoiceMailNumberMissingException if the intent
-     *   contains a "voicemail" URI, but there's no voicemail
-     *   number configured on the device.
-     */
-    // TODO: Consider moving this out to PhoneUtils and/or combining it
-    // with PhoneUtils.getNumberFromIntent().
-    public static String getInitialNumber(Intent intent)
-            throws PhoneUtils.VoiceMailNumberMissingException {
-        if (VDBG) log("getInitialNumber(): " + intent);
-
-        String action = intent.getAction();
-        if (TextUtils.isEmpty(action)) {
-            return null;
-        }
-
-        // If the EXTRA_ACTUAL_NUMBER_TO_DIAL extra is present, get the phone
-        // number from there.  (That extra takes precedence over the actual data
-        // included in the intent.)
-        if (intent.hasExtra(OutgoingCallBroadcaster.EXTRA_ACTUAL_NUMBER_TO_DIAL)) {
-            String actualNumberToDial =
-                    intent.getStringExtra(OutgoingCallBroadcaster.EXTRA_ACTUAL_NUMBER_TO_DIAL);
-            if (VDBG) log("==> got EXTRA_ACTUAL_NUMBER_TO_DIAL; returning '"
-                          + actualNumberToDial + "'");
-            return actualNumberToDial;
-        }
 
-        return PhoneUtils.getNumberFromIntent(PhoneApp.getInstance(), intent);
-    }
 
     /**
      * Handles the various error conditions that can occur when initiating
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index cb19557d7..42eb14b9f 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -16,12 +16,6 @@
 
 package com.android.phone;
 
-import com.android.internal.telephony.CallForwardInfo;
-import com.android.internal.telephony.CommandsInterface;
-import com.android.internal.telephony.Phone;
-import com.android.internal.telephony.cdma.TtyIntent;
-import com.android.phone.sip.SipSharedPreferences;
-
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -36,20 +30,27 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.database.Cursor;
+import android.database.sqlite.SQLiteException;
 import android.media.AudioManager;
+import android.media.RingtoneManager;
+import android.net.Uri;
 import android.net.sip.SipManager;
 import android.os.AsyncResult;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.os.Vibrator;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
+import android.preference.PreferenceCategory;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.ContactsContract.CommonDataKinds;
+import android.provider.MediaStore;
 import android.provider.Settings;
+import android.provider.Settings.SettingNotFoundException;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.util.Log;
@@ -57,6 +58,12 @@
 import android.view.WindowManager;
 import android.widget.ListAdapter;
 
+import com.android.internal.telephony.CallForwardInfo;
+import com.android.internal.telephony.CommandsInterface;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.cdma.TtyIntent;
+import com.android.phone.sip.SipSharedPreferences;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -78,21 +85,29 @@
  * is from the package com.android.contacts.
  *
  * For the "Mobile network settings" screen under the main Settings app,
- * see apps/Phone/src/com/android/phone/Settings.java.
+ * See {@link MobileNetworkSettings}.
+ *
+ * @see com.android.phone.MobileNetworkSettings
  */
 public class CallFeaturesSetting extends PreferenceActivity
         implements DialogInterface.OnClickListener,
         Preference.OnPreferenceChangeListener,
         EditPhoneNumberPreference.OnDialogClosedListener,
         EditPhoneNumberPreference.GetDefaultNumberListener{
+    private static final String LOG_TAG = "CallFeaturesSetting";
+    private static final boolean DBG = (PhoneApp.DBG_LEVEL >= 2);
 
-    // intent action to bring up voice mail settings
+    /**
+     * Intent action to bring up Voicemail Provider settings.
+     *
+     * @see #IGNORE_PROVIDER_EXTRA
+     */
     public static final String ACTION_ADD_VOICEMAIL =
-        "com.android.phone.CallFeaturesSetting.ADD_VOICEMAIL";
+            "com.android.phone.CallFeaturesSetting.ADD_VOICEMAIL";
     // intent action sent by this activity to a voice mail provider
     // to trigger its configuration UI
     public static final String ACTION_CONFIGURE_VOICEMAIL =
-        "com.android.phone.CallFeaturesSetting.CONFIGURE_VOICEMAIL";
+            "com.android.phone.CallFeaturesSetting.CONFIGURE_VOICEMAIL";
     // Extra put in the return from VM provider config containing voicemail number to set
     public static final String VM_NUMBER_EXTRA = "com.android.phone.VoicemailNumber";
     // Extra put in the return from VM provider config containing call forwarding number to set
@@ -126,35 +141,46 @@ public class CallFeaturesSetting extends PreferenceActivity
     // Key identifying the default vocie mail provider
     public static final String DEFAULT_VM_PROVIDER_KEY = "";
 
-    // Extra put into ACTION_ADD_VOICEMAIL call to indicate which provider
-    // to remove from the list of providers presented to the user
+    /**
+     * String Extra put into ACTION_ADD_VOICEMAIL call to indicate which provider should be hidden
+     * in the list of providers presented to the user. This allows a provider which is being
+     * disabled (e.g. GV user logging out) to force the user to pick some other provider.
+     */
     public static final String IGNORE_PROVIDER_EXTRA = "com.android.phone.ProviderToIgnore";
 
-    // debug data
-    private static final String LOG_TAG = "CallFeaturesSetting";
-    private static final boolean DBG = (PhoneApp.DBG_LEVEL >= 2);
-
     // string constants
     private static final String NUM_PROJECTION[] = {CommonDataKinds.Phone.NUMBER};
 
     // String keys for preference lookup
     // TODO: Naming these "BUTTON_*" is confusing since they're not actually buttons(!)
     private static final String BUTTON_VOICEMAIL_KEY = "button_voicemail_key";
+    private static final String BUTTON_VOICEMAIL_CATEGORY_KEY = "button_voicemail_category_key";
+    private static final String BUTTON_MWI_NOTIFICATION_KEY = "button_mwi_notification_key";
     private static final String BUTTON_VOICEMAIL_PROVIDER_KEY = "button_voicemail_provider_key";
     private static final String BUTTON_VOICEMAIL_SETTING_KEY = "button_voicemail_setting_key";
     /* package */ static final String BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_WHEN_KEY =
             "button_voicemail_notification_vibrate_when_key";
+    /* package */ static final String BUTTON_VOICEMAIL_NOTIFICATION_RINGTONE_KEY =
+            "button_voicemail_notification_ringtone_key";
     private static final String BUTTON_FDN_KEY   = "button_fdn_key";
     private static final String BUTTON_RESPOND_VIA_SMS_KEY   = "button_respond_via_sms_key";
 
-    private static final String BUTTON_DTMF_KEY   = "button_dtmf_settings";
-    private static final String BUTTON_RETRY_KEY  = "button_auto_retry_key";
-    private static final String BUTTON_TTY_KEY    = "button_tty_mode_key";
-    private static final String BUTTON_HAC_KEY    = "button_hac_key";
+    private static final String BUTTON_RINGTONE_KEY    = "button_ringtone_key";
+    private static final String BUTTON_VIBRATE_ON_RING = "button_vibrate_on_ring";
+    private static final String BUTTON_PLAY_DTMF_TONE  = "button_play_dtmf_tone";
+    private static final String BUTTON_DTMF_KEY        = "button_dtmf_settings";
+    private static final String BUTTON_RETRY_KEY       = "button_auto_retry_key";
+    private static final String BUTTON_TTY_KEY         = "button_tty_mode_key";
+    private static final String BUTTON_HAC_KEY         = "button_hac_key";
+    private static final String BUTTON_NOISE_SUPPRESSION_KEY = "button_noise_suppression_key";
 
     private static final String BUTTON_GSM_UMTS_OPTIONS = "button_gsm_more_expand_key";
     private static final String BUTTON_CDMA_OPTIONS = "button_cdma_more_expand_key";
 
+    private static final String BUTTON_VOICE_QUALITY_KEY = "button_voice_quality_key";
+    private static String mVoiceQuality;
+    private static String mButtonVoiceQualitySum;
+
     private static final String VM_NUMBERS_SHARED_PREFERENCES_NAME = "vm_numbers";
 
     private static final String BUTTON_SIP_CALL_OPTIONS =
@@ -163,6 +189,8 @@ public class CallFeaturesSetting extends PreferenceActivity
             "sip_call_options_wifi_only_key";
     private static final String SIP_SETTINGS_CATEGORY_KEY =
             "sip_settings_category_key";
+    private static final String LOCKSCREEN_IF_CALL_ENDS_WITH_SCREENOFF =
+            "lockscreen_if_call_ends_with_screenoff";
 
     private Intent mContactListIntent;
 
@@ -171,6 +199,8 @@ public class CallFeaturesSetting extends PreferenceActivity
     private static final int EVENT_FORWARDING_CHANGED       = 501;
     private static final int EVENT_FORWARDING_GET_COMPLETED = 502;
 
+    private static final int MSG_UPDATE_RINGTONE_SUMMARY = 1;
+
     // preferred TTY mode
     // Phone.TTY_MODE_xxx
     static final int preferredTtyMode = Phone.TTY_MODE_OFF;
@@ -216,15 +246,35 @@ public class CallFeaturesSetting extends PreferenceActivity
 
     private EditPhoneNumberPreference mSubMenuVoicemailSettings;
 
+    private Runnable mRingtoneLookupRunnable;
+    private final Handler mRingtoneLookupComplete = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+            case MSG_UPDATE_RINGTONE_SUMMARY:
+                mRingtonePreference.setSummary((CharSequence) msg.obj);
+                break;
+            }
+        }
+    };
+
+    private Preference mRingtonePreference;
+    private CheckBoxPreference mVibrateWhenRinging;
+    /** Whether dialpad plays DTMF tone or not. */
+    private CheckBoxPreference mPlayDtmfTone;
     private CheckBoxPreference mButtonAutoRetry;
     private CheckBoxPreference mButtonHAC;
     private ListPreference mButtonDTMF;
     private ListPreference mButtonTTY;
+    private CheckBoxPreference mButtonNoiseSuppression;
     private ListPreference mButtonSipCallOptions;
+    private CheckBoxPreference mMwiNotification;
     private ListPreference mVoicemailProviders;
+    private ListPreference mButtonVoiceQuality;
     private PreferenceScreen mVoicemailSettings;
     private ListPreference mVoicemailNotificationVibrateWhen;
     private SipSharedPreferences mSipSharedPreferences;
+    private CheckBoxPreference mCallEndedWithScreenOffLocks;
 
     private class VoiceMailProvider {
         public VoiceMailProvider(String name, Intent intent) {
@@ -238,7 +288,7 @@ public VoiceMailProvider(String name, Intent intent) {
     /**
      * Forwarding settings we are going to save.
      */
-    static final int [] FORWARDING_SETTINGS_REASONS = new int[] {
+    private static final int [] FORWARDING_SETTINGS_REASONS = new int[] {
         CommandsInterface.CF_REASON_UNCONDITIONAL,
         CommandsInterface.CF_REASON_BUSY,
         CommandsInterface.CF_REASON_NO_REPLY,
@@ -319,12 +369,12 @@ public String toString() {
         public CallForwardInfo[] forwardingSettings;
     }
 
-    SharedPreferences mPerProviderSavedVMNumbers;
+    private SharedPreferences mPerProviderSavedVMNumbers;
 
     /**
      * Results of reading forwarding settings
      */
-    CallForwardInfo[] mForwardingReadResults = null;
+    private CallForwardInfo[] mForwardingReadResults = null;
 
     /**
      * Result of forwarding number change.
@@ -342,47 +392,47 @@ public String toString() {
     /**
      * Result of vm number change
      */
-    AsyncResult mVoicemailChangeResult = null;
+    private AsyncResult mVoicemailChangeResult = null;
 
     /**
      * Previous VM provider setting so we can return to it in case of failure.
      */
-    String mPreviousVMProviderKey = null;
+    private String mPreviousVMProviderKey = null;
 
     /**
      * Id of the dialog being currently shown.
      */
-    int mCurrentDialogId = 0;
+    private int mCurrentDialogId = 0;
 
     /**
      * Flag indicating that we are invoking settings for the voicemail provider programmatically
      * due to vm provider change.
      */
-    boolean mVMProviderSettingsForced = false;
+    private boolean mVMProviderSettingsForced = false;
 
     /**
      * Flag indicating that we are making changes to vm or fwd numbers
      * due to vm provider change.
      */
-    boolean mChangingVMorFwdDueToProviderChange = false;
+    private boolean mChangingVMorFwdDueToProviderChange = false;
 
     /**
      * True if we are in the process of vm & fwd number change and vm has already been changed.
      * This is used to decide what to do in case of rollback.
      */
-    boolean mVMChangeCompletedSuccesfully = false;
+    private boolean mVMChangeCompletedSuccessfully = false;
 
     /**
      * True if we had full or partial failure setting forwarding numbers and so need to roll them
      * back.
      */
-    boolean mFwdChangesRequireRollback = false;
+    private boolean mFwdChangesRequireRollback = false;
 
     /**
      * Id of error msg to display to user once we are done reverting the VM provider to the previous
      * one.
      */
-    int mVMOrFwdSetError = 0;
+    private int mVMOrFwdSetError = 0;
 
     /**
      * Data about discovered voice mail settings providers.
@@ -390,10 +440,10 @@ public String toString() {
      * They key in this map is package name + activity name.
      * We always add an entry for the default provider with a key of empty
      * string and intent value of null.
-     * @see #initVoiceMailProviders.
+     * @see #initVoiceMailProviders()
      */
     private final Map<String, VoiceMailProvider> mVMProvidersData =
-        new HashMap<String, VoiceMailProvider>();
+            new HashMap<String, VoiceMailProvider>();
 
     /** string to hold old voicemail number as it is being updated. */
     private String mOldVmNumber;
@@ -402,7 +452,7 @@ public String toString() {
     // Need to save these since before we get to saving we need to asynchronously
     // query the existing forwarding settings.
     private CallForwardInfo[] mNewFwdSettings;
-    String mNewVMNumber;
+    private String mNewVMNumber;
 
     private boolean mForeground;
 
@@ -429,10 +479,26 @@ public void onPause() {
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         if (preference == mSubMenuVoicemailSettings) {
             return true;
+        } else if (preference == mPlayDtmfTone) {
+            Settings.System.putInt(getContentResolver(), Settings.System.DTMF_TONE_WHEN_DIALING,
+                    mPlayDtmfTone.isChecked() ? 1 : 0);
+        } else if (preference == mMwiNotification) {
+            int mwi_notification = mMwiNotification.isChecked() ? 1 : 0;
+            Settings.System.putInt(mPhone.getContext().getContentResolver(),
+                    Settings.System.ENABLE_MWI_NOTIFICATION, mwi_notification);
+            return true;
         } else if (preference == mButtonDTMF) {
             return true;
         } else if (preference == mButtonTTY) {
             return true;
+        } else if (preference == mButtonVoiceQuality) {
+            return true;
+        } else if (preference == mButtonNoiseSuppression) {
+            int nsp = mButtonNoiseSuppression.isChecked() ? 1 : 0;
+            // Update Noise suppression value in Settings database
+            Settings.System.putInt(mPhone.getContext().getContentResolver(),
+                    Settings.System.NOISE_SUPPRESSION, nsp);
+            return true;
         } else if (preference == mButtonAutoRetry) {
             android.provider.Settings.System.putInt(mPhone.getContext().getContentResolver(),
                     android.provider.Settings.System.CALL_AUTO_RETRY,
@@ -447,10 +513,31 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen
             // Update HAC Value in AudioManager
             mAudioManager.setParameter(HAC_KEY, hac != 0 ? HAC_VAL_ON : HAC_VAL_OFF);
             return true;
-        } else if (preference == mVoicemailSettings && preference.getIntent() != null) {
-            if (DBG) log("Invoking cfg intent " + preference.getIntent().getPackage());
-            this.startActivityForResult(preference.getIntent(), VOICEMAIL_PROVIDER_CFG_ID);
-            return true;
+        } else if (preference == mVoicemailSettings) {
+            if (DBG) log("onPreferenceTreeClick: Voicemail Settings Preference is clicked.");
+            if (preference.getIntent() != null) {
+                if (DBG) {
+                    log("onPreferenceTreeClick: Invoking cfg intent "
+                            + preference.getIntent().getPackage());
+                }
+
+                // onActivityResult() will be responsible for resetting some of variables.
+                this.startActivityForResult(preference.getIntent(), VOICEMAIL_PROVIDER_CFG_ID);
+                return true;
+            } else {
+                if (DBG) {
+                    log("onPreferenceTreeClick:"
+                            + " No Intent is available. Use default behavior defined in xml.");
+                }
+
+                // There's no onActivityResult(), so we need to take care of some of variables
+                // which should be reset here.
+                mPreviousVMProviderKey = DEFAULT_VM_PROVIDER_KEY;
+                mVMProviderSettingsForced = false;
+
+                // This should let the preference use default behavior in the xml.
+                return false;
+            }
         }
         return false;
     }
@@ -463,26 +550,47 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen
      * @param objValue should be the value of the selection, NOT its localized
      * display value.
      */
+    @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
-        if (preference == mButtonDTMF) {
+        if (DBG) {
+            log("onPreferenceChange(). preferenece: \"" + preference + "\""
+                    + ", value: \"" + objValue + "\"");
+        }
+        if (preference == mVibrateWhenRinging) {
+            boolean doVibrate = (Boolean) objValue;
+            Settings.System.putInt(mPhone.getContext().getContentResolver(),
+                    Settings.System.VIBRATE_WHEN_RINGING, doVibrate ? 1 : 0);
+        } else if (preference == mCallEndedWithScreenOffLocks) {
+            boolean doLock = (Boolean) objValue;
+            Settings.System.putInt(mPhone.getContext().getContentResolver(),
+                    Settings.System.LOCKSCREEN_IF_CALL_ENDS_WITH_SCREENOFF, doLock ? 1 : 0);
+        } else if (preference == mButtonDTMF) {
             int index = mButtonDTMF.findIndexOfValue((String) objValue);
             Settings.System.putInt(mPhone.getContext().getContentResolver(),
                     Settings.System.DTMF_TONE_TYPE_WHEN_DIALING, index);
         } else if (preference == mButtonTTY) {
             handleTTYChange(preference, objValue);
+        } else if (preference == mButtonVoiceQuality) {
+            mVoiceQuality = (String) objValue;
+            mButtonVoiceQuality.setValue(mVoiceQuality);
+            mButtonVoiceQuality.setSummary(String.format(mButtonVoiceQualitySum, mButtonVoiceQuality.getEntry()));
+        } else if (preference == mMwiNotification) {
+            int mwi_notification = mMwiNotification.isChecked() ? 1 : 0;
+            Settings.System.putInt(mPhone.getContext().getContentResolver(),
+                    Settings.System.ENABLE_MWI_NOTIFICATION, mwi_notification);
         } else if (preference == mVoicemailProviders) {
-            final String currentProviderKey = getCurrentVoicemailProviderKey();
-            final String newProviderKey = (String)objValue;
-            if (DBG) log("VM provider changes to " + newProviderKey + " from " +
-                    mPreviousVMProviderKey);
+            final String newProviderKey = (String) objValue;
+            if (DBG) {
+                log("Voicemail Provider changes from \"" + mPreviousVMProviderKey
+                    + "\" to \"" + newProviderKey + "\".");
+            }
+            // If previous provider key and the new one is same, we don't need to handle it.
             if (mPreviousVMProviderKey.equals(newProviderKey)) {
-                if (DBG) log("No change ");
+                if (DBG) log("No change is made toward VM provider setting.");
                 return true;
             }
             updateVMPreferenceWidgets(newProviderKey);
 
-            mPreviousVMProviderKey = currentProviderKey;
-
             final VoiceMailProviderSettings newProviderSettings =
                     loadSettingsForVoiceMailProvider(newProviderKey);
 
@@ -494,7 +602,7 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
 
             if (newProviderSettings == null) {
                 // Force the user into a configuration of the chosen provider
-                if (DBG) log("Saved preferences not found - invoking config");
+                Log.w(LOG_TAG, "Saved preferences not found - invoking config");
                 mVMProviderSettingsForced = true;
                 simulatePreferenceClick(mVoicemailSettings);
             } else {
@@ -514,19 +622,20 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
         return true;
     }
 
-    // Preference click listener invoked on OnDialogClosed for EditPhoneNumberPreference.
+    public static String getVoiceQuality() {
+        return mVoiceQuality;
+    }
+
+    @Override
     public void onDialogClosed(EditPhoneNumberPreference preference, int buttonClicked) {
         if (DBG) log("onPreferenceClick: request preference click on dialog close: " +
                 buttonClicked);
         if (buttonClicked == DialogInterface.BUTTON_NEGATIVE) {
             return;
         }
-        if (preference instanceof EditPhoneNumberPreference) {
-            EditPhoneNumberPreference epn = preference;
 
-            if (epn == mSubMenuVoicemailSettings) {
-                handleVMBtnClickRequest();
-            }
+        if (preference == mSubMenuVoicemailSettings) {
+            handleVMBtnClickRequest();
         }
     }
 
@@ -535,6 +644,7 @@ public void onDialogClosed(EditPhoneNumberPreference preference, int buttonClick
      * This method set the default values for the various
      * EditPhoneNumberPreference dialogs.
      */
+    @Override
     public String onGetDefaultNumber(EditPhoneNumberPreference preference) {
         if (preference == mSubMenuVoicemailSettings) {
             // update the voicemail number field, which takes care of the
@@ -573,21 +683,38 @@ public void startActivityForResult(Intent intent, int requestCode) {
     private void switchToPreviousVoicemailProvider() {
         if (DBG) log("switchToPreviousVoicemailProvider " + mPreviousVMProviderKey);
         if (mPreviousVMProviderKey != null) {
-            if (mVMChangeCompletedSuccesfully || mFwdChangesRequireRollback) {
+            if (mVMChangeCompletedSuccessfully || mFwdChangesRequireRollback) {
                 // we have to revert with carrier
+                if (DBG) {
+                    log("Needs to rollback."
+                            + " mVMChangeCompletedSuccessfully=" + mVMChangeCompletedSuccessfully
+                            + ", mFwdChangesRequireRollback=" + mFwdChangesRequireRollback);
+                }
+
                 showDialogIfForeground(VOICEMAIL_REVERTING_DIALOG);
-                VoiceMailProviderSettings prevSettings =
-                    loadSettingsForVoiceMailProvider(mPreviousVMProviderKey);
-                if (mVMChangeCompletedSuccesfully) {
+                final VoiceMailProviderSettings prevSettings =
+                        loadSettingsForVoiceMailProvider(mPreviousVMProviderKey);
+                if (prevSettings == null) {
+                    // prevSettings never becomes null since it should be already loaded!
+                    Log.e(LOG_TAG, "VoiceMailProviderSettings for the key \""
+                            + mPreviousVMProviderKey + "\" becomes null, which is unexpected.");
+                    if (DBG) {
+                        Log.e(LOG_TAG,
+                                "mVMChangeCompletedSuccessfully: " + mVMChangeCompletedSuccessfully
+                                + ", mFwdChangesRequireRollback: " + mFwdChangesRequireRollback);
+                    }
+                }
+                if (mVMChangeCompletedSuccessfully) {
                     mNewVMNumber = prevSettings.voicemailNumber;
-                    if (DBG) log("have to revert VM to " + mNewVMNumber);
+                    Log.i(LOG_TAG, "VM change is already completed successfully."
+                            + "Have to revert VM back to " + mNewVMNumber + " again.");
                     mPhone.setVoiceMailNumber(
                             mPhone.getVoiceMailAlphaTag().toString(),
                             mNewVMNumber,
                             Message.obtain(mRevertOptionComplete, EVENT_VOICEMAIL_CHANGED));
                 }
                 if (mFwdChangesRequireRollback) {
-                    if (DBG) log("have to revert fwd");
+                    Log.i(LOG_TAG, "Requested to rollback Fwd changes.");
                     final CallForwardInfo[] prevFwdSettings =
                         prevSettings.forwardingSettings;
                     if (prevFwdSettings != null) {
@@ -622,7 +749,7 @@ private void switchToPreviousVoicemailProvider() {
         }
     }
 
-    void onRevertDone() {
+    private void onRevertDone() {
         if (DBG) log("Flipping provider key back to " + mPreviousVMProviderKey);
         mVoicemailProviders.setValue(mPreviousVMProviderKey);
         updateVMPreferenceWidgets(mPreviousVMProviderKey);
@@ -633,13 +760,16 @@ void onRevertDone() {
         }
     }
 
-    // asynchronous result call after contacts are selected or after we return from
-    // a call to the VM settings provider.
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (DBG) {
+            log("onActivityResult: requestCode: " + requestCode
+                    + ", resultCode: " + resultCode
+                    + ", data: " + data);
+        }
         // there are cases where the contact picker may end up sending us more than one
         // request.  We want to ignore the request if we're not in the correct state.
-        if (requestCode ==  VOICEMAIL_PROVIDER_CFG_ID) {
+        if (requestCode == VOICEMAIL_PROVIDER_CFG_ID) {
             boolean failure = false;
 
             // No matter how the processing of result goes lets clear the flag
@@ -701,25 +831,23 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             return;
         }
 
-        if (resultCode != RESULT_OK) {
-            if (DBG) log("onActivityResult: contact picker result not OK.");
-            return;
-        }
+        if (requestCode == VOICEMAIL_PREF_ID) {
+            if (resultCode != RESULT_OK) {
+                if (DBG) log("onActivityResult: contact picker result not OK.");
+                return;
+            }
 
-        Cursor cursor = getContentResolver().query(data.getData(),
-                NUM_PROJECTION, null, null, null);
-        if ((cursor == null) || (!cursor.moveToFirst())) {
-            if (DBG) log("onActivityResult: bad contact data, no results found.");
+            Cursor cursor = getContentResolver().query(data.getData(),
+                    NUM_PROJECTION, null, null, null);
+            if ((cursor == null) || (!cursor.moveToFirst())) {
+                if (DBG) log("onActivityResult: bad contact data, no results found.");
+                return;
+            }
+            mSubMenuVoicemailSettings.onPickActivityResult(cursor.getString(0));
             return;
         }
 
-        switch (requestCode) {
-            case VOICEMAIL_PREF_ID:
-                mSubMenuVoicemailSettings.onPickActivityResult(cursor.getString(0));
-                break;
-            default:
-                // TODO: may need exception here.
-        }
+        super.onActivityResult(requestCode, resultCode, data);
     }
 
     // Voicemail button logic
@@ -803,12 +931,12 @@ private void saveVoiceMailAndForwardingNumber(String key,
         }
 
         maybeSaveSettingsForVoicemailProvider(key, newSettings);
-        mVMChangeCompletedSuccesfully = false;
+        mVMChangeCompletedSuccessfully = false;
         mFwdChangesRequireRollback = false;
         mVMOrFwdSetError = 0;
         if (!key.equals(mPreviousVMProviderKey)) {
             mReadingSettingsForDefaultProvider =
-                mPreviousVMProviderKey.equals(DEFAULT_VM_PROVIDER_KEY);
+                    mPreviousVMProviderKey.equals(DEFAULT_VM_PROVIDER_KEY);
             if (DBG) log("Reading current forwarding settings");
             mForwardingReadResults = new CallForwardInfo[FORWARDING_SETTINGS_REASONS.length];
             for (int i = 0; i < FORWARDING_SETTINGS_REASONS.length; i++) {
@@ -834,7 +962,7 @@ public void handleMessage(Message msg) {
         }
     };
 
-    void handleForwardingSettingsReadResult(AsyncResult ar, int idx) {
+    private void handleForwardingSettingsReadResult(AsyncResult ar, int idx) {
         if (DBG) Log.d(LOG_TAG, "handleForwardingSettingsReadResult: " + idx);
         Throwable error = null;
         if (ar.exception != null) {
@@ -972,15 +1100,15 @@ private void saveVoiceMailAndForwardingNumberStage2() {
                             mSetOptionComplete.obtainMessage(
                                     EVENT_FORWARDING_CHANGED, fi.reason, 0));
                 }
-             }
-             showDialogIfForeground(VOICEMAIL_FWD_SAVING_DIALOG);
+            }
+            showDialogIfForeground(VOICEMAIL_FWD_SAVING_DIALOG);
         } else {
             if (DBG) log("Not touching fwd #");
             setVMNumberWithCarrier();
         }
     }
 
-    void setVMNumberWithCarrier() {
+    private void setVMNumberWithCarrier() {
         if (DBG) log("save voicemail #: " + mNewVMNumber);
         mPhone.setVoiceMailNumber(
                 mPhone.getVoiceMailAlphaTag().toString(),
@@ -999,15 +1127,15 @@ public void handleMessage(Message msg) {
             switch (msg.what) {
                 case EVENT_VOICEMAIL_CHANGED:
                     mVoicemailChangeResult = result;
-                    mVMChangeCompletedSuccesfully = checkVMChangeSuccess() == null;
+                    mVMChangeCompletedSuccessfully = checkVMChangeSuccess() == null;
                     if (DBG) log("VM change complete msg, VM change done = " +
-                            String.valueOf(mVMChangeCompletedSuccesfully));
+                            String.valueOf(mVMChangeCompletedSuccessfully));
                     done = true;
                     break;
                 case EVENT_FORWARDING_CHANGED:
                     mForwardingChangeResults.put(msg.arg1, result);
                     if (result.exception != null) {
-                        if (DBG) log("Error in setting fwd# " + msg.arg1 + ": " +
+                        Log.w(LOG_TAG, "Error in setting fwd# " + msg.arg1 + ": " +
                                 result.exception.getMessage());
                     } else {
                         if (DBG) log("Success in setting fwd# " + msg.arg1);
@@ -1018,7 +1146,8 @@ public void handleMessage(Message msg) {
                             if (DBG) log("Overall fwd changes completed ok, starting vm change");
                             setVMNumberWithCarrier();
                         } else {
-                            if (DBG) log("Overall fwd changes completed, failure");
+                            Log.w(LOG_TAG, "Overall fwd changes completed in failure. " +
+                                    "Check if we need to try rollback for some settings.");
                             mFwdChangesRequireRollback = false;
                             Iterator<Map.Entry<Integer,AsyncResult>> it =
                                 mForwardingChangeResults.entrySet().iterator();
@@ -1026,11 +1155,14 @@ public void handleMessage(Message msg) {
                                 Map.Entry<Integer,AsyncResult> entry = it.next();
                                 if (entry.getValue().exception == null) {
                                     // If at least one succeeded we have to revert
-                                    if (DBG) log("Rollback will be required");
-                                    mFwdChangesRequireRollback =true;
+                                    Log.i(LOG_TAG, "Rollback will be required");
+                                    mFwdChangesRequireRollback = true;
                                     break;
                                 }
                             }
+                            if (!mFwdChangesRequireRollback) {
+                                Log.i(LOG_TAG, "No rollback needed.");
+                            }
                             done = true;
                         }
                     }
@@ -1074,7 +1206,7 @@ public void handleMessage(Message msg) {
                     // TODO: should never reach this, may want to throw exception
             }
             final boolean done =
-                (!mVMChangeCompletedSuccesfully || mVoicemailChangeResult != null) &&
+                (!mVMChangeCompletedSuccessfully || mVoicemailChangeResult != null) &&
                 (!mFwdChangesRequireRollback || checkForwardingCompleted());
             if (done) {
                 if (DBG) log("All VM reverts done");
@@ -1162,18 +1294,24 @@ private void handleSetVMOrFwdMessage() {
         if (success) {
             if (DBG) log("change VM success!");
             handleVMAndFwdSetSuccess(MSG_VM_OK);
-            updateVoiceNumberField();
         } else {
             if (fwdFailure) {
-                log("change FW failed: " + exceptionMessage);
+                Log.w(LOG_TAG, "Failed to change fowarding setting. Reason: " + exceptionMessage);
                 handleVMOrFwdSetError(MSG_FW_SET_EXCEPTION);
             } else {
-                log("change VM failed: " + exceptionMessage);
+                Log.w(LOG_TAG, "Failed to change voicemail. Reason: " + exceptionMessage);
                 handleVMOrFwdSetError(MSG_VM_EXCEPTION);
             }
         }
     }
 
+    /**
+     * Called when Voicemail Provider or its forwarding settings failed. Rolls back partly made
+     * changes to those settings and show "failure" dialog.
+     *
+     * @param msgId Message ID used for the specific error case. {@link #MSG_FW_SET_EXCEPTION} or
+     * {@link #MSG_VM_EXCEPTION}
+     */
     private void handleVMOrFwdSetError(int msgId) {
         if (mChangingVMorFwdDueToProviderChange) {
             mVMOrFwdSetError = msgId;
@@ -1186,16 +1324,28 @@ private void handleVMOrFwdSetError(int msgId) {
         updateVoiceNumberField();
     }
 
-    private void handleVMAndFwdSetSuccess(int msgId) {
+    /**
+     * Called when Voicemail Provider and its forwarding settings were successfully finished.
+     * This updates a bunch of variables and show "success" dialog.
+     */
+    private void handleVMAndFwdSetSuccess(int msg) {
+        if (DBG) {
+            log("handleVMAndFwdSetSuccess(). current voicemail provider key: "
+                    + getCurrentVoicemailProviderKey());
+        }
+        mPreviousVMProviderKey = getCurrentVoicemailProviderKey();
         mChangingVMorFwdDueToProviderChange = false;
-        showVMDialog(msgId);
+        showVMDialog(msg);
+        updateVoiceNumberField();
     }
 
-    /*
-     * Methods used to sync UI state with that of the network
+    /**
+     * Update the voicemail number from what we've recorded on the sim.
      */
-    // update the voicemail number from what we've recorded on the sim.
     private void updateVoiceNumberField() {
+        if (DBG) {
+            log("updateVoiceNumberField(). mSubMenuVoicemailSettings=" + mSubMenuVoicemailSettings);
+        }
         if (mSubMenuVoicemailSettings == null) {
             return;
         }
@@ -1206,7 +1356,7 @@ private void updateVoiceNumberField() {
         }
         mSubMenuVoicemailSettings.setPhoneNumber(mOldVmNumber);
         final String summary = (mOldVmNumber.length() > 0) ? mOldVmNumber :
-            getString(R.string.voicemail_number_not_set);
+                getString(R.string.voicemail_number_not_set);
         mSubMenuVoicemailSettings.setSummary(summary);
     }
 
@@ -1373,7 +1523,7 @@ private void showVMDialog(int msgStatus) {
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-        if (DBG) log("Creating activity");
+        if (DBG) log("onCreate(). Intent: " + getIntent());
         mPhone = PhoneApp.getPhone();
 
         addPreferencesFromResource(R.xml.call_feature_setting);
@@ -1389,11 +1539,40 @@ protected void onCreate(Bundle icicle) {
             mSubMenuVoicemailSettings.setDialogTitle(R.string.voicemail_settings_number_label);
         }
 
+        mRingtonePreference = findPreference(BUTTON_RINGTONE_KEY);
+        mVibrateWhenRinging = (CheckBoxPreference) findPreference(BUTTON_VIBRATE_ON_RING);
+        mCallEndedWithScreenOffLocks = (CheckBoxPreference) findPreference(LOCKSCREEN_IF_CALL_ENDS_WITH_SCREENOFF);
+        mPlayDtmfTone = (CheckBoxPreference) findPreference(BUTTON_PLAY_DTMF_TONE);
+        mMwiNotification = (CheckBoxPreference) findPreference(BUTTON_MWI_NOTIFICATION_KEY);
+        if (mMwiNotification != null) {
+            if (getResources().getBoolean(R.bool.sprint_mwi_quirk)) {
+                mMwiNotification.setOnPreferenceChangeListener(this);
+            } else {
+                PreferenceScreen voicemailCategory = (PreferenceScreen) findPreference(BUTTON_VOICEMAIL_CATEGORY_KEY);
+                voicemailCategory.removePreference(mMwiNotification);
+                mMwiNotification = null;
+            }
+        }
+
         mButtonDTMF = (ListPreference) findPreference(BUTTON_DTMF_KEY);
         mButtonAutoRetry = (CheckBoxPreference) findPreference(BUTTON_RETRY_KEY);
         mButtonHAC = (CheckBoxPreference) findPreference(BUTTON_HAC_KEY);
         mButtonTTY = (ListPreference) findPreference(BUTTON_TTY_KEY);
+        mButtonNoiseSuppression = (CheckBoxPreference) findPreference(BUTTON_NOISE_SUPPRESSION_KEY);
         mVoicemailProviders = (ListPreference) findPreference(BUTTON_VOICEMAIL_PROVIDER_KEY);
+        mButtonVoiceQuality = (ListPreference) findPreference(BUTTON_VOICE_QUALITY_KEY);
+
+        if (mButtonVoiceQuality != null) {
+            if (TextUtils.isEmpty(getResources().getString(R.string.voice_quality_param))) {
+                prefSet.removePreference(mButtonVoiceQuality);
+                mButtonVoiceQuality = null;
+            } else {
+                mButtonVoiceQuality.setOnPreferenceChangeListener(this);
+                mButtonVoiceQualitySum = getResources().getString(R.string.voice_quality_summary);
+                mVoiceQuality = mButtonVoiceQuality.getValue();
+            }
+        }
+
         if (mVoicemailProviders != null) {
             mVoicemailProviders.setOnPreferenceChangeListener(this);
             mVoicemailSettings = (PreferenceScreen)findPreference(BUTTON_VOICEMAIL_SETTING_KEY);
@@ -1404,6 +1583,27 @@ protected void onCreate(Bundle icicle) {
             initVoiceMailProviders();
         }
 
+        if (mVibrateWhenRinging != null) {
+            Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+            if (vibrator != null && vibrator.hasVibrator()) {
+                mVibrateWhenRinging.setOnPreferenceChangeListener(this);
+            } else {
+                prefSet.removePreference(mVibrateWhenRinging);
+                mVibrateWhenRinging = null;
+            }
+        }
+
+        if (mCallEndedWithScreenOffLocks != null) {
+            mCallEndedWithScreenOffLocks.setChecked(Settings.System.getInt(getContentResolver(),
+                    Settings.System.LOCKSCREEN_IF_CALL_ENDS_WITH_SCREENOFF, 1) == 1);
+            mCallEndedWithScreenOffLocks.setOnPreferenceChangeListener(this);
+        }
+
+        if (mPlayDtmfTone != null) {
+            mPlayDtmfTone.setChecked(Settings.System.getInt(getContentResolver(),
+                    Settings.System.DTMF_TONE_WHEN_DIALING, 1) != 0);
+        }
+
         if (mButtonDTMF != null) {
             if (getResources().getBoolean(R.bool.dtmf_type_enabled)) {
                 mButtonDTMF.setOnPreferenceChangeListener(this);
@@ -1441,6 +1641,15 @@ protected void onCreate(Bundle icicle) {
             }
         }
 
+        if (mButtonNoiseSuppression != null) {
+            if (getResources().getBoolean(R.bool.has_in_call_noise_suppression)) {
+                mButtonNoiseSuppression.setOnPreferenceChangeListener(this);
+            } else {
+                prefSet.removePreference(mButtonNoiseSuppression);
+                mButtonNoiseSuppression = null;
+            }
+        }
+
         if (!getResources().getBoolean(R.bool.world_phone)) {
             Preference options = prefSet.findPreference(BUTTON_CDMA_OPTIONS);
             if (options != null)
@@ -1476,6 +1685,10 @@ protected void onCreate(Bundle icicle) {
         if (icicle == null) {
             if (getIntent().getAction().equals(ACTION_ADD_VOICEMAIL) &&
                     mVoicemailProviders != null) {
+                if (DBG) {
+                    log("ACTION_ADD_VOICEMAIL Intent is thrown. current VM data size: "
+                            + mVMProvidersData.size());
+                }
                 if (mVMProvidersData.size() > 1) {
                     simulatePreferenceClick(mVoicemailProviders);
                 } else {
@@ -1488,6 +1701,16 @@ protected void onCreate(Bundle icicle) {
         mVMProviderSettingsForced = false;
         createSipCallSettings();
 
+        mRingtoneLookupRunnable = new Runnable() {
+            @Override
+            public void run() {
+                if (mRingtonePreference != null) {
+                    updateRingtoneName(RingtoneManager.TYPE_RINGTONE, mRingtonePreference,
+                            MSG_UPDATE_RINGTONE_SUMMARY);
+                }
+            }
+        };
+
         ActionBar actionBar = getActionBar();
         if (actionBar != null) {
             // android.R.id.home will be triggered in onOptionsItemSelected()
@@ -1495,6 +1718,36 @@ protected void onCreate(Bundle icicle) {
         }
     }
 
+    /**
+     * Updates ringtone name. This is a method copied from com.android.settings.SoundSettings
+     *
+     * @see com.android.settings.SoundSettings
+     */
+    private void updateRingtoneName(int type, Preference preference, int msg) {
+        if (preference == null) return;
+        Uri ringtoneUri = RingtoneManager.getActualDefaultRingtoneUri(this, type);
+        CharSequence summary = getString(com.android.internal.R.string.ringtone_unknown);
+        // Is it a silent ringtone?
+        if (ringtoneUri == null) {
+            summary = getString(com.android.internal.R.string.ringtone_silent);
+        } else {
+            // Fetch the ringtone title from the media provider
+            try {
+                Cursor cursor = getContentResolver().query(ringtoneUri,
+                        new String[] { MediaStore.Audio.Media.TITLE }, null, null, null);
+                if (cursor != null) {
+                    if (cursor.moveToFirst()) {
+                        summary = cursor.getString(0);
+                    }
+                    cursor.close();
+                }
+            } catch (SQLiteException sqle) {
+                // Unknown title for the ringtone
+            }
+        }
+        mRingtoneLookupComplete.sendMessage(mRingtoneLookupComplete.obtainMessage(msg, summary));
+    }
+
     private void createSipCallSettings() {
         // Add Internet call settings.
         if (PhoneUtils.isVoipSupported()) {
@@ -1544,6 +1797,21 @@ protected void onResume() {
             return;
         }
 
+        if (mVibrateWhenRinging != null) {
+            mVibrateWhenRinging.setChecked(getVibrateWhenRinging(this));
+        }
+
+        if (mCallEndedWithScreenOffLocks != null) {
+            mCallEndedWithScreenOffLocks.setChecked(Settings.System.getInt(getContentResolver(),
+                    Settings.System.LOCKSCREEN_IF_CALL_ENDS_WITH_SCREENOFF, 1) == 1);
+        }
+
+        if (mMwiNotification != null) {
+            int mwi_notification = Settings.System.getInt(getContentResolver(), Settings.System.ENABLE_MWI_NOTIFICATION, 0);
+            mMwiNotification.setChecked(mwi_notification != 0);
+
+        }
+
         if (mButtonDTMF != null) {
             int dtmf = Settings.System.getInt(getContentResolver(),
                     Settings.System.DTMF_TONE_TYPE_WHEN_DIALING, DTMF_TONE_TYPE_NORMAL);
@@ -1568,6 +1836,40 @@ protected void onResume() {
             mButtonTTY.setValue(Integer.toString(settingsTtyMode));
             updatePreferredTtyModeSummary(settingsTtyMode);
         }
+
+        if (mButtonNoiseSuppression != null) {
+            int nsp = Settings.System.getInt(getContentResolver(), Settings.System.NOISE_SUPPRESSION, 1);
+            mButtonNoiseSuppression.setChecked(nsp != 0);
+        }
+
+        lookupRingtoneName();
+    }
+
+    /**
+     * Obtain the setting for "vibrate when ringing" setting.
+     *
+     * Watch out: if the setting is missing in the device, this will try obtaining the old
+     * "vibrate on ring" setting from AudioManager, and save the previous setting to the new one.
+     */
+    public static boolean getVibrateWhenRinging(Context context) {
+        Vibrator vibrator = (Vibrator) context.getSystemService(Context.VIBRATOR_SERVICE);
+        if (vibrator == null || !vibrator.hasVibrator()) {
+            return false;
+        }
+
+        return Settings.System.getInt(context.getContentResolver(),
+                Settings.System.VIBRATE_WHEN_RINGING, 0) != 0;
+    }
+
+    /**
+     * Lookups ringtone name asynchronously and updates the relevant Preference.
+     */
+    private void lookupRingtoneName() {
+        new Thread(mRingtoneLookupRunnable).start();
+
+        if (mButtonVoiceQuality != null) {
+            mButtonVoiceQuality.setSummary(String.format(mButtonVoiceQualitySum, mButtonVoiceQuality.getEntry()));
+        }
     }
 
     private boolean isAirplaneModeOn() {
@@ -1635,7 +1937,7 @@ private static void log(String msg) {
     /**
      * Updates the look of the VM preference widgets based on current VM provider settings.
      * Note that the provider name is loaded form the found activity via loadLabel in
-     * initVoiceMailProviders in order for it to be localizable.
+     * {@link #initVoiceMailProviders()} in order for it to be localizable.
      */
     private void updateVMPreferenceWidgets(String currentProviderSetting) {
         final String key = currentProviderSetting;
@@ -1646,18 +1948,23 @@ private void updateVMPreferenceWidgets(String currentProviderSetting) {
          In this case we want to show the UI asking the user to select a voicemail provider as
          opposed to silently falling back to default one. */
         if (provider == null) {
+            if (DBG) {
+                log("updateVMPreferenceWidget: provider for the key \"" + key + "\" is null.");
+            }
             mVoicemailProviders.setSummary(getString(R.string.sum_voicemail_choose_provider));
-            mVoicemailSettings.setSummary("");
             mVoicemailSettings.setEnabled(false);
             mVoicemailSettings.setIntent(null);
 
             mVoicemailNotificationVibrateWhen.setEnabled(false);
             mVoicemailNotificationVibrateWhen.setSummary("");
         } else {
+            if (DBG) {
+                log("updateVMPreferenceWidget: provider for the key \"" + key + "\".."
+                        + "name: " + provider.name
+                        + ", intent: " + provider.intent);
+            }
             final String providerName = provider.name;
             mVoicemailProviders.setSummary(providerName);
-            mVoicemailSettings.setSummary(getApplicationContext().getString(
-                    R.string.voicemail_settings_for, providerName));
             mVoicemailSettings.setEnabled(true);
             mVoicemailSettings.setIntent(provider.intent);
 
@@ -1673,22 +1980,21 @@ private void updateVMPreferenceWidgets(String currentProviderSetting) {
      * In case we are called with ACTION_ADD_VOICEMAIL intent the intent may have
      * an extra string called IGNORE_PROVIDER_EXTRA with "package.activityName" of the provider
      * which should be hidden when we bring up the list of possible VM providers to choose.
-     * This allows a provider which is being disabled (e.g. GV user logging out) to force the user
-     * to pick some other provider.
      */
     private void initVoiceMailProviders() {
+        if (DBG) log("initVoiceMailProviders()");
         mPerProviderSavedVMNumbers =
-            this.getApplicationContext().getSharedPreferences(
-                VM_NUMBERS_SHARED_PREFERENCES_NAME, MODE_PRIVATE);
+                this.getApplicationContext().getSharedPreferences(
+                        VM_NUMBERS_SHARED_PREFERENCES_NAME, MODE_PRIVATE);
 
         String providerToIgnore = null;
         if (getIntent().getAction().equals(ACTION_ADD_VOICEMAIL)) {
-            if (DBG) log("ACTION_ADD_VOICEMAIL");
             if (getIntent().hasExtra(IGNORE_PROVIDER_EXTRA)) {
                 providerToIgnore = getIntent().getStringExtra(IGNORE_PROVIDER_EXTRA);
             }
-            if (DBG) log("providerToIgnore=" + providerToIgnore);
+            if (DBG) log("Found ACTION_ADD_VOICEMAIL. providerToIgnore=" + providerToIgnore);
             if (providerToIgnore != null) {
+                // IGNORE_PROVIDER_EXTRA implies we want to remove the choice from the list.
                 deleteSettingsForVoicemailProvider(providerToIgnore);
             }
         }
@@ -1712,17 +2018,21 @@ private void initVoiceMailProviders() {
             final ResolveInfo ri= resolveInfos.get(i);
             final ActivityInfo currentActivityInfo = ri.activityInfo;
             final String key = makeKeyForActivity(currentActivityInfo);
-            if (DBG) log("Loading " + key);
             if (key.equals(providerToIgnore)) {
-                if (DBG) log("Ignoring " + key);
+                if (DBG) log("Ignoring key: " + key);
                 len--;
                 continue;
             }
+            if (DBG) log("Loading key: " + key);
             final String nameForDisplay = ri.loadLabel(pm).toString();
             Intent providerIntent = new Intent();
             providerIntent.setAction(ACTION_CONFIGURE_VOICEMAIL);
             providerIntent.setClassName(currentActivityInfo.packageName,
                     currentActivityInfo.name);
+            if (DBG) {
+                log("Store loaded VoiceMailProvider. key: " + key
+                        + " -> name: " + nameForDisplay + ", intent: " + providerIntent);
+            }
             mVMProvidersData.put(
                     key,
                     new VoiceMailProvider(nameForDisplay, providerIntent));
@@ -1746,10 +2056,17 @@ private void initVoiceMailProviders() {
             entryIdx++;
         }
 
+        // ListPreference is now updated.
         mVoicemailProviders.setEntries(entries);
         mVoicemailProviders.setEntryValues(values);
 
+        // Remember the current Voicemail Provider key as a "previous" key. This will be used
+        // when we fail to update Voicemail Provider, which requires rollback.
+        // We will update this when the VM Provider setting is successfully updated.
         mPreviousVMProviderKey = getCurrentVoicemailProviderKey();
+        if (DBG) log("Set up the first mPreviousVMProviderKey: " + mPreviousVMProviderKey);
+
+        // Finally update the preference texts.
         updateVMPreferenceWidgets(mPreviousVMProviderKey);
     }
 
@@ -1789,12 +2106,15 @@ private void maybeSaveSettingsForVoicemailProvider(String key,
         }
         final VoiceMailProviderSettings curSettings = loadSettingsForVoiceMailProvider(key);
         if (newSettings.equals(curSettings)) {
-            if (DBG) log("Not saving setting for " + key + " since they have not changed");
+            if (DBG) {
+                log("maybeSaveSettingsForVoicemailProvider:"
+                        + " Not saving setting for " + key + " since they have not changed");
+            }
             return;
         }
         if (DBG) log("Saving settings for " + key + ": " + newSettings.toString());
         Editor editor = mPerProviderSavedVMNumbers.edit();
-        editor.putString(key + VM_NUMBER_TAG,newSettings.voicemailNumber);
+        editor.putString(key + VM_NUMBER_TAG, newSettings.voicemailNumber);
         String fwdKey = key + FWD_SETTINGS_TAG;
         CallForwardInfo[] s = newSettings.forwardingSettings;
         if (s != FWD_SETTINGS_DONT_TOUCH) {
@@ -1825,7 +2145,8 @@ private VoiceMailProviderSettings loadSettingsForVoiceMailProvider(String key) {
         final String vmNumberSetting = mPerProviderSavedVMNumbers.getString(key + VM_NUMBER_TAG,
                 null);
         if (vmNumberSetting == null) {
-            if (DBG) log("Settings for " + key + " not found");
+            Log.w(LOG_TAG, "VoiceMailProvider settings for the key \"" + key + "\""
+                    + " was not found. Returning null.");
             return null;
         }
 
diff --git a/src/com/android/phone/CallForwardEditPreference.java b/src/com/android/phone/CallForwardEditPreference.java
index bf509f09e..544d4c21e 100644
--- a/src/com/android/phone/CallForwardEditPreference.java
+++ b/src/com/android/phone/CallForwardEditPreference.java
@@ -15,6 +15,7 @@
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.View;
 
 import static com.android.phone.TimeConsumingPreferenceActivity.RESPONSE_ERROR;
 
@@ -24,6 +25,13 @@ public class CallForwardEditPreference extends EditPhoneNumberPreference {
 
     private static final String SRC_TAGS[]       = {"{0}"};
     private CharSequence mSummaryOnTemplate;
+    /**
+     * Remembers which button was clicked by a user. If no button is clicked yet, this should have
+     * {@link DialogInterface#BUTTON_NEGATIVE}, meaning "cancel".
+     *
+     * TODO: consider removing this variable and having getButtonClicked() in
+     * EditPhoneNumberPreference instead.
+     */
     private int mButtonClicked;
     private int mServiceClass;
     private MyHandler mHandler = new MyHandler();
@@ -67,6 +75,13 @@ void init(TimeConsumingPreferenceListener listener, boolean skipReading) {
         }
     }
 
+    @Override
+    protected void onBindDialogView(View view) {
+        // default the button clicked to be the cancel button.
+        mButtonClicked = DialogInterface.BUTTON_NEGATIVE;
+        super.onBindDialogView(view);
+    }
+
     @Override
     public void onClick(DialogInterface dialog, int which) {
         super.onClick(dialog, which);
@@ -79,6 +94,8 @@ protected void onDialogClosed(boolean positiveResult) {
 
         if (DBG) Log.d(LOG_TAG, "mButtonClicked=" + mButtonClicked
                 + ", positiveResult=" + positiveResult);
+        // Ignore this event if the user clicked the cancel button, or if the dialog is dismissed
+        // without any button being pressed (back button press or click event outside the dialog).
         if (this.mButtonClicked != DialogInterface.BUTTON_NEGATIVE) {
             int action = (isToggled() || (mButtonClicked == DialogInterface.BUTTON_POSITIVE)) ?
                     CommandsInterface.CF_ACTION_REGISTRATION :
@@ -148,8 +165,8 @@ private void updateSummaryText() {
     // arg1: action -- register vs. disable
     // arg2: get vs. set for the preceding request
     private class MyHandler extends Handler {
-        private static final int MESSAGE_GET_CF = 0;
-        private static final int MESSAGE_SET_CF = 1;
+        static final int MESSAGE_GET_CF = 0;
+        static final int MESSAGE_SET_CF = 1;
 
         @Override
         public void handleMessage(Message msg) {
diff --git a/src/com/android/phone/CallLogAsync.java b/src/com/android/phone/CallLogAsync.java
index 9b63e6da0..5a64a807d 100644
--- a/src/com/android/phone/CallLogAsync.java
+++ b/src/com/android/phone/CallLogAsync.java
@@ -158,10 +158,22 @@ protected Uri[] doInBackground(AddCallArgs... callList) {
             for (int i = 0; i < count; i++) {
                 AddCallArgs c = callList[i];
 
-                // May block.
-                result[i] = Calls.addCall(
-                    c.ci, c.context, c.number, c.presentation,
-                    c.callType, c.timestamp, c.durationInSec);
+                try {
+                    // May block.
+                    result[i] = Calls.addCall(
+                            c.ci, c.context, c.number, c.presentation,
+                            c.callType, c.timestamp, c.durationInSec);
+                } catch (Exception e) {
+                    // This must be very rare but may happen in legitimate cases.
+                    // e.g. If the phone is encrypted and thus write request fails, it may
+                    // cause some kind of Exception (right now it is IllegalArgumentException, but
+                    // might change).
+                    //
+                    // We don't want to crash the whole process just because of that.
+                    // Let's just ignore it and leave logs instead.
+                    Log.e(TAG, "Exception raised during adding CallLog entry: " + e);
+                    result[i] = null;
+                }
             }
             return result;
         }
diff --git a/src/com/android/phone/CallNotifier.java b/src/com/android/phone/CallNotifier.java
index fc3e19d14..ef99a721f 100755
--- a/src/com/android/phone/CallNotifier.java
+++ b/src/com/android/phone/CallNotifier.java
@@ -17,26 +17,31 @@
 package com.android.phone;
 
 import com.android.internal.telephony.Call;
+import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.CallerInfo;
 import com.android.internal.telephony.CallerInfoAsyncQuery;
-import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;
-import com.android.internal.telephony.cdma.SignalToneUtil;
-import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaDisplayInfoRec;
-import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaSignalInfoRec;
 import com.android.internal.telephony.Connection;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneBase;
+import com.android.internal.telephony.TelephonyCapabilities;
+import com.android.internal.telephony.cdma.CdmaCallWaitingNotification;
+import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaDisplayInfoRec;
+import com.android.internal.telephony.cdma.CdmaInformationRecords.CdmaSignalInfoRec;
+import com.android.internal.telephony.cdma.SignalToneUtil;
 import com.android.internal.telephony.CallManager;
+import com.android.phone.CallFeaturesSetting;
 
 import android.app.ActivityManagerNative;
 import android.content.Context;
 import android.media.AudioManager;
 import android.media.ToneGenerator;
+import android.net.Uri;
 import android.os.AsyncResult;
 import android.os.Handler;
 import android.os.Message;
 import android.os.RemoteException;
 import android.os.SystemProperties;
+import android.os.SystemVibrator;
 import android.os.Vibrator;
 import android.provider.CallLog.Calls;
 import android.provider.Settings;
@@ -47,7 +52,6 @@
 import android.util.EventLog;
 import android.util.Log;
 
-
 /**
  * Phone app module that listens for phone state changes and various other
  * events from the telephony layer, and triggers any resulting UI behavior
@@ -133,13 +137,13 @@ public class CallNotifier extends Handler
 
     // Events generated internally:
     private static final int PHONE_MWI_CHANGED = 21;
-    private static final int PHONE_BATTERY_LOW = 22;
-    private static final int CALLWAITING_CALLERINFO_DISPLAY_DONE = 23;
-    private static final int CALLWAITING_ADDCALL_DISABLE_TIMEOUT = 24;
-    private static final int DISPLAYINFO_NOTIFICATION_DONE = 25;
-    private static final int EVENT_OTA_PROVISION_CHANGE = 26;
-    private static final int CDMA_CALL_WAITING_REJECT = 27;
-    private static final int UPDATE_IN_CALL_NOTIFICATION = 28;
+    private static final int CALLWAITING_CALLERINFO_DISPLAY_DONE = 22;
+    private static final int CALLWAITING_ADDCALL_DISABLE_TIMEOUT = 23;
+    private static final int DISPLAYINFO_NOTIFICATION_DONE = 24;
+    private static final int EVENT_OTA_PROVISION_CHANGE = 25;
+    private static final int CDMA_CALL_WAITING_REJECT = 26;
+    private static final int UPDATE_IN_CALL_NOTIFICATION = 27;
+    private static final int VIBRATE_45_SEC = 28;
 
     // Emergency call related defines:
     private static final int EMERGENCY_TONE_OFF = 0;
@@ -177,6 +181,8 @@ public class CallNotifier extends Handler
     // Cached AudioManager
     private AudioManager mAudioManager;
 
+    private Vibrator mVibrator;
+
     /**
      * Initialize the singleton CallNotifier instance.
      * This is only done once, at startup, from PhoneApp.onCreate().
@@ -201,6 +207,7 @@ private CallNotifier(PhoneApp app, Phone phone, Ringer ringer,
         mCallLog = callLog;
 
         mAudioManager = (AudioManager) mApplication.getSystemService(Context.AUDIO_SERVICE);
+        mVibrator = (Vibrator) mApplication.getSystemService(Context.VIBRATOR_SERVICE);
 
         registerForNotifications();
 
@@ -266,26 +273,13 @@ public void handleMessage(Message msg) {
                 break;
 
             case RINGER_CUSTOM_RINGTONE_QUERY_TIMEOUT:
-                // CallerInfo query is taking too long!  But we can't wait
-                // any more, so start ringing NOW even if it means we won't
-                // use the correct custom ringtone.
-                Log.w(LOG_TAG, "CallerInfo query took too long; manually starting ringer");
-
-                // In this case we call onCustomRingQueryComplete(), just
-                // like if the query had completed normally.  (But we're
-                // going to get the default ringtone, since we never got
-                // the chance to call Ringer.setCustomRingtoneUri()).
-                onCustomRingQueryComplete();
+                onCustomRingtoneQueryTimeout((String) msg.obj);
                 break;
 
             case PHONE_MWI_CHANGED:
                 onMwiChanged(mApplication.phone.getMessageWaitingIndicator());
                 break;
 
-            case PHONE_BATTERY_LOW:
-                onBatteryLow();
-                break;
-
             case PHONE_CDMA_CALL_WAITING:
                 if (DBG) log("Received PHONE_CDMA_CALL_WAITING event");
                 onCdmaCallWaiting((AsyncResult) msg.obj);
@@ -365,6 +359,11 @@ public void handleMessage(Message msg) {
                 mApplication.notificationMgr.updateInCallNotification();
                 break;
 
+            case VIBRATE_45_SEC:
+                vibrate(70, 0, 0);
+                sendEmptyMessageDelayed(VIBRATE_45_SEC, 60000);
+                break;
+
             default:
                 // super.handleMessage(msg);
         }
@@ -401,12 +400,6 @@ private void onNewRingingConnection(AsyncResult r) {
             return;
         }
 
-        if (c == null) {
-            Log.w(LOG_TAG, "CallNotifier.onNewRingingConnection(): null connection!");
-            // Should never happen, but if it does just bail out and do nothing.
-            return;
-        }
-
         if (!c.isRinging()) {
             Log.i(LOG_TAG, "CallNotifier.onNewRingingConnection(): connection not ringing!");
             // This is a very strange case: an incoming call that stopped
@@ -460,6 +453,9 @@ private void onNewRingingConnection(AsyncResult r) {
             startIncomingCallQuery(c);
         } else {
             if (VDBG) log("- starting call waiting tone...");
+            if (PhoneUtils.PhoneSettings.vibCallWaiting(mApplication)) {
+                vibrate(200, 300, 500);
+            }
             if (mCallWaitingTonePlayer == null) {
                 mCallWaitingTonePlayer = new InCallTonePlayer(InCallTonePlayer.TONE_CALL_WAITING);
                 mCallWaitingTonePlayer.start();
@@ -575,7 +571,7 @@ private void startIncomingCallQuery(Connection c) {
             }
         }
         if (shouldStartQuery) {
-            // create a custom ringer using the default ringer first
+            // Reset the ringtone to the default first.
             mRinger.setCustomRingtoneUri(Settings.System.DEFAULT_RINGTONE_URI);
 
             // query the callerinfo to try to get the ringer.
@@ -589,7 +585,11 @@ private void startIncomingCallQuery(Connection c) {
                 onQueryComplete(0, this, cit.currentInfo);
             } else {
                 if (VDBG) log("- Starting query, posting timeout message.");
-                sendEmptyMessageDelayed(RINGER_CUSTOM_RINGTONE_QUERY_TIMEOUT,
+
+                // Phone number (via getAddress()) is stored in the message to remember which
+                // number is actually used for the look up.
+                sendMessageDelayed(
+                        Message.obtain(this, RINGER_CUSTOM_RINGTONE_QUERY_TIMEOUT, c.getAddress()),
                         RINGTONE_QUERY_WAIT_TIME);
             }
             // The call to showIncomingCall() will happen after the
@@ -699,7 +699,7 @@ private void onUnknownConnectionAppeared(AsyncResult r) {
      * the ringer and/or vibrator are started separately (see the various
      * calls to Ringer.ring() in this class.)
      *
-     * @see NotificationMgr.updateNotificationAndLaunchIncomingCallUi()
+     * @see NotificationMgr#updateNotificationAndLaunchIncomingCallUi()
      */
     private void showIncomingCall() {
         log("showIncomingCall()...  phone state = " + mCM.getState());
@@ -771,18 +771,20 @@ private void onPhoneStateChanged(AsyncResult r) {
                 .enableNotificationAlerts(state == Phone.State.IDLE);
 
         Phone fgPhone = mCM.getFgPhone();
-        if (fgPhone.getPhoneType() == Phone.PHONE_TYPE_CDMA) {
-            if ((fgPhone.getForegroundCall().getState() == Call.State.ACTIVE)
-                    && ((mPreviousCdmaCallState == Call.State.DIALING)
-                    ||  (mPreviousCdmaCallState == Call.State.ALERTING))) {
-                if (mIsCdmaRedialCall) {
-                    int toneToPlay = InCallTonePlayer.TONE_REDIAL;
-                    new InCallTonePlayer(toneToPlay).start();
-                }
-                // Stop any signal info tone when call moves to ACTIVE state
+        if (fgPhone != null) {
+            if (fgPhone.getPhoneType() == Phone.PHONE_TYPE_CDMA) {
+                if ((fgPhone.getForegroundCall().getState() == Call.State.ACTIVE)
+                        && ((mPreviousCdmaCallState == Call.State.DIALING)
+                        ||  (mPreviousCdmaCallState == Call.State.ALERTING))) {
+                    if (mIsCdmaRedialCall) {
+                        int toneToPlay = InCallTonePlayer.TONE_REDIAL;
+                        new InCallTonePlayer(toneToPlay).start();
+                    }
+                    // Stop any signal info tone when call moves to ACTIVE state
                 stopSignalInfoTone();
+                }
+                mPreviousCdmaCallState = fgPhone.getForegroundCall().getState();
             }
-            mPreviousCdmaCallState = fgPhone.getForegroundCall().getState();
         }
 
         // Have the PhoneApp recompute its mShowBluetoothIndication
@@ -792,8 +794,8 @@ private void onPhoneStateChanged(AsyncResult r) {
         // listens for phone state changes itself.
         mApplication.updateBluetoothIndication(false);
 
-        // Update the proximity sensor mode (on devices that have a
-        // proximity sensor).
+
+        // Update the phone state and other sensor/lock.
         mApplication.updatePhoneState(state);
 
         if (state == Phone.State.OFFHOOK) {
@@ -804,6 +806,28 @@ private void onPhoneStateChanged(AsyncResult r) {
             }
 
             if (VDBG) log("onPhoneStateChanged: OFF HOOK");
+
+            Call call = PhoneUtils.getCurrentCall(fgPhone);
+            Connection c = PhoneUtils.getConnection(fgPhone, call);
+            if (VDBG) PhoneUtils.dumpCallState(fgPhone);
+            Call.State cstate = call.getState();
+
+            if (cstate == Call.State.ACTIVE && !c.isIncoming()) {
+                long callDurationMsec = c.getDurationMillis();
+                if (VDBG) Log.v(LOG_TAG, "duration is " + callDurationMsec);
+
+                boolean vibOut = PhoneUtils.PhoneSettings.vibOutgoing(mApplication);
+                if (vibOut && callDurationMsec < 200) {
+                    vibrate(100, 0, 0);
+                }
+
+                boolean vib45 = PhoneUtils.PhoneSettings.vibOn45Secs(mApplication);
+                if (vib45) {
+                    callDurationMsec = callDurationMsec % 60000;
+                    start45SecondVibration(callDurationMsec);
+                }
+            }
+
             // make sure audio is in in-call mode now
             PhoneUtils.setAudioMode(mCM);
 
@@ -844,45 +868,47 @@ private void onPhoneStateChanged(AsyncResult r) {
                                     IN_CALL_NOTIFICATION_UPDATE_DELAY);
         }
 
-        if (fgPhone.getPhoneType() == Phone.PHONE_TYPE_CDMA) {
-            Connection c = fgPhone.getForegroundCall().getLatestConnection();
-            if ((c != null) && (PhoneNumberUtils.isLocalEmergencyNumber(c.getAddress(),
+        if (fgPhone != null) {
+            if (fgPhone.getPhoneType() == Phone.PHONE_TYPE_CDMA) {
+                Connection c = fgPhone.getForegroundCall().getLatestConnection();
+                if ((c != null) && (PhoneNumberUtils.isLocalEmergencyNumber(c.getAddress(),
                                                                         mApplication))) {
-                if (VDBG) log("onPhoneStateChanged: it is an emergency call.");
-                Call.State callState = fgPhone.getForegroundCall().getState();
-                if (mEmergencyTonePlayerVibrator == null) {
-                    mEmergencyTonePlayerVibrator = new EmergencyTonePlayerVibrator();
-                }
+                    if (VDBG) log("onPhoneStateChanged: it is an emergency call.");
+                    Call.State callState = fgPhone.getForegroundCall().getState();
+                    if (mEmergencyTonePlayerVibrator == null) {
+                        mEmergencyTonePlayerVibrator = new EmergencyTonePlayerVibrator();
+                    }
 
-                if (callState == Call.State.DIALING || callState == Call.State.ALERTING) {
-                    mIsEmergencyToneOn = Settings.System.getInt(
-                            mApplication.getContentResolver(),
-                            Settings.System.EMERGENCY_TONE, EMERGENCY_TONE_OFF);
-                    if (mIsEmergencyToneOn != EMERGENCY_TONE_OFF &&
-                        mCurrentEmergencyToneState == EMERGENCY_TONE_OFF) {
-                        if (mEmergencyTonePlayerVibrator != null) {
-                            mEmergencyTonePlayerVibrator.start();
+                    if (callState == Call.State.DIALING || callState == Call.State.ALERTING) {
+                        mIsEmergencyToneOn = Settings.System.getInt(
+                                mApplication.getContentResolver(),
+                                Settings.System.EMERGENCY_TONE, EMERGENCY_TONE_OFF);
+                        if (mIsEmergencyToneOn != EMERGENCY_TONE_OFF &&
+                            mCurrentEmergencyToneState == EMERGENCY_TONE_OFF) {
+                            if (mEmergencyTonePlayerVibrator != null) {
+                                mEmergencyTonePlayerVibrator.start();
+                            }
                         }
-                    }
-                } else if (callState == Call.State.ACTIVE) {
-                    if (mCurrentEmergencyToneState != EMERGENCY_TONE_OFF) {
-                        if (mEmergencyTonePlayerVibrator != null) {
-                            mEmergencyTonePlayerVibrator.stop();
+                    } else if (callState == Call.State.ACTIVE) {
+                        if (mCurrentEmergencyToneState != EMERGENCY_TONE_OFF) {
+                            if (mEmergencyTonePlayerVibrator != null) {
+                                mEmergencyTonePlayerVibrator.stop();
+                            }
                         }
                     }
                 }
             }
-        }
 
-        if ((fgPhone.getPhoneType() == Phone.PHONE_TYPE_GSM)
-                || (fgPhone.getPhoneType() == Phone.PHONE_TYPE_SIP)) {
-            Call.State callState = mCM.getActiveFgCallState();
-            if (!callState.isDialing()) {
-                // If call get activated or disconnected before the ringback
-                // tone stops, we have to stop it to prevent disturbing.
-                if (mInCallRingbackTonePlayer != null) {
-                    mInCallRingbackTonePlayer.stopTone();
-                    mInCallRingbackTonePlayer = null;
+            if ((fgPhone.getPhoneType() == Phone.PHONE_TYPE_GSM)
+                    || (fgPhone.getPhoneType() == Phone.PHONE_TYPE_SIP)) {
+                Call.State callState = mCM.getActiveFgCallState();
+                if (!callState.isDialing()) {
+                    // If call get activated or disconnected before the ringback
+                    // tone stops, we have to stop it to prevent disturbing.
+                    if (mInCallRingbackTonePlayer != null) {
+                        mInCallRingbackTonePlayer.stopTone();
+                        mInCallRingbackTonePlayer = null;
+                    }
                 }
             }
         }
@@ -943,15 +969,17 @@ private void registerForNotifications() {
      * class itself, it is assumed that we have been waiting for the ringtone
      * and direct to voicemail settings to update.
      */
+    @Override
     public void onQueryComplete(int token, Object cookie, CallerInfo ci) {
         if (cookie instanceof Long) {
             if (VDBG) log("CallerInfo query complete, posting missed call notification");
 
             mApplication.notificationMgr.notifyMissedCall(ci.name, ci.phoneNumber,
-                    ci.phoneLabel, ((Long) cookie).longValue());
+                    ci.phoneLabel, ci.cachedPhoto, ci.cachedPhotoIcon,
+                    ((Long) cookie).longValue());
         } else if (cookie instanceof CallNotifier) {
             if (VDBG) log("CallerInfo query complete (for CallNotifier), "
-                          + "updating state for incoming call..");
+                    + "updating state for incoming call..");
 
             // get rid of the timeout messages
             removeMessages(RINGER_CUSTOM_RINGTONE_QUERY_TIMEOUT);
@@ -985,6 +1013,50 @@ public void onQueryComplete(int token, Object cookie, CallerInfo ci) {
         }
     }
 
+    /**
+     * Called when asynchronous CallerInfo query is taking too long (more than
+     * {@link #RINGTONE_QUERY_WAIT_TIME} msec), but we cannot wait any more.
+     *
+     * This looks up in-memory fallback cache and use it when available. If not, it just calls
+     * {@link #onCustomRingQueryComplete()} with default ringtone ("Send to voicemail" flag will
+     * be just ignored).
+     *
+     * @param number The phone number used for the async query. This method will take care of
+     * formatting or normalization of the number.
+     */
+    private void onCustomRingtoneQueryTimeout(String number) {
+        // First of all, this case itself should be rare enough, though we cannot avoid it in
+        // some situations (e.g. IPC is slow due to system overload, database is in sync, etc.)
+        Log.w(LOG_TAG, "CallerInfo query took too long; look up local fallback cache.");
+
+        // This method is intentionally verbose for now to detect possible bad side-effect for it.
+        // TODO: Remove the verbose log when it looks stable and reliable enough.
+
+        final CallerInfoCache.CacheEntry entry =
+                mApplication.callerInfoCache.getCacheEntry(number);
+        if (entry != null) {
+            if (entry.sendToVoicemail) {
+                log("send to voicemail flag detected (in fallback cache). hanging up.");
+                PhoneUtils.hangupRingingCall(mCM.getFirstActiveRingingCall());
+                return;
+            }
+
+            if (entry.customRingtone != null) {
+                log("custom ringtone found (in fallback cache), setting up ringer: "
+                        + entry.customRingtone);
+                this.mRinger.setCustomRingtoneUri(Uri.parse(entry.customRingtone));
+            }
+        } else {
+            // In this case we call onCustomRingQueryComplete(), just
+            // like if the query had completed normally.  (But we're
+            // going to get the default ringtone, since we never got
+            // the chance to call Ringer.setCustomRingtoneUri()).
+            log("Failed to find fallback cache. Use default ringer tone.");
+        }
+
+        onCustomRingQueryComplete();
+    }
+
     private void onDisconnect(AsyncResult r) {
         if (VDBG) log("onDisconnect()...  CallManager state: " + mCM.getState());
 
@@ -1016,6 +1088,14 @@ private void onDisconnect(AsyncResult r) {
             removeMessages(CALLWAITING_ADDCALL_DISABLE_TIMEOUT);
         }
 
+        if (c != null) {
+            boolean vibHangup = PhoneUtils.PhoneSettings.vibHangup(mApplication);
+            if (vibHangup && c.getDurationMillis() > 0) {
+                vibrate(50, 100, 50);
+            }
+            removeMessages(VIBRATE_45_SEC);
+        }
+
         // Stop the ringer if it was ringing (for an incoming call that
         // either disconnected by itself, or was rejected by the user.)
         //
@@ -1099,6 +1179,9 @@ private void onDisconnect(AsyncResult r) {
             }
         }
 
+        // disable noise suppression
+        PhoneUtils.turnOnNoiseSuppression(mApplication.getApplicationContext(), false);
+
         // If we don't need to play BUSY or CONGESTION, then play the
         // "call ended" tone if this was a "regular disconnect" (i.e. a
         // normal call where one end or the other hung up) *and* this
@@ -1118,6 +1201,7 @@ private void onDisconnect(AsyncResult r) {
             }
         }
 
+        // All phone calls are disconnected.
         if (mCM.getState() == Phone.State.IDLE) {
             // Don't reset the audio mode or bluetooth/speakerphone state
             // if we still need to let the user hear a tone through the earpiece.
@@ -1127,15 +1211,10 @@ private void onDisconnect(AsyncResult r) {
 
             mApplication.notificationMgr.cancelCallInProgressNotifications();
 
-            // If the InCallScreen is *not* in the foreground, forcibly
-            // dismiss it to make sure it won't still be in the activity
-            // history.  (But if it *is* in the foreground, don't mess
-            // with it; it needs to be visible, displaying the "Call
-            // ended" state.)
-            if (!mApplication.isShowingCallScreen()) {
-                if (VDBG) log("onDisconnect: force InCallScreen to finish()");
-                mApplication.dismissCallScreen();
-            } else {
+            // If the screen is turned off when all the phone calls are hung up,
+            // InCallScreen#onDisconnect() will wake up the screen (only once) and let users
+            // check the disconnected status.
+            if (mApplication.isShowingCallScreen()) {
                 if (VDBG) log("onDisconnect: In call screen. Set short timeout.");
                 mApplication.clearUserActivityTimeout();
             }
@@ -1234,22 +1313,6 @@ private void onDisconnect(AsyncResult r) {
                 // when *that* connection's "disconnect" event comes in.)
             }
 
-            if (mCM.getState() == Phone.State.IDLE) {
-                // Release screen wake locks if the in-call screen is not
-                // showing. Otherwise, let the in-call screen handle this because
-                // it needs to show the call ended screen for a couple of
-                // seconds.
-                if (!mApplication.isShowingCallScreen()) {
-                    if (VDBG) log("- NOT showing in-call screen; releasing wake locks!");
-                    mApplication.setScreenTimeout(PhoneApp.ScreenTimeoutDuration.DEFAULT);
-                    mApplication.requestWakeState(PhoneApp.WakeState.SLEEP);
-                } else {
-                    if (VDBG) log("- still showing in-call screen; not releasing wake locks.");
-                }
-            } else {
-                if (VDBG) log("- phone still in use; not releasing wake locks.");
-            }
-
             if (((mPreviousCdmaCallState == Call.State.DIALING)
                     || (mPreviousCdmaCallState == Call.State.ALERTING))
                     && (!isEmergencyNumber)
@@ -1305,6 +1368,15 @@ private void onMwiChanged(boolean visible) {
             return;
         }
 
+        boolean notifProp = mApplication.getResources().getBoolean(R.bool.sprint_mwi_quirk);
+        boolean notifOption = Settings.System.getInt(mApplication.getPhone().getContext().getContentResolver(), Settings.System.ENABLE_MWI_NOTIFICATION, 0) == 1;
+        if (notifProp && !notifOption) {
+            // sprint_mwi_quirk is true, and ENABLE_MWI_NOTIFICATION is unchecked or unset (false)
+            // ignore the mwi event, but log if we're debugging.
+            if (VDBG) log("onMwiChanged(): mwi_notification is disabled. Ignoring...");
+            return;
+        }
+
         mApplication.notificationMgr.updateMwi(visible);
     }
 
@@ -1359,23 +1431,6 @@ void silenceRinger() {
         }
     }
 
-    /**
-     * Posts a PHONE_BATTERY_LOW event, causing us to play a warning
-     * tone if the user is in-call.
-     */
-    /* package */ void sendBatteryLow() {
-        Message message = Message.obtain(this, PHONE_BATTERY_LOW);
-        sendMessage(message);
-    }
-
-    private void onBatteryLow() {
-        if (DBG) log("onBatteryLow()...");
-
-        // A "low battery" warning tone is now played by
-        // StatusBarPolicy.updateBattery().
-    }
-
-
     /**
      * Helper class to play tones through the earpiece (or speaker / BT)
      * during a call, using the ToneGenerator.
@@ -1401,32 +1456,31 @@ private class InCallTonePlayer extends Thread {
         public static final int TONE_CALL_WAITING = 1;
         public static final int TONE_BUSY = 2;
         public static final int TONE_CONGESTION = 3;
-        public static final int TONE_BATTERY_LOW = 4;
-        public static final int TONE_CALL_ENDED = 5;
-        public static final int TONE_VOICE_PRIVACY = 6;
-        public static final int TONE_REORDER = 7;
-        public static final int TONE_INTERCEPT = 8;
-        public static final int TONE_CDMA_DROP = 9;
-        public static final int TONE_OUT_OF_SERVICE = 10;
-        public static final int TONE_REDIAL = 11;
-        public static final int TONE_OTA_CALL_END = 12;
-        public static final int TONE_RING_BACK = 13;
-        public static final int TONE_UNOBTAINABLE_NUMBER = 14;
+        public static final int TONE_CALL_ENDED = 4;
+        public static final int TONE_VOICE_PRIVACY = 5;
+        public static final int TONE_REORDER = 6;
+        public static final int TONE_INTERCEPT = 7;
+        public static final int TONE_CDMA_DROP = 8;
+        public static final int TONE_OUT_OF_SERVICE = 9;
+        public static final int TONE_REDIAL = 10;
+        public static final int TONE_OTA_CALL_END = 11;
+        public static final int TONE_RING_BACK = 12;
+        public static final int TONE_UNOBTAINABLE_NUMBER = 13;
 
         // The tone volume relative to other sounds in the stream
-        private static final int TONE_RELATIVE_VOLUME_EMERGENCY = 100;
-        private static final int TONE_RELATIVE_VOLUME_HIPRI = 80;
-        private static final int TONE_RELATIVE_VOLUME_LOPRI = 50;
+        static final int TONE_RELATIVE_VOLUME_EMERGENCY = 100;
+        static final int TONE_RELATIVE_VOLUME_HIPRI = 80;
+        static final int TONE_RELATIVE_VOLUME_LOPRI = 50;
 
         // Buffer time (in msec) to add on to tone timeout value.
         // Needed mainly when the timeout value for a tone is the
         // exact duration of the tone itself.
-        private static final int TONE_TIMEOUT_BUFFER = 20;
+        static final int TONE_TIMEOUT_BUFFER = 20;
 
         // The tone state
-        private static final int TONE_OFF = 0;
-        private static final int TONE_ON = 1;
-        private static final int TONE_STOPPED = 2;
+        static final int TONE_OFF = 0;
+        static final int TONE_ON = 1;
+        static final int TONE_STOPPED = 2;
 
         InCallTonePlayer(int toneId) {
             super();
@@ -1469,15 +1523,7 @@ public void run() {
                     toneVolume = TONE_RELATIVE_VOLUME_HIPRI;
                     toneLengthMillis = 4000;
                     break;
-                case TONE_BATTERY_LOW:
-                    // For now, use ToneGenerator.TONE_PROP_ACK (two quick
-                    // beeps).  TODO: is there some other ToneGenerator
-                    // tone that would be more appropriate here?  Or
-                    // should we consider adding a new custom tone?
-                    toneType = ToneGenerator.TONE_PROP_ACK;
-                    toneVolume = TONE_RELATIVE_VOLUME_HIPRI;
-                    toneLengthMillis = 1000;
-                    break;
+
                 case TONE_CALL_ENDED:
                     toneType = ToneGenerator.TONE_PROP_PROMPT;
                     toneVolume = TONE_RELATIVE_VOLUME_HIPRI;
@@ -1632,7 +1678,7 @@ public void run() {
             //
             // (But watch out: do NOT do this if the phone is in use,
             // since some of our tones get played *during* a call (like
-            // CALL_WAITING and BATTERY_LOW) and we definitely *don't*
+            // CALL_WAITING) and we definitely *don't*
             // want to reset the audio mode / speaker / bluetooth after
             // playing those!
             // This call is really here for use with tones that get played
@@ -1808,7 +1854,7 @@ private void onCdmaCallWaiting(AsyncResult r) {
      * CDMA call-waiting call.
      *
      * This method is safe to call from any thread.
-     * @see onCdmaCallWaitingReject()
+     * @see #onCdmaCallWaitingReject()
      */
     /* package */ void sendCdmaCallWaitingReject() {
         sendEmptyMessage(CDMA_CALL_WAITING_REJECT);
@@ -1819,7 +1865,7 @@ private void onCdmaCallWaiting(AsyncResult r) {
      * and finally calls Hangup on the Call Waiting connection.
      *
      * This method should be called only from the UI thread.
-     * @see sendCdmaCallWaitingReject()
+     * @see #sendCdmaCallWaitingReject()
      */
     private void onCdmaCallWaitingReject() {
         final Call ringingCall = mCM.getFirstActiveRingingCall();
@@ -1904,7 +1950,7 @@ private void onCdmaCallWaitingReject() {
      */
     private void showMissedCallNotification(Connection c, final long date) {
         PhoneUtils.CallerInfoToken info =
-            PhoneUtils.startGetCallerInfo(mApplication, c, this, Long.valueOf(date));
+                PhoneUtils.startGetCallerInfo(mApplication, c, this, Long.valueOf(date));
         if (info != null) {
             // at this point, we've requested to start a query, but it makes no
             // sense to log this missed call until the query comes back.
@@ -1928,7 +1974,7 @@ private void showMissedCallNotification(Connection c, final long date) {
                             ci, number, ci.numberPresentation);
                 }
                 mApplication.notificationMgr.notifyMissedCall(name, number,
-                        ci.phoneLabel, date);
+                        ci.phoneLabel, ci.cachedPhoto, ci.cachedPhotoIcon, date);
             }
         } else {
             // getCallerInfo() can return null in rare cases, like if we weren't
@@ -1947,7 +1993,9 @@ private class EmergencyTonePlayerVibrator {
                 new long[] { EMG_VIBRATE_LENGTH, EMG_VIBRATE_PAUSE };
 
         private ToneGenerator mToneGenerator;
-        private Vibrator mEmgVibrator;
+        // We don't rely on getSystemService(Context.VIBRATOR_SERVICE) to make sure this vibrator
+        // object will be isolated from others.
+        private Vibrator mEmgVibrator = new SystemVibrator();
         private int mInCallVolume;
 
         /**
@@ -1978,7 +2026,6 @@ private void start() {
                 }
             } else if (mIsEmergencyToneOn == EMERGENCY_TONE_VIBRATE) {
                 log("EmergencyTonePlayerVibrator.start(): emergency vibrate...");
-                mEmgVibrator = new Vibrator();
                 if (mEmgVibrator != null) {
                     mEmgVibrator.vibrate(mVibratePattern, 0);
                     mCurrentEmergencyToneState = EMERGENCY_TONE_VIBRATE;
@@ -2048,7 +2095,7 @@ private void onResendMute() {
      * Apply the Call Name Presentation (CNAP) transform in the connection on the number.
      *
      * @param conn The phone connection.
-     * @param info The CallerInfo. Maybe null.
+     * @param callerInfo The CallerInfo. Maybe null.
      * @return the phone number.
      */
     private String getLogNumber(Connection conn, CallerInfo callerInfo) {
@@ -2114,7 +2161,7 @@ private CallerInfo getCallerInfoFromConnection(Connection conn) {
      * get it from the connection.
      *
      * @param conn The phone connection.
-     * @param info The CallerInfo. Maybe null.
+     * @param callerInfo The CallerInfo. Maybe null.
      * @return The presentation to use in the logs.
      */
     private int getPresentation(Connection conn, CallerInfo callerInfo) {
@@ -2131,6 +2178,30 @@ private int getPresentation(Connection conn, CallerInfo callerInfo) {
         return presentation;
     }
 
+    private void start45SecondVibration(long callDurationMsec) {
+        if (VDBG) Log.v(LOG_TAG, "vibrate start @" + callDurationMsec);
+
+        removeMessages(VIBRATE_45_SEC);
+
+        long timer;
+        if (callDurationMsec > 45000) {
+            // Schedule the alarm at the next minute + 45 secs
+            timer = 45000 + 60000 - callDurationMsec;
+        } else {
+            // Schedule the alarm at the first 45 second mark
+            timer = 45000 - callDurationMsec;
+        }
+
+        sendEmptyMessageDelayed(VIBRATE_45_SEC, timer);
+    }
+
+    public void vibrate(int v1, int p1, int v2) {
+        long[] pattern = new long[] {
+            0, v1, p1, v2
+        };
+        mVibrator.vibrate(pattern, -1);
+    }
+
     private void log(String msg) {
         Log.d(LOG_TAG, msg);
     }
diff --git a/src/com/android/phone/CallWaitingCheckBoxPreference.java b/src/com/android/phone/CallWaitingCheckBoxPreference.java
index a174e4b38..6394ff1a4 100644
--- a/src/com/android/phone/CallWaitingCheckBoxPreference.java
+++ b/src/com/android/phone/CallWaitingCheckBoxPreference.java
@@ -20,13 +20,13 @@ public class CallWaitingCheckBoxPreference extends CheckBoxPreference {
     private final boolean DBG = (PhoneApp.DBG_LEVEL >= 2);
 
     private final MyHandler mHandler = new MyHandler();
-    Phone phone;
-    TimeConsumingPreferenceListener tcpListener;
+    private final Phone mPhone;
+    private TimeConsumingPreferenceListener mTcpListener;
 
     public CallWaitingCheckBoxPreference(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
 
-        phone = PhoneApp.getPhone();
+        mPhone = PhoneApp.getPhone();
     }
 
     public CallWaitingCheckBoxPreference(Context context, AttributeSet attrs) {
@@ -37,14 +37,14 @@ public CallWaitingCheckBoxPreference(Context context) {
         this(context, null);
     }
 
-    void init(TimeConsumingPreferenceListener listener, boolean skipReading) {
-        tcpListener = listener;
+    /* package */ void init(TimeConsumingPreferenceListener listener, boolean skipReading) {
+        mTcpListener = listener;
 
         if (!skipReading) {
-            phone.getCallWaiting(mHandler.obtainMessage(MyHandler.MESSAGE_GET_CALL_WAITING,
+            mPhone.getCallWaiting(mHandler.obtainMessage(MyHandler.MESSAGE_GET_CALL_WAITING,
                     MyHandler.MESSAGE_GET_CALL_WAITING, MyHandler.MESSAGE_GET_CALL_WAITING));
-            if (tcpListener != null) {
-                tcpListener.onStarted(this, true);
+            if (mTcpListener != null) {
+                mTcpListener.onStarted(this, true);
             }
         }
     }
@@ -53,16 +53,16 @@ void init(TimeConsumingPreferenceListener listener, boolean skipReading) {
     protected void onClick() {
         super.onClick();
 
-        phone.setCallWaiting(isChecked(),
+        mPhone.setCallWaiting(isChecked(),
                 mHandler.obtainMessage(MyHandler.MESSAGE_SET_CALL_WAITING));
-        if (tcpListener != null) {
-            tcpListener.onStarted(this, false);
+        if (mTcpListener != null) {
+            mTcpListener.onStarted(this, false);
         }
     }
 
     private class MyHandler extends Handler {
-        private static final int MESSAGE_GET_CALL_WAITING = 0;
-        private static final int MESSAGE_SET_CALL_WAITING = 1;
+        static final int MESSAGE_GET_CALL_WAITING = 0;
+        static final int MESSAGE_SET_CALL_WAITING = 1;
 
         @Override
         public void handleMessage(Message msg) {
@@ -79,11 +79,11 @@ public void handleMessage(Message msg) {
         private void handleGetCallWaitingResponse(Message msg) {
             AsyncResult ar = (AsyncResult) msg.obj;
 
-            if (tcpListener != null) {
+            if (mTcpListener != null) {
                 if (msg.arg2 == MESSAGE_SET_CALL_WAITING) {
-                    tcpListener.onFinished(CallWaitingCheckBoxPreference.this, false);
+                    mTcpListener.onFinished(CallWaitingCheckBoxPreference.this, false);
                 } else {
-                    tcpListener.onFinished(CallWaitingCheckBoxPreference.this, true);
+                    mTcpListener.onFinished(CallWaitingCheckBoxPreference.this, true);
                 }
             }
 
@@ -91,14 +91,18 @@ private void handleGetCallWaitingResponse(Message msg) {
                 if (DBG) {
                     Log.d(LOG_TAG, "handleGetCallWaitingResponse: ar.exception=" + ar.exception);
                 }
-                if (tcpListener != null) {
-                    tcpListener.onException(CallWaitingCheckBoxPreference.this,
+                if (mTcpListener != null) {
+                    mTcpListener.onException(CallWaitingCheckBoxPreference.this,
                             (CommandException)ar.exception);
                 }
             } else if (ar.userObj instanceof Throwable) {
-                if (tcpListener != null) tcpListener.onError(CallWaitingCheckBoxPreference.this, RESPONSE_ERROR);
+                if (mTcpListener != null) {
+                    mTcpListener.onError(CallWaitingCheckBoxPreference.this, RESPONSE_ERROR);
+                }
             } else {
-                if (DBG) Log.d(LOG_TAG, "handleGetCallWaitingResponse: CW state successfully queried.");
+                if (DBG) {
+                    Log.d(LOG_TAG, "handleGetCallWaitingResponse: CW state successfully queried.");
+                }
                 int[] cwArray = (int[])ar.result;
                 // If cwArray[0] is = 1, then cwArray[1] must follow,
                 // with the TS 27.007 service class bit vector of services
@@ -116,12 +120,14 @@ private void handleSetCallWaitingResponse(Message msg) {
             AsyncResult ar = (AsyncResult) msg.obj;
 
             if (ar.exception != null) {
-                if (DBG) Log.d(LOG_TAG, "handleSetCallWaitingResponse: ar.exception=" + ar.exception);
+                if (DBG) {
+                    Log.d(LOG_TAG, "handleSetCallWaitingResponse: ar.exception=" + ar.exception);
+                }
                 //setEnabled(false);
             }
             if (DBG) Log.d(LOG_TAG, "handleSetCallWaitingResponse: re get");
 
-            phone.getCallWaiting(obtainMessage(MESSAGE_GET_CALL_WAITING,
+            mPhone.getCallWaiting(obtainMessage(MESSAGE_GET_CALL_WAITING,
                     MESSAGE_SET_CALL_WAITING, MESSAGE_SET_CALL_WAITING, ar.exception));
         }
     }
diff --git a/src/com/android/phone/CallerInfoCache.java b/src/com/android/phone/CallerInfoCache.java
new file mode 100644
index 000000000..dc6ffae2c
--- /dev/null
+++ b/src/com/android/phone/CallerInfoCache.java
@@ -0,0 +1,337 @@
+/*
+ * Copyright (C) 2012 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.phone;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.AsyncTask;
+import android.os.PowerManager;
+import android.os.SystemClock;
+import android.os.SystemProperties;
+import android.provider.ContactsContract.CommonDataKinds.Callable;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
+import android.provider.ContactsContract.Data;
+import android.telephony.PhoneNumberUtils;
+import android.util.Log;
+
+import java.util.HashMap;
+import java.util.Map.Entry;
+
+/**
+ * Holds "custom ringtone" and "send to voicemail" information for each contact as a fallback of
+ * contacts database. The cached information is refreshed periodically and used when database
+ * lookup (via ContentResolver) takes longer time than expected.
+ *
+ * The data inside this class shouldn't be treated as "primary"; they may not reflect the
+ * latest information stored in the original database.
+ */
+public class CallerInfoCache {
+    private static final String LOG_TAG = CallerInfoCache.class.getSimpleName();
+    private static final boolean DBG =
+            (PhoneApp.DBG_LEVEL >= 1) && (SystemProperties.getInt("ro.debuggable", 0) == 1);
+
+    /** This must not be set to true when submitting changes. */
+    private static final boolean VDBG = false;
+
+    /**
+     * Interval used with {@link AlarmManager#setInexactRepeating(int, long, long, PendingIntent)},
+     * which means the actually interval may not be very accurate.
+     */
+    private static final int CACHE_REFRESH_INTERVAL = 8 * 60 * 60 * 1000; // 8 hours in millis.
+
+    public static final int MESSAGE_UPDATE_CACHE = 0;
+
+    // Assuming DATA.DATA1 corresponds to Phone.NUMBER and SipAddress.ADDRESS, we just use
+    // Data columns as much as we can. One exception: because normalized numbers won't be used in
+    // SIP cases, Phone.NORMALIZED_NUMBER is used as is instead of using Data.
+    private static final String[] PROJECTION = new String[] {
+        Data.DATA1,                  // 0
+        Phone.NORMALIZED_NUMBER,     // 1
+        Data.CUSTOM_RINGTONE,        // 2
+        Data.SEND_TO_VOICEMAIL       // 3
+    };
+
+    private static final int INDEX_NUMBER            = 0;
+    private static final int INDEX_NORMALIZED_NUMBER = 1;
+    private static final int INDEX_CUSTOM_RINGTONE   = 2;
+    private static final int INDEX_SEND_TO_VOICEMAIL = 3;
+
+    private static final String SELECTION = "("
+            + "(" + Data.CUSTOM_RINGTONE + " IS NOT NULL OR " + Data.SEND_TO_VOICEMAIL + "=1)"
+            + " AND " + Data.DATA1 + " IS NOT NULL)";
+
+    public static class CacheEntry {
+        public final String customRingtone;
+        public final boolean sendToVoicemail;
+        public CacheEntry(String customRingtone, boolean shouldSendToVoicemail) {
+            this.customRingtone = customRingtone;
+            this.sendToVoicemail = shouldSendToVoicemail;
+        }
+
+        @Override
+        public String toString() {
+            return "ringtone: " + customRingtone + ", " + sendToVoicemail;
+        }
+    }
+
+    private class CacheAsyncTask extends AsyncTask<Void, Void, Void> {
+
+        private PowerManager.WakeLock mWakeLock;
+
+        /**
+         * Call {@link PowerManager.WakeLock#acquire} and call {@link AsyncTask#execute(Object...)},
+         * guaranteeing the lock is held during the asynchronous task.
+         */
+        public void acquireWakeLockAndExecute() {
+            // Prepare a separate partial WakeLock than what PhoneApp has so to avoid
+            // unnecessary conflict.
+            PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+            mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, LOG_TAG);
+            mWakeLock.acquire();
+            execute();
+        }
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            if (DBG) log("Start refreshing cache.");
+            refreshCacheEntry();
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Void result) {
+            if (VDBG) log("CacheAsyncTask#onPostExecute()");
+            super.onPostExecute(result);
+            releaseWakeLock();
+        }
+
+        @Override
+        protected void onCancelled(Void result) {
+            if (VDBG) log("CacheAsyncTask#onCanceled()");
+            super.onCancelled(result);
+            releaseWakeLock();
+        }
+
+        private void releaseWakeLock() {
+            if (mWakeLock != null && mWakeLock.isHeld()) {
+                mWakeLock.release();
+            }
+        }
+    }
+
+    private final Context mContext;
+
+    /**
+     * The mapping from number to CacheEntry.
+     *
+     * The number will be:
+     * - last 7 digits of each "normalized phone number when it is for PSTN phone call, or
+     * - a full SIP address for SIP call
+     *
+     * When cache is being refreshed, this whole object will be replaced with a newer object,
+     * instead of updating elements inside the object.  "volatile" is used to make
+     * {@link #getCacheEntry(String)} access to the newer one every time when the object is
+     * being replaced.
+     */
+    private volatile HashMap<String, CacheEntry> mNumberToEntry;
+
+    /**
+     * Used to remember if the previous task is finished or not. Should be set to null when done.
+     */
+    private CacheAsyncTask mCacheAsyncTask;
+
+    public static CallerInfoCache init(Context context) {
+        if (DBG) log("init()");
+        CallerInfoCache cache = new CallerInfoCache(context);
+        // The first cache should be available ASAP.
+        cache.startAsyncCache();
+        cache.setRepeatingCacheUpdateAlarm();
+        return cache;
+    }
+
+    private CallerInfoCache(Context context) {
+        mContext = context;
+        mNumberToEntry = new HashMap<String, CacheEntry>();
+    }
+
+    /* package */ void startAsyncCache() {
+        if (DBG) log("startAsyncCache");
+
+        if (mCacheAsyncTask != null) {
+            Log.w(LOG_TAG, "Previous cache task is remaining.");
+            mCacheAsyncTask.cancel(true);
+        }
+        mCacheAsyncTask = new CacheAsyncTask();
+        mCacheAsyncTask.acquireWakeLockAndExecute();
+    }
+
+    /**
+     * Set up periodic alarm for cache update.
+     */
+    private void setRepeatingCacheUpdateAlarm() {
+        if (DBG) log("setRepeatingCacheUpdateAlarm");
+
+        Intent intent = new Intent(CallerInfoCacheUpdateReceiver.ACTION_UPDATE_CALLER_INFO_CACHE);
+        intent.setClass(mContext, CallerInfoCacheUpdateReceiver.class);
+        PendingIntent pendingIntent =
+                PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT);
+        AlarmManager alarmManager = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
+        // We don't need precise timer while this should be power efficient.
+        alarmManager.setInexactRepeating(AlarmManager.ELAPSED_REALTIME,
+                SystemClock.uptimeMillis() + CACHE_REFRESH_INTERVAL,
+                CACHE_REFRESH_INTERVAL, pendingIntent);
+    }
+
+    private void refreshCacheEntry() {
+        if (VDBG) log("refreshCacheEntry() started");
+
+        // There's no way to know which part of the database was updated. Also we don't want
+        // to block incoming calls asking for the cache. So this method just does full query
+        // and replaces the older cache with newer one. To refrain from blocking incoming calls,
+        // it keeps older one as much as it can, and replaces it with newer one inside a very small
+        // synchronized block.
+
+        Cursor cursor = null;
+        try {
+            cursor = mContext.getContentResolver().query(Callable.CONTENT_URI,
+                    PROJECTION, SELECTION, null, null);
+            if (cursor != null) {
+                // We don't want to block real in-coming call, so prepare a completely fresh
+                // cache here again, and replace it with older one.
+                final HashMap<String, CacheEntry> newNumberToEntry =
+                        new HashMap<String, CacheEntry>(cursor.getCount());
+
+                while (cursor.moveToNext()) {
+                    final String number = cursor.getString(INDEX_NUMBER);
+                    String normalizedNumber = cursor.getString(INDEX_NORMALIZED_NUMBER);
+                    if (normalizedNumber == null) {
+                        // There's no guarantee normalized numbers are available every time and
+                        // it may become null sometimes. Try formatting the original number.
+                        normalizedNumber = PhoneNumberUtils.normalizeNumber(number);
+                    }
+                    final String customRingtone = cursor.getString(INDEX_CUSTOM_RINGTONE);
+                    final boolean sendToVoicemail = cursor.getInt(INDEX_SEND_TO_VOICEMAIL) == 1;
+
+                    if (PhoneNumberUtils.isUriNumber(number)) {
+                        // SIP address case
+                        putNewEntryWhenAppropriate(
+                                newNumberToEntry, number, customRingtone, sendToVoicemail);
+                    } else {
+                        // PSTN number case
+                        // Each normalized number may or may not have full content of the number.
+                        // Contacts database may contain +15001234567 while a dialed number may be
+                        // just 5001234567. Also we may have inappropriate country
+                        // code in some cases (e.g. when the location of the device is inconsistent
+                        // with the device's place). So to avoid confusion we just rely on the last
+                        // 7 digits here. It may cause some kind of wrong behavior, which is
+                        // unavoidable anyway in very rare cases..
+                        final int length = normalizedNumber.length();
+                        final String key = length > 7
+                                ? normalizedNumber.substring(length - 7, length)
+                                        : normalizedNumber;
+                        putNewEntryWhenAppropriate(
+                                newNumberToEntry, key, customRingtone, sendToVoicemail);
+                    }
+                }
+
+                if (VDBG) {
+                    Log.d(LOG_TAG, "New cache size: " + newNumberToEntry.size());
+                    for (Entry<String, CacheEntry> entry : newNumberToEntry.entrySet()) {
+                        Log.d(LOG_TAG, "Number: " + entry.getKey() + " -> " + entry.getValue());
+                    }
+                }
+
+                mNumberToEntry = newNumberToEntry;
+
+                if (DBG) {
+                    log("Caching entries are done. Total: " + newNumberToEntry.size());
+                }
+            } else {
+                // Let's just wait for the next refresh..
+                //
+                // If the cursor became null at that exact moment, probably we don't want to
+                // drop old cache. Also the case is fairly rare in usual cases unless acore being
+                // killed, so we don't take care much of this case.
+                Log.w(LOG_TAG, "cursor is null");
+            }
+        } finally {
+            if (cursor != null) {
+                cursor.close();
+            }
+        }
+
+        if (VDBG) log("refreshCacheEntry() ended");
+    }
+
+    private void putNewEntryWhenAppropriate(HashMap<String, CacheEntry> newNumberToEntry,
+            String numberOrSipAddress, String customRingtone, boolean sendToVoicemail) {
+        if (newNumberToEntry.containsKey(numberOrSipAddress)) {
+            // There may be duplicate entries here and we should prioritize
+            // "send-to-voicemail" flag in any case.
+            final CacheEntry entry = newNumberToEntry.get(numberOrSipAddress);
+            if (!entry.sendToVoicemail && sendToVoicemail) {
+                newNumberToEntry.put(numberOrSipAddress,
+                        new CacheEntry(customRingtone, sendToVoicemail));
+            }
+        } else {
+            newNumberToEntry.put(numberOrSipAddress,
+                    new CacheEntry(customRingtone, sendToVoicemail));
+        }
+    }
+
+    /**
+     * Returns CacheEntry for the given number (PSTN number or SIP address).
+     *
+     * @param number OK to be unformatted.
+     * @return CacheEntry to be used. Maybe null if there's no cache here. Note that this may
+     * return null when the cache itself is not ready. BE CAREFUL. (or might be better to throw
+     * an exception)
+     */
+    public CacheEntry getCacheEntry(String number) {
+        if (mNumberToEntry == null) {
+            // Very unusual state. This implies the cache isn't ready during the request, while
+            // it should be prepared on the boot time (i.e. a way before even the first request).
+            Log.w(LOG_TAG, "Fallback cache isn't ready.");
+            return null;
+        }
+
+        CacheEntry entry;
+        if (PhoneNumberUtils.isUriNumber(number)) {
+            if (VDBG) log("Trying to lookup " + number);
+
+            entry = mNumberToEntry.get(number);
+        } else {
+            final String normalizedNumber = PhoneNumberUtils.normalizeNumber(number);
+            final int length = normalizedNumber.length();
+            final String key =
+                    (length > 7 ? normalizedNumber.substring(length - 7, length)
+                            : normalizedNumber);
+            if (VDBG) log("Trying to lookup " + key);
+
+            entry = mNumberToEntry.get(key);
+        }
+        if (VDBG) log("Obtained " + entry);
+        return entry;
+    }
+
+    private static void log(String msg) {
+        Log.d(LOG_TAG, msg);
+    }
+}
diff --git a/src/com/android/phone/CallerInfoCacheUpdateReceiver.java b/src/com/android/phone/CallerInfoCacheUpdateReceiver.java
new file mode 100644
index 000000000..5d609476e
--- /dev/null
+++ b/src/com/android/phone/CallerInfoCacheUpdateReceiver.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2012 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.phone;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.SystemProperties;
+import android.util.Log;
+
+/**
+ * BroadcastReceiver responsible for (periodic) update of {@link CallerInfoCache}.
+ *
+ * This broadcast can be sent from Contacts edit screen, implying relevant settings have changed
+ * and the cache may become obsolete.
+ */
+public class CallerInfoCacheUpdateReceiver extends BroadcastReceiver {
+    private static final String LOG_TAG = CallerInfoCacheUpdateReceiver.class.getSimpleName();
+    private static final boolean DBG =
+            (PhoneApp.DBG_LEVEL >= 1) && (SystemProperties.getInt("ro.debuggable", 0) == 1);
+
+    public static final String ACTION_UPDATE_CALLER_INFO_CACHE =
+            "com.android.phone.UPDATE_CALLER_INFO_CACHE";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (DBG) log("CallerInfoCacheUpdateReceiver#onReceive(). Intent: " + intent);
+        PhoneApp.getInstance().callerInfoCache.startAsyncCache();
+    }
+
+    private static void log(String msg) {
+        Log.d(LOG_TAG, msg);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/CdmaSubscriptionListPreference.java b/src/com/android/phone/CdmaSubscriptionListPreference.java
index c45a6b32b..43d3c0bf7 100644
--- a/src/com/android/phone/CdmaSubscriptionListPreference.java
+++ b/src/com/android/phone/CdmaSubscriptionListPreference.java
@@ -102,7 +102,7 @@ protected void onDialogClosed(boolean positiveResult) {
 
     private class CdmaSubscriptionButtonHandler extends Handler {
 
-        private static final int MESSAGE_SET_CDMA_SUBSCRIPTION = 0;
+        static final int MESSAGE_SET_CDMA_SUBSCRIPTION = 0;
 
         @Override
         public void handleMessage(Message msg) {
diff --git a/src/com/android/phone/CdmaSystemSelectListPreference.java b/src/com/android/phone/CdmaSystemSelectListPreference.java
index 70e6071c5..5a6259a91 100644
--- a/src/com/android/phone/CdmaSystemSelectListPreference.java
+++ b/src/com/android/phone/CdmaSystemSelectListPreference.java
@@ -33,10 +33,10 @@
 public class CdmaSystemSelectListPreference extends ListPreference {
 
     private static final String LOG_TAG = "CdmaRoamingListPreference";
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
 
     private Phone mPhone;
-    private MyHandler mHandler = new MyHandler();;
+    private MyHandler mHandler = new MyHandler();
 
     public CdmaSystemSelectListPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -71,21 +71,15 @@ protected void onDialogClosed(boolean positiveResult) {
                     Secure.getInt(mPhone.getContext().getContentResolver(),
                     Secure.CDMA_ROAMING_MODE, Phone.CDMA_RM_HOME);
             if (buttonCdmaRoamingMode != settingsCdmaRoamingMode) {
-                int statusCdmaRoamingMode;
-                switch(buttonCdmaRoamingMode) {
-                    case Phone.CDMA_RM_ANY:
-                        statusCdmaRoamingMode = Phone.CDMA_RM_ANY;
-                        break;
-                    case Phone.CDMA_RM_HOME:
-                    default:
-                        statusCdmaRoamingMode = Phone.CDMA_RM_HOME;
-                }
                 //Set the Settings.Secure network mode
                 Secure.putInt(mPhone.getContext().getContentResolver(),
                         Secure.CDMA_ROAMING_MODE,
                         buttonCdmaRoamingMode );
                 //Set the roaming preference mode
-                mPhone.setCdmaRoamingPreference(statusCdmaRoamingMode, mHandler
+                // Note: buttonCdmaRoamingMode was previously vetted against the
+                // device-specific cdma_system_select_values list, and so doesn't need to
+                // be coerced again here.
+                mPhone.setCdmaRoamingPreference(buttonCdmaRoamingMode, mHandler
                         .obtainMessage(MyHandler.MESSAGE_SET_ROAMING_PREFERENCE));
             }
         } else {
@@ -96,8 +90,8 @@ protected void onDialogClosed(boolean positiveResult) {
 
     private class MyHandler extends Handler {
 
-        private static final int MESSAGE_GET_ROAMING_PREFERENCE = 0;
-        private static final int MESSAGE_SET_ROAMING_PREFERENCE = 1;
+        static final int MESSAGE_GET_ROAMING_PREFERENCE = 0;
+        static final int MESSAGE_SET_ROAMING_PREFERENCE = 1;
 
         @Override
         public void handleMessage(Message msg) {
@@ -120,9 +114,16 @@ private void handleQueryCdmaRoamingPreference(Message msg) {
                 int settingsRoamingMode = Secure.getInt(
                         mPhone.getContext().getContentResolver(),
                         Secure.CDMA_ROAMING_MODE, Phone.CDMA_RM_HOME);
-                //check that statusCdmaRoamingMode is from an accepted value
-                if (statusCdmaRoamingMode == Phone.CDMA_RM_HOME ||
-                        statusCdmaRoamingMode == Phone.CDMA_RM_ANY ) {
+
+                // Ensure that statusCdmaRoamingMode is a value that appears in the
+                // cdma_system_select_values list.  Note that this check used to be
+                // hardcoded against Phone.CDMA_RM_HOME and Phone.CDMA_RM_ANY, however,
+                // some devices (e.g., epicmtd) have radios that support additional roaming
+                // options which should be specified in an overlay .xml file.  Should the
+                // radio report an option that's _not_ present in that list, fall back to
+                // the default roaming mode so that the user doesn't operate in a mode he
+                // can't verify.
+                if (findIndexOfValue(Integer.toString(statusCdmaRoamingMode)) != -1) {
                     //check changes in statusCdmaRoamingMode and updates settingsRoamingMode
                     if (statusCdmaRoamingMode != settingsRoamingMode) {
                         settingsRoamingMode = statusCdmaRoamingMode;
diff --git a/src/com/android/phone/CdmaVoicePrivacyCheckBoxPreference.java b/src/com/android/phone/CdmaVoicePrivacyCheckBoxPreference.java
index 1ef8f9b8b..6439c6721 100644
--- a/src/com/android/phone/CdmaVoicePrivacyCheckBoxPreference.java
+++ b/src/com/android/phone/CdmaVoicePrivacyCheckBoxPreference.java
@@ -60,8 +60,8 @@ protected void onClick() {
 
 
     private class MyHandler extends Handler {
-        private static final int MESSAGE_GET_VP = 0;
-        private static final int MESSAGE_SET_VP = 1;
+        static final int MESSAGE_GET_VP = 0;
+        static final int MESSAGE_SET_VP = 1;
 
         @Override
         public void handleMessage(Message msg) {
diff --git a/src/com/android/phone/CellBroadcastSms.java b/src/com/android/phone/CellBroadcastSms.java
index b9c6ae8c4..296fb69c0 100644
--- a/src/com/android/phone/CellBroadcastSms.java
+++ b/src/com/android/phone/CellBroadcastSms.java
@@ -39,7 +39,7 @@ public class CellBroadcastSms extends PreferenceActivity
         implements Preference.OnPreferenceChangeListener{
     // debug data
     private static final String LOG_TAG = "CellBroadcastSms";
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
 
     //String keys for preference lookup
     private static final String BUTTON_ENABLE_DISABLE_BC_SMS_KEY =
@@ -85,7 +85,7 @@ public class CellBroadcastSms extends PreferenceActivity
         "button_national_general_news";
     private static final String BUTTON_INTERNATIONAL_GENERAL_NEWS_KEY =
         "button_international_general_news";
-    
+
     private static final String BUTTON_LOCAL_BF_NEWS_KEY =
         "button_local_bf_news";
     private static final String BUTTON_REGIONAL_BF_NEWS_KEY =
@@ -94,7 +94,7 @@ public class CellBroadcastSms extends PreferenceActivity
         "button_national_bf_news";
     private static final String BUTTON_INTERNATIONAL_BF_NEWS_KEY =
         "button_international_bf_news";
-    
+
     private static final String BUTTON_LOCAL_SPORTS_NEWS_KEY =
         "button_local_sports_news";
     private static final String BUTTON_REGIONAL_SPORTS_NEWS_KEY =
@@ -103,7 +103,7 @@ public class CellBroadcastSms extends PreferenceActivity
         "button_national_sports_news";
     private static final String BUTTON_INTERNATIONAL_SPORTS_NEWS_KEY =
         "button_international_sports_news";
-    
+
     private static final String BUTTON_LOCAL_ENTERTAINMENT_NEWS_KEY =
         "button_local_entertainment_news";
     private static final String BUTTON_REGIONAL_ENTERTAINMENT_NEWS_KEY =
@@ -126,9 +126,9 @@ public class CellBroadcastSms extends PreferenceActivity
 
     //UI objects
     private CheckBoxPreference mButtonBcSms;
-    
+
     private ListPreference mListLanguage;
-    
+
     private CheckBoxPreference mButtonEmergencyBroadcast;
     private CheckBoxPreference mButtonAdministrative;
     private CheckBoxPreference mButtonMaintenance;
@@ -149,29 +149,29 @@ public class CellBroadcastSms extends PreferenceActivity
     private CheckBoxPreference mButtonRegional1;
     private CheckBoxPreference mButtonNational1;
     private CheckBoxPreference mButtonInternational1;
-    
+
     private CheckBoxPreference mButtonLocal2;
     private CheckBoxPreference mButtonRegional2;
     private CheckBoxPreference mButtonNational2;
     private CheckBoxPreference mButtonInternational2;
-    
+
     private CheckBoxPreference mButtonLocal3;
     private CheckBoxPreference mButtonRegional3;
     private CheckBoxPreference mButtonNational3;
     private CheckBoxPreference mButtonInternational3;
-    
+
     private CheckBoxPreference mButtonLocal4;
     private CheckBoxPreference mButtonRegional4;
     private CheckBoxPreference mButtonNational4;
     private CheckBoxPreference mButtonInternational4;
-    
-    
+
+
     //Member variables
     private Phone mPhone;
     private MyHandler mHandler;
 
-    /** 
-     * Invoked on each preference click in this hierarchy, overrides 
+    /**
+     * Invoked on each preference click in this hierarchy, overrides
      * PreferenceActivity's implementation.  Used to make sure we track the
      * preference click events.
      */
@@ -320,7 +320,7 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen,
 
         return true;
     }
-    
+
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         if (preference == mListLanguage) {
             // set the new language to the array which will be transmitted later
@@ -378,7 +378,7 @@ public void onCreate(Bundle icicle) {
                 BUTTON_TECHNOLOGY_NEWS_KEY);
         mButtonMultiCategory = (CheckBoxPreference) prefSet.findPreference(
                 BUTTON_MULTI_CATEGORY_KEY);
-        
+
         mButtonLocal1 = (CheckBoxPreference) prefSet.findPreference(
                 BUTTON_LOCAL_GENERAL_NEWS_KEY);
         mButtonRegional1 = (CheckBoxPreference) prefSet.findPreference(
@@ -387,7 +387,7 @@ public void onCreate(Bundle icicle) {
                 BUTTON_NATIONAL_GENERAL_NEWS_KEY);
         mButtonInternational1 = (CheckBoxPreference) prefSet.findPreference(
                 BUTTON_INTERNATIONAL_GENERAL_NEWS_KEY);
-        
+
         mButtonLocal2 = (CheckBoxPreference) prefSet.findPreference(
                 BUTTON_LOCAL_BF_NEWS_KEY);
         mButtonRegional2 = (CheckBoxPreference) prefSet.findPreference(
@@ -396,7 +396,7 @@ public void onCreate(Bundle icicle) {
                 BUTTON_NATIONAL_BF_NEWS_KEY);
         mButtonInternational2 = (CheckBoxPreference) prefSet.findPreference(
                 BUTTON_INTERNATIONAL_BF_NEWS_KEY);
-        
+
         mButtonLocal3 = (CheckBoxPreference) prefSet.findPreference(
                 BUTTON_LOCAL_SPORTS_NEWS_KEY);
         mButtonRegional3 = (CheckBoxPreference) prefSet.findPreference(
@@ -405,7 +405,7 @@ public void onCreate(Bundle icicle) {
                 BUTTON_NATIONAL_SPORTS_NEWS_KEY);
         mButtonInternational3 = (CheckBoxPreference) prefSet.findPreference(
                 BUTTON_INTERNATIONAL_SPORTS_NEWS_KEY);
-        
+
         mButtonLocal4 = (CheckBoxPreference) prefSet.findPreference(
                 BUTTON_LOCAL_ENTERTAINMENT_NEWS_KEY);
         mButtonRegional4 = (CheckBoxPreference) prefSet.findPreference(
@@ -425,7 +425,7 @@ protected void onResume() {
         int settingCbSms = android.provider.Settings.Secure.getInt(
                 mPhone.getContext().getContentResolver(),
                 android.provider.Settings.Secure.CDMA_CELL_BROADCAST_SMS,
-                RILConstants.CDMA_CELL_BROADCAST_SMS_DISABLED);            
+                RILConstants.CDMA_CELL_BROADCAST_SMS_DISABLED);
         mButtonBcSms.setChecked(settingCbSms == RILConstants.CDMA_CELL_BROADCAST_SMS_ENABLED);
 
         if(mButtonBcSms.isChecked()) {
@@ -464,28 +464,28 @@ private void enableDisableAllCbConfigButtons(boolean enable) {
         mButtonMhh.setEnabled(enable);
         mButtonTechnologyNews.setEnabled(enable);
         mButtonMultiCategory.setEnabled(enable);
-        
+
         mButtonLocal1.setEnabled(enable);
         mButtonRegional1.setEnabled(enable);
         mButtonNational1.setEnabled(enable);
         mButtonInternational1.setEnabled(enable);
-        
+
         mButtonLocal2.setEnabled(enable);
         mButtonRegional2.setEnabled(enable);
         mButtonNational2.setEnabled(enable);
         mButtonInternational2.setEnabled(enable);
-        
+
         mButtonLocal3.setEnabled(enable);
         mButtonRegional3.setEnabled(enable);
         mButtonNational3.setEnabled(enable);
         mButtonInternational3.setEnabled(enable);
-        
+
         mButtonLocal4.setEnabled(enable);
         mButtonRegional4.setEnabled(enable);
         mButtonNational4.setEnabled(enable);
         mButtonInternational4.setEnabled(enable);
     }
-    
+
     private void setAllCbConfigButtons(int[] configArray) {
         //These buttons are in a well defined sequence. If you want to change it,
         //be sure to map the buttons to their corresponding slot in the configArray !
@@ -588,7 +588,7 @@ private static void setCbSmsConfig(int[] configData) {
                 Log.e(LOG_TAG, "Error! Wrong number of service categories returned from RIL");
                 return;
             }
-            
+
             //The required config values for broadcast SMS are stored in a C struct:
             //
             //  typedef struct {
@@ -608,11 +608,11 @@ private static void setCbSmsConfig(int[] configData) {
             for(int i = 1; i < configData.length; i += NO_OF_INTS_STRUCT_1) {
                 mBSelected[configData[i]] = configData[i +2];
             }
-            
+
             //Store all values in an extra array
             mConfigDataComplete = configData;
         }
-        
+
         private static void setCbSmsBSelectedValue(boolean value, int pos) {
             if(pos < mBSelected.length) {
                 mBSelected[pos] = (value == true ? 1 : 0);
@@ -620,22 +620,22 @@ private static void setCbSmsBSelectedValue(boolean value, int pos) {
                 Log.e(LOG_TAG,"Error! Invalid value position.");
             }
         }
-        
+
         private static int[] getCbSmsBselectedValues() {
             return(mBSelected);
         }
-        
+
         // TODO: Change the return value to a RIL_BroadcastSMSConfig
         private static int[] getCbSmsAllValues() {
             return(mConfigDataComplete);
         }
-        
+
         private static void setCbSmsNoOfStructs(int value) {
             //Sets the size parameter, which contains the number of structs
             //that will be transmitted
             mConfigDataComplete[0] = value;
         }
-        
+
         private static void setConfigDataCompleteBSelected(boolean value, int serviceCategory) {
             //Sets the bSelected value for a specific serviceCategory
             for(int i = 1; i < mConfigDataComplete.length; i += NO_OF_INTS_STRUCT_1) {
@@ -645,18 +645,18 @@ private static void setConfigDataCompleteBSelected(boolean value, int serviceCat
                 }
             }
         }
-        
+
         private static void setConfigDataCompleteLanguage(int language) {
-            //It is only possible to set the same language for all entries 
+            //It is only possible to set the same language for all entries
             for(int i = 2; i < mConfigDataComplete.length; i += NO_OF_INTS_STRUCT_1) {
                 mConfigDataComplete[i] = language;
             }
         }
-        
+
         private static int getConfigDataLanguage() {
             int language = mConfigDataComplete[2];
             //2 is the language value of the first entry
-            //It is only possible to set the same language for all entries 
+            //It is only possible to set the same language for all entries
             if (language < 1 || language > 7) {
                 Log.e(LOG_TAG, "Error! Wrong language returned from RIL...defaulting to 1, english");
                 return 1;
diff --git a/src/com/android/phone/ClearMissedCallsService.java b/src/com/android/phone/ClearMissedCallsService.java
index 288f68ef2..c9608b8f3 100644
--- a/src/com/android/phone/ClearMissedCallsService.java
+++ b/src/com/android/phone/ClearMissedCallsService.java
@@ -47,6 +47,7 @@ protected void onHandleIntent(Intent intent) {
             // Clear the list of new missed calls.
             ContentValues values = new ContentValues();
             values.put(Calls.NEW, 0);
+            values.put(Calls.IS_READ, 1);
             StringBuilder where = new StringBuilder();
             where.append(Calls.NEW);
             where.append(" = 1 AND ");
diff --git a/src/com/android/phone/ContactsAsyncHelper.java b/src/com/android/phone/ContactsAsyncHelper.java
new file mode 100644
index 000000000..445eba758
--- /dev/null
+++ b/src/com/android/phone/ContactsAsyncHelper.java
@@ -0,0 +1,342 @@
+/*
+ * 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.
+ */
+
+package com.android.phone;
+
+import android.app.Notification;
+import android.content.ContentUris;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
+import android.provider.ContactsContract.Contacts;
+import android.util.Log;
+
+import com.android.internal.telephony.CallerInfo;
+import com.android.internal.telephony.Connection;
+
+import java.io.InputStream;
+
+/**
+ * Helper class for loading contacts photo asynchronously.
+ */
+public class ContactsAsyncHelper {
+
+    private static final boolean DBG = false;
+    private static final String LOG_TAG = "ContactsAsyncHelper";
+
+    /**
+     * Interface for a WorkerHandler result return.
+     */
+    public interface OnImageLoadCompleteListener {
+        /**
+         * Called when the image load is complete.
+         *
+         * @param token Integer passed in {@link ContactsAsyncHelper#startObtainPhotoAsync(int,
+         * Context, Uri, OnImageLoadCompleteListener, Object)}.
+         * @param photo Drawable object obtained by the async load.
+         * @param photoIcon Bitmap object obtained by the async load.
+         * @param cookie Object passed in {@link ContactsAsyncHelper#startObtainPhotoAsync(int,
+         * Context, Uri, OnImageLoadCompleteListener, Object)}. Can be null iff. the original
+         * cookie is null.
+         */
+        public void onImageLoadComplete(int token, Drawable photo, Bitmap photoIcon,
+                Object cookie);
+    }
+
+    // constants
+    private static final int EVENT_LOAD_IMAGE = 1;
+
+    private final Handler mResultHandler = new Handler() {
+        /** Called when loading is done. */
+        @Override
+        public void handleMessage(Message msg) {
+            WorkerArgs args = (WorkerArgs) msg.obj;
+            switch (msg.arg1) {
+                case EVENT_LOAD_IMAGE:
+                    if (args.listener != null) {
+                        if (DBG) {
+                            Log.d(LOG_TAG, "Notifying listener: " + args.listener.toString() +
+                                    " image: " + args.uri + " completed");
+                        }
+                        args.listener.onImageLoadComplete(msg.what, args.photo, args.photoIcon,
+                                args.cookie);
+                    }
+                    break;
+                default:
+            }
+        }
+    };
+
+    /** Handler run on a worker thread to load photo asynchronously. */
+    private static Handler sThreadHandler;
+
+    /** For forcing the system to call its constructor */
+    @SuppressWarnings("unused")
+    private static ContactsAsyncHelper sInstance;
+
+    static {
+        sInstance = new ContactsAsyncHelper();
+    }
+
+    private static final class WorkerArgs {
+        public Context context;
+        public Uri uri;
+        public Drawable photo;
+        public Bitmap photoIcon;
+        public Object cookie;
+        public OnImageLoadCompleteListener listener;
+    }
+
+    /**
+     * public inner class to help out the ContactsAsyncHelper callers
+     * with tracking the state of the CallerInfo Queries and image
+     * loading.
+     *
+     * Logic contained herein is used to remove the race conditions
+     * that exist as the CallerInfo queries run and mix with the image
+     * loads, which then mix with the Phone state changes.
+     */
+    public static class ImageTracker {
+
+        // Image display states
+        public static final int DISPLAY_UNDEFINED = 0;
+        public static final int DISPLAY_IMAGE = -1;
+        public static final int DISPLAY_DEFAULT = -2;
+
+        // State of the image on the imageview.
+        private CallerInfo mCurrentCallerInfo;
+        private int displayMode;
+
+        public ImageTracker() {
+            mCurrentCallerInfo = null;
+            displayMode = DISPLAY_UNDEFINED;
+        }
+
+        /**
+         * Used to see if the requested call / connection has a
+         * different caller attached to it than the one we currently
+         * have in the CallCard.
+         */
+        public boolean isDifferentImageRequest(CallerInfo ci) {
+            // note, since the connections are around for the lifetime of the
+            // call, and the CallerInfo-related items as well, we can
+            // definitely use a simple != comparison.
+            return (mCurrentCallerInfo != ci);
+        }
+
+        public boolean isDifferentImageRequest(Connection connection) {
+            // if the connection does not exist, see if the
+            // mCurrentCallerInfo is also null to match.
+            if (connection == null) {
+                if (DBG) Log.d(LOG_TAG, "isDifferentImageRequest: connection is null");
+                return (mCurrentCallerInfo != null);
+            }
+            Object o = connection.getUserData();
+
+            // if the call does NOT have a callerInfo attached
+            // then it is ok to query.
+            boolean runQuery = true;
+            if (o instanceof CallerInfo) {
+                runQuery = isDifferentImageRequest((CallerInfo) o);
+            }
+            return runQuery;
+        }
+
+        /**
+         * Simple setter for the CallerInfo object.
+         */
+        public void setPhotoRequest(CallerInfo ci) {
+            mCurrentCallerInfo = ci;
+        }
+
+        /**
+         * Convenience method used to retrieve the URI
+         * representing the Photo file recorded in the attached
+         * CallerInfo Object.
+         */
+        public Uri getPhotoUri() {
+            if (mCurrentCallerInfo != null) {
+                return ContentUris.withAppendedId(Contacts.CONTENT_URI,
+                        mCurrentCallerInfo.person_id);
+            }
+            return null;
+        }
+
+        /**
+         * Simple setter for the Photo state.
+         */
+        public void setPhotoState(int state) {
+            displayMode = state;
+        }
+
+        /**
+         * Simple getter for the Photo state.
+         */
+        public int getPhotoState() {
+            return displayMode;
+        }
+    }
+
+    /**
+     * Thread worker class that handles the task of opening the stream and loading
+     * the images.
+     */
+    private class WorkerHandler extends Handler {
+        public WorkerHandler(Looper looper) {
+            super(looper);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            WorkerArgs args = (WorkerArgs) msg.obj;
+
+            switch (msg.arg1) {
+                case EVENT_LOAD_IMAGE:
+                    InputStream inputStream = null;
+                    try {
+                        inputStream = Contacts.openContactPhotoInputStream(
+                                args.context.getContentResolver(), args.uri, true);
+                    } catch (Exception e) {
+                        Log.e(LOG_TAG, "Error opening photo input stream", e);
+                    }
+
+                    if (inputStream != null) {
+                        args.photo = Drawable.createFromStream(inputStream, args.uri.toString());
+
+                        // This assumes Drawable coming from contact database is usually
+                        // BitmapDrawable and thus we can have (down)scaled version of it.
+                        args.photoIcon = getPhotoIconWhenAppropriate(args.context, args.photo);
+
+                        if (DBG) Log.d(LOG_TAG, "Loading image: " + msg.arg1 +
+                                " token: " + msg.what + " image URI: " + args.uri);
+                    } else {
+                        args.photo = null;
+                        args.photoIcon = null;
+                        if (DBG) Log.d(LOG_TAG, "Problem with image: " + msg.arg1 +
+                                " token: " + msg.what + " image URI: " + args.uri +
+                                ", using default image.");
+                    }
+                    break;
+                default:
+            }
+
+            // send the reply to the enclosing class.
+            Message reply = ContactsAsyncHelper.this.mResultHandler.obtainMessage(msg.what);
+            reply.arg1 = msg.arg1;
+            reply.obj = msg.obj;
+            reply.sendToTarget();
+        }
+
+        /**
+         * Returns a Bitmap object suitable for {@link Notification}'s large icon. This might
+         * return null when the given Drawable isn't BitmapDrawable, or if the system fails to
+         * create a scaled Bitmap for the Drawable.
+         */
+        private Bitmap getPhotoIconWhenAppropriate(Context context, Drawable photo) {
+            if (!(photo instanceof BitmapDrawable)) {
+                return null;
+            }
+            int iconSize = context.getResources()
+                    .getDimensionPixelSize(R.dimen.notification_icon_size);
+            Bitmap orgBitmap = ((BitmapDrawable) photo).getBitmap();
+            int orgWidth = orgBitmap.getWidth();
+            int orgHeight = orgBitmap.getHeight();
+            int longerEdge = orgWidth > orgHeight ? orgWidth : orgHeight;
+            // We want downscaled one only when the original icon is too big.
+            if (longerEdge > iconSize) {
+                float ratio = ((float) longerEdge) / iconSize;
+                int newWidth = (int) (orgWidth / ratio);
+                int newHeight = (int) (orgHeight / ratio);
+                // If the longer edge is much longer than the shorter edge, the latter may
+                // become 0 which will cause a crash.
+                if (newWidth <= 0 || newHeight <= 0) {
+                    Log.w(LOG_TAG, "Photo icon's width or height become 0.");
+                    return null;
+                }
+
+                // It is sure ratio >= 1.0f in any case and thus the newly created Bitmap
+                // should be smaller than the original.
+                return Bitmap.createScaledBitmap(orgBitmap, newWidth, newHeight, true);
+            } else {
+                return orgBitmap;
+            }
+        }
+    }
+
+    /**
+     * Private constructor for static class
+     */
+    private ContactsAsyncHelper() {
+        HandlerThread thread = new HandlerThread("ContactsAsyncWorker");
+        thread.start();
+        sThreadHandler = new WorkerHandler(thread.getLooper());
+    }
+
+    /**
+     * Starts an asynchronous image load. After finishing the load,
+     * {@link OnImageLoadCompleteListener#onImageLoadComplete(int, Drawable, Bitmap, Object)}
+     * will be called.
+     *
+     * @param token Arbitrary integer which will be returned as the first argument of
+     * {@link OnImageLoadCompleteListener#onImageLoadComplete(int, Drawable, Bitmap, Object)}
+     * @param context Context object used to do the time-consuming operation.
+     * @param personUri Uri to be used to fetch the photo
+     * @param listener Callback object which will be used when the asynchronous load is done.
+     * Can be null, which means only the asynchronous load is done while there's no way to
+     * obtain the loaded photos.
+     * @param cookie Arbitrary object the caller wants to remember, which will become the
+     * fourth argument of {@link OnImageLoadCompleteListener#onImageLoadComplete(int, Drawable,
+     * Bitmap, Object)}. Can be null, at which the callback will also has null for the argument.
+     */
+    public static final void startObtainPhotoAsync(int token, Context context, Uri personUri,
+            OnImageLoadCompleteListener listener, Object cookie) {
+        // in case the source caller info is null, the URI will be null as well.
+        // just update using the placeholder image in this case.
+        if (personUri == null) {
+            Log.wtf(LOG_TAG, "Uri is missing");
+            return;
+        }
+
+        // Added additional Cookie field in the callee to handle arguments
+        // sent to the callback function.
+
+        // setup arguments
+        WorkerArgs args = new WorkerArgs();
+        args.cookie = cookie;
+        args.context = context;
+        args.uri = personUri;
+        args.listener = listener;
+
+        // setup message arguments
+        Message msg = sThreadHandler.obtainMessage(token);
+        msg.arg1 = EVENT_LOAD_IMAGE;
+        msg.obj = args;
+
+        if (DBG) Log.d(LOG_TAG, "Begin loading image: " + args.uri +
+                ", displaying default image for now.");
+
+        // notify the thread to begin working
+        sThreadHandler.sendMessage(msg);
+    }
+
+
+}
diff --git a/src/com/android/phone/DTMFTwelveKeyDialer.java b/src/com/android/phone/DTMFTwelveKeyDialer.java
old mode 100755
new mode 100644
index 4d5556ebe..c47b36641
--- a/src/com/android/phone/DTMFTwelveKeyDialer.java
+++ b/src/com/android/phone/DTMFTwelveKeyDialer.java
@@ -23,18 +23,19 @@
 import android.provider.Settings;
 import android.telephony.PhoneNumberUtils;
 import android.text.Editable;
-import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.method.DialerKeyListener;
-import android.text.method.MovementMethod;
+import android.text.style.RelativeSizeSpan;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewStub;
 import android.widget.EditText;
-import android.widget.TextView;
 
 import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.TelephonyCapabilities;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -55,7 +56,7 @@ public class DTMFTwelveKeyDialer implements View.OnTouchListener, View.OnKeyList
 
     private CallManager mCM;
     private ToneGenerator mToneGenerator;
-    private Object mToneGeneratorLock = new Object();
+    private final Object mToneGeneratorLock = new Object();
 
     // indicate if we want to enable the local tone playback.
     private boolean mLocalToneEnabled;
@@ -110,17 +111,36 @@ public class DTMFTwelveKeyDialer implements View.OnTouchListener, View.OnKeyList
         mDisplayMap.put(R.id.star, '*');
     }
 
-    // EditText field used to display the DTMF digits sent so far.
-    // Note this is null in some modes (like during the CDMA OTA call,
-    // where there's no onscreen "digits" display.)
+    /** EditText field used to display the DTMF digits sent so far.
+        Note this is null in some modes (like during the CDMA OTA call,
+        where there's no onscreen "digits" display.) */
     private EditText mDialpadDigits;
 
     // InCallScreen reference.
     private InCallScreen mInCallScreen;
 
-    // The DTMFTwelveKeyDialerView we use to display the dialpad.
+    /**
+     * The DTMFTwelveKeyDialerView we use to display the dialpad.
+     *
+     * Only one of mDialerView or mDialerStub will have a legitimate object; the other one will be
+     * null at that moment. Either of following scenarios will occur:
+     *
+     * - If the constructor with {@link DTMFTwelveKeyDialerView} is called, mDialerView will
+     *   obtain that object, and mDialerStub will be null. mDialerStub won't be used in this case.
+     *
+     * - If the constructor with {@link ViewStub} is called, mDialerView will be null at that
+     *   moment, and mDialerStub will obtain the ViewStub object.
+     *   When the dialer is required by the user (i.e. until {@link #openDialer(boolean)} being
+     *   called), mDialerStub will inflate the dialer, and make mDialerStub itself null.
+     *   mDialerStub won't be used afterward.
+     */
     private DTMFTwelveKeyDialerView mDialerView;
 
+    /**
+     * {@link ViewStub} holding {@link DTMFTwelveKeyDialerView}. See the comments for mDialerView.
+     */
+    private ViewStub mDialerStub;
+
     // KeyListener used with the "dialpad digits" EditText widget.
     private DTMFKeyListener mDialerKeyListener;
 
@@ -316,7 +336,7 @@ boolean isKeyEventAcceptable (KeyEvent event) {
     /**
      * Our own handler to take care of the messages from the phone state changes
      */
-    private Handler mHandler = new Handler() {
+    private final Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
@@ -339,13 +359,13 @@ public void handleMessage(Message msg) {
 
 
     /**
-     * DTMFTwelveKeyDialer constructor.
+     * DTMFTwelveKeyDialer constructor with {@link DTMFTwelveKeyDialerView}
      *
      * @param parent the InCallScreen instance that owns us.
      * @param dialerView the DTMFTwelveKeyDialerView we should use to display the dialpad.
      */
     public DTMFTwelveKeyDialer(InCallScreen parent,
-                               DTMFTwelveKeyDialerView dialerView) {
+                                DTMFTwelveKeyDialerView dialerView) {
         if (DBG) log("DTMFTwelveKeyDialer constructor... this = " + this);
 
         mInCallScreen = parent;
@@ -362,27 +382,58 @@ public DTMFTwelveKeyDialer(InCallScreen parent,
         if (DBG) log("- Got passed-in mDialerView: " + mDialerView);
 
         if (mDialerView != null) {
-            mDialerView.setDialer(this);
-
-            // In the normal in-call DTMF dialpad, mDialpadDigits is an
-            // EditText used to display the digits the user has typed so
-            // far.  But some other modes (like the OTA call) have no
-            // "digits" display at all, in which case mDialpadDigits will
-            // be null.
-            mDialpadDigits = (EditText) mDialerView.findViewById(R.id.dtmfDialerField);
-            if (mDialpadDigits != null) {
-                mDialerKeyListener = new DTMFKeyListener();
-                mDialpadDigits.setKeyListener(mDialerKeyListener);
+            setupDialerView();
+        }
+    }
 
-                // remove the long-press context menus that support
-                // the edit (copy / paste / select) functions.
-                mDialpadDigits.setLongClickable(false);
-            }
+    /**
+     * DTMFTwelveKeyDialer constructor with {@link ViewStub}.
+     *
+     * When the dialer is required for the first time (e.g. when {@link #openDialer(boolean)} is
+     * called), the object will inflate the ViewStub by itself, assuming the ViewStub will return
+     * {@link DTMFTwelveKeyDialerView} on {@link ViewStub#inflate()}.
+     *
+     * @param parent the InCallScreen instance that owns us.
+     * @param dialerStub ViewStub which will return {@link DTMFTwelveKeyDialerView} on
+     * {@link ViewStub#inflate()}.
+     */
+    public DTMFTwelveKeyDialer(InCallScreen parent, ViewStub dialerStub) {
+        if (DBG) log("DTMFTwelveKeyDialer constructor... this = " + this);
+
+        mInCallScreen = parent;
+        mCM = PhoneApp.getInstance().mCM;
+
+        mDialerStub = dialerStub;
+        if (DBG) log("- Got passed-in mDialerStub: " + mDialerStub);
+
+        // At this moment mDialerView is still null. We delay calling setupDialerView().
+    }
 
-            // Hook up touch / key listeners for the buttons in the onscreen
-            // keypad.
-            setupKeypad(mDialerView);
+    /**
+     * Prepare the dialer view and relevant variables.
+     */
+    private void setupDialerView() {
+        if (DBG) log("setupDialerView()");
+        mDialerView.setDialer(this);
+
+        // In the normal in-call DTMF dialpad, mDialpadDigits is an
+        // EditText used to display the digits the user has typed so
+        // far.  But some other modes (like the OTA call) have no
+        // "digits" display at all, in which case mDialpadDigits will
+        // be null.
+        mDialpadDigits = (EditText) mDialerView.findViewById(R.id.dtmfDialerField);
+        if (mDialpadDigits != null) {
+            mDialerKeyListener = new DTMFKeyListener();
+            mDialpadDigits.setKeyListener(mDialerKeyListener);
+
+            // remove the long-press context menus that support
+            // the edit (copy / paste / select) functions.
+            mDialpadDigits.setLongClickable(false);
         }
+
+        // Hook up touch / key listeners for the buttons in the onscreen
+        // keypad.
+        setupKeypad(mDialerView);
     }
 
     /**
@@ -407,7 +458,7 @@ public DTMFTwelveKeyDialer(InCallScreen parent,
      * Dialer code that runs when the dialer is brought up.
      * This includes layout changes, etc, and just prepares the dialer model for use.
      */
-    private void onDialerOpen() {
+    private void onDialerOpen(boolean animate) {
         if (DBG) log("onDialerOpen()...");
 
         // Any time the dialer is open, listen for "disconnect" events (so
@@ -419,7 +470,11 @@ private void onDialerOpen() {
         PhoneApp.getInstance().updateWakeState();
 
         // Give the InCallScreen a chance to do any necessary UI updates.
-        mInCallScreen.onDialerOpen();
+        if (mInCallScreen != null) {
+            mInCallScreen.onDialerOpen(animate);
+        } else {
+            Log.e(LOG_TAG, "InCallScreen object was null during onDialerOpen()");
+        }
     }
 
     /**
@@ -467,7 +522,7 @@ public void startDialerSession() {
      * Dialer code that runs when the dialer is closed.
      * This releases resources acquired when we start the dialer.
      */
-    private void onDialerClose() {
+    private void onDialerClose(boolean animate) {
         if (DBG) log("onDialerClose()...");
 
         // reset back to a short delay for the poke lock.
@@ -478,7 +533,9 @@ private void onDialerClose() {
 
         // Give the InCallScreen a chance to do any necessary UI updates.
         if (mInCallScreen != null) {
-            mInCallScreen.onDialerClose();
+            mInCallScreen.onDialerClose(animate);
+        } else {
+            Log.e(LOG_TAG, "InCallScreen object was null during onDialerClose()");
         }
     }
 
@@ -504,7 +561,11 @@ public void stopDialerSession() {
      */
     public boolean onDialerKeyDown(KeyEvent event) {
         if (DBG) log("Notifying dtmf key down.");
-        return mDialerKeyListener.onKeyDown(event);
+        if (mDialerKeyListener != null) {
+            return mDialerKeyListener.onKeyDown(event);
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -512,7 +573,11 @@ public boolean onDialerKeyDown(KeyEvent event) {
      */
     public boolean onDialerKeyUp(KeyEvent event) {
         if (DBG) log("Notifying dtmf key up.");
-        return mDialerKeyListener.onKeyUp(event);
+        if (mDialerKeyListener != null) {
+            return mDialerKeyListener.onKeyUp(event);
+        } else {
+            return false;
+        }
     }
 
     /**
@@ -558,6 +623,7 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
     /**
      * Implemented for the TouchListener, process the touch events.
      */
+    @Override
     public boolean onTouch(View v, MotionEvent event) {
         int viewId = v.getId();
 
@@ -584,6 +650,7 @@ public boolean onTouch(View v, MotionEvent event) {
     /**
      * Implements View.OnKeyListener for the DTMF buttons.  Enables dialing with trackball/dpad.
      */
+    @Override
     public boolean onKey(View v, int keyCode, KeyEvent event) {
         // if (DBG) log("onKey:  keyCode " + keyCode + ", view " + v);
 
@@ -608,37 +675,63 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
     }
 
     /**
-     * @return true if the dialer is currently visible onscreen.
+     * Returns true if the dialer is in "open" state, meaning it is already visible *and* it
+     * isn't fading out. Note that during fade-out animation the View will return VISIBLE but
+     * will become GONE soon later, so you would want to use this method instead of
+     * {@link View#getVisibility()}.
+     *
+     * Fade-in animation, on the other hand, will set the View's visibility VISIBLE soon after
+     * the request, so we don't need to take care much of it. In other words,
+     * {@link #openDialer(boolean)} soon makes the visibility VISIBLE and thus this method will
+     * return true just after the method call.
+     *
+     * Note: during the very early stage of "open" state, users may not see the dialpad yet because
+     * of its fading-in animation, while they will see it shortly anyway. Similarly, during the
+     * early stage of "closed" state (opposite of "open" state), users may still see the dialpad
+     * due to fading-out animation, but it will vanish shortly and thus we can treat it as "closed",
+     * or "not open". To make the transition clearer, we call the state "open", not "shown" nor
+     * "visible".
      */
-    // TODO: clean up naming inconsistency of "opened" vs. "visible".
-    // This should be called isVisible(), and open/closeDialer() should
-    // be "show" and "hide".
     public boolean isOpened() {
         // Return whether or not the dialer view is visible.
         // (Note that if we're in the middle of a fade-out animation, that
         // also counts as "not visible" even though mDialerView itself is
         // technically still VISIBLE.)
-        return ((mDialerView.getVisibility() == View.VISIBLE)
-                && !CallCard.Fade.isFadingOut(mDialerView));
+        return (mDialerView != null
+                &&(mDialerView.getVisibility() == View.VISIBLE)
+                && !AnimationUtils.Fade.isFadingOut(mDialerView));
     }
 
     /**
      * Forces the dialer into the "open" state.
      * Does nothing if the dialer is already open.
      *
+     * The "open" state includes the state the dialer is fading in.
+     * {@link InCallScreen#onDialerOpen(boolean)} will change visibility state and do
+     * actual animation.
+     *
      * @param animate if true, open the dialer with an animation.
+     *
+     * @see #isOpened
      */
     public void openDialer(boolean animate) {
         if (DBG) log("openDialer()...");
 
+        if (mDialerView == null && mDialerStub != null) {
+            if (DBG) log("Dialer isn't ready. Inflate it from ViewStub.");
+            mDialerView = (DTMFTwelveKeyDialerView) mDialerStub.inflate();
+            setupDialerView();
+            mDialerStub = null;
+        }
+
         if (!isOpened()) {
             // Make the dialer view visible.
             if (animate) {
-                CallCard.Fade.show(mDialerView);
+                AnimationUtils.Fade.show(mDialerView);
             } else {
                 mDialerView.setVisibility(View.VISIBLE);
             }
-            onDialerOpen();
+            onDialerOpen(animate);
         }
     }
 
@@ -646,7 +739,12 @@ public void openDialer(boolean animate) {
      * Forces the dialer into the "closed" state.
      * Does nothing if the dialer is already closed.
      *
+     * {@link InCallScreen#onDialerOpen(boolean)} will change visibility state and do
+     * actual animation.
+     *
      * @param animate if true, close the dialer with an animation.
+     *
+     * @see #isOpened
      */
     public void closeDialer(boolean animate) {
         if (DBG) log("closeDialer()...");
@@ -654,11 +752,11 @@ public void closeDialer(boolean animate) {
         if (isOpened()) {
             // Hide the dialer view.
             if (animate) {
-                CallCard.Fade.hide(mDialerView, View.GONE);
+                AnimationUtils.Fade.hide(mDialerView, View.GONE);
             } else {
                 mDialerView.setVisibility(View.GONE);
             }
-            onDialerClose();
+            onDialerClose(animate);
         }
     }
 
@@ -729,6 +827,32 @@ public void clearDigits() {
         if (mDialpadDigits != null) {
             mDialpadDigits.setText("");
         }
+
+        setDialpadContext("");
+    }
+
+    /**
+     * Set the context text (hint) to show in the dialpad Digits EditText.
+     *
+     * This is currently only used for displaying a value for "Voice Mail"
+     * calls since they default to the dialpad and we want to give users better
+     * context when they dial voicemail.
+     *
+     * TODO: Is there value in extending this functionality for all contacts
+     * and not just Voice Mail calls?
+     * TODO: This should include setting the digits as well as the context
+     * once we start saving the digits properly...and properly in this case
+     * ideally means moving some of processDtmf() out of this class.
+     */
+    public void setDialpadContext(String contextValue) {
+        if (mDialpadDigits != null) {
+            if (contextValue == null) {
+              contextValue = "";
+            }
+            final SpannableString hint = new SpannableString(contextValue);
+            hint.setSpan(new RelativeSizeSpan(0.8f), 0, hint.length(), 0);
+            mDialpadDigits.setHint(hint);
+        }
     }
 
     /**
@@ -739,9 +863,14 @@ public void startTone(char c) {
         if (!mToneMap.containsKey(c)) {
             return;
         }
+
+        if (!mInCallScreen.okToDialDTMFTones()) {
+            return;
+        }
+
         // Read the settings as it may be changed by the user during the call
         Phone phone = mCM.getFgPhone();
-        mShortTone = TelephonyCapabilities.useShortDtmfTones(phone, phone.getContext());
+        mShortTone = PhoneUtils.useShortDtmfTones(phone, phone.getContext());
 
         if (DBG) log("startDtmfTone()...");
 
@@ -799,6 +928,9 @@ private static void log(String msg) {
      * Stops the local tone based on the phone type.
      */
     public void stopTone() {
+        // We do not rely on InCallScreen#okToDialDTMFTones() here since it is ok to stop tones
+        // without starting them.
+
         if (!mShortTone) {
             if (DBG) log("stopping remote tone.");
             mCM.stopDtmf();
@@ -839,7 +971,6 @@ private void sendShortDtmfToNetwork(char dtmfDigit) {
                 mDTMFQueue.add(new Character(dtmfDigit));
             } else {
                 String dtmfStr = Character.toString(dtmfDigit);
-                Log.i(LOG_TAG, "dtmfsent = " + dtmfStr);
                 mCM.sendBurstDtmf(dtmfStr, 0, 0, mHandler.obtainMessage(DTMF_SEND_CNF));
                 // Set flag to indicate wait for Telephony confirmation.
                 mDTMFBurstCnfPending = true;
diff --git a/src/com/android/phone/DefaultRingtonePreference.java b/src/com/android/phone/DefaultRingtonePreference.java
new file mode 100644
index 000000000..8205fd06a
--- /dev/null
+++ b/src/com/android/phone/DefaultRingtonePreference.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2012 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.phone;
+
+import android.content.Context;
+import android.content.Intent;
+import android.media.RingtoneManager;
+import android.net.Uri;
+import android.preference.RingtonePreference;
+import android.util.AttributeSet;
+
+/**
+ * RingtonePreference which doesn't show default ringtone setting.
+ *
+ * @see com.android.settings.DefaultRingtonePreference
+ */
+public class DefaultRingtonePreference extends RingtonePreference {
+    public DefaultRingtonePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onPrepareRingtonePickerIntent(Intent ringtonePickerIntent) {
+        super.onPrepareRingtonePickerIntent(ringtonePickerIntent);
+
+        /*
+         * Since this preference is for choosing the default ringtone, it
+         * doesn't make sense to show a 'Default' item.
+         */
+        ringtonePickerIntent.putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_DEFAULT, false);
+    }
+
+    @Override
+    protected void onSaveRingtone(Uri ringtoneUri) {
+        RingtoneManager.setActualDefaultRingtoneUri(getContext(), getRingtoneType(), ringtoneUri);
+    }
+
+    @Override
+    protected Uri onRestoreRingtone() {
+        return RingtoneManager.getActualDefaultRingtoneUri(getContext(), getRingtoneType());
+    }
+}
diff --git a/src/com/android/phone/DeleteFdnContactScreen.java b/src/com/android/phone/DeleteFdnContactScreen.java
index b030d8746..19b10c672 100644
--- a/src/com/android/phone/DeleteFdnContactScreen.java
+++ b/src/com/android/phone/DeleteFdnContactScreen.java
@@ -65,8 +65,7 @@ protected void onCreate(Bundle icicle) {
     }
 
     @Override
-    protected void onActivityResult(int requestCode, int resultCode,
-                                    Intent intent) {
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
         if (DBG) log("onActivityResult");
 
         switch (requestCode) {
@@ -150,6 +149,7 @@ private void handleResult(boolean success) {
         }
 
         mHandler.postDelayed(new Runnable() {
+            @Override
             public void run() {
                 finish();
             }
@@ -166,13 +166,15 @@ public QueryHandler(ContentResolver cr) {
         protected void onQueryComplete(int token, Object cookie, Cursor c) {
         }
 
-        protected void onInsertComplete(int token, Object cookie,
-                                        Uri uri) {
+        @Override
+        protected void onInsertComplete(int token, Object cookie, Uri uri) {
         }
 
+        @Override
         protected void onUpdateComplete(int token, Object cookie, int result) {
         }
 
+        @Override
         protected void onDeleteComplete(int token, Object cookie, int result) {
             if (DBG) log("onDeleteComplete");
             displayProgress(false);
diff --git a/src/com/android/phone/EditFdnContactScreen.java b/src/com/android/phone/EditFdnContactScreen.java
index 9c6c97e78..cdeae1932 100644
--- a/src/com/android/phone/EditFdnContactScreen.java
+++ b/src/com/android/phone/EditFdnContactScreen.java
@@ -31,6 +31,7 @@
 import android.os.Handler;
 import android.provider.Contacts.PeopleColumns;
 import android.provider.Contacts.PhonesColumns;
+import android.telephony.PhoneNumberUtils;
 import android.text.Selection;
 import android.text.Spannable;
 import android.text.TextUtils;
@@ -104,7 +105,7 @@ protected void onCreate(Bundle icicle) {
         setTitle(mAddContact ?
                 R.string.add_fdn_contact : R.string.edit_fdn_contact);
 
-        mDataBusy = false;
+        displayProgress(false);
     }
 
     /**
@@ -115,8 +116,7 @@ protected void onCreate(Bundle icicle) {
      * Also, process the results from the contact picker.
      */
     @Override
-    protected void onActivityResult(int requestCode, int resultCode,
-                                    Intent intent) {
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
         if (DBG) log("onActivityResult request:" + requestCode + " result:" + resultCode);
 
         switch (requestCode) {
@@ -261,6 +261,8 @@ private Uri getContentURI() {
     /**
       * @param number is voice mail number
       * @return true if number length is less than 20-digit limit
+      *
+      * TODO: Fix this logic.
       */
      private boolean isValidNumber(String number) {
          return (number.length() <= 20);
@@ -270,7 +272,9 @@ private boolean isValidNumber(String number) {
     private void addContact() {
         if (DBG) log("addContact");
 
-        if (!isValidNumber(getNumberFromTextField())) {
+        final String number = PhoneNumberUtils.convertAndStrip(getNumberFromTextField());
+
+        if (!isValidNumber(number)) {
             handleResult(false, true);
             return;
         }
@@ -279,10 +283,9 @@ private void addContact() {
 
         ContentValues bundle = new ContentValues(3);
         bundle.put("tag", getNameFromTextField());
-        bundle.put("number", getNumberFromTextField());
+        bundle.put("number", number);
         bundle.put("pin2", mPin2);
 
-
         mQueryHandler = new QueryHandler(getContentResolver());
         mQueryHandler.startInsert(0, null, uri, bundle);
         displayProgress(true);
@@ -292,7 +295,9 @@ private void addContact() {
     private void updateContact() {
         if (DBG) log("updateContact");
 
-        if (!isValidNumber(getNumberFromTextField())) {
+        final String number = PhoneNumberUtils.convertAndStrip(getNumberFromTextField());
+
+        if (!isValidNumber(number)) {
             handleResult(false, true);
             return;
         }
@@ -301,8 +306,8 @@ private void updateContact() {
         ContentValues bundle = new ContentValues();
         bundle.put("tag", mName);
         bundle.put("number", mNumber);
-        bundle.put("newTag", getNameFromTextField());
-        bundle.put("newNumber", getNumberFromTextField());
+        bundle.put("newTag", number);
+        bundle.put("newNumber", number);
         bundle.put("pin2", mPin2);
 
         mQueryHandler = new QueryHandler(getContentResolver());
@@ -349,8 +354,8 @@ private void displayProgress(boolean flag) {
      */
     private void showStatus(CharSequence statusMsg) {
         if (statusMsg != null) {
-            Toast.makeText(this, statusMsg, Toast.LENGTH_SHORT)
-            .show();
+            Toast.makeText(this, statusMsg, Toast.LENGTH_LONG)
+                    .show();
         }
     }
 
@@ -361,13 +366,17 @@ private void handleResult(boolean success, boolean invalidNumber) {
                     R.string.fdn_contact_added : R.string.fdn_contact_updated));
         } else {
             if (DBG) log("handleResult: failed!");
-            if (invalidNumber)
+            if (invalidNumber) {
                 showStatus(getResources().getText(R.string.fdn_invalid_number));
-            else
-                showStatus(getResources().getText(R.string.pin2_invalid));
+            } else {
+                // There's no way to know whether the failure is due to incorrect PIN2 or
+                // an inappropriate phone number.
+                showStatus(getResources().getText(R.string.pin2_or_fdn_invalid));
+            }
         }
 
         mHandler.postDelayed(new Runnable() {
+            @Override
             public void run() {
                 finish();
             }
@@ -375,7 +384,8 @@ public void run() {
 
     }
 
-    private View.OnClickListener mClicked = new View.OnClickListener() {
+    private final View.OnClickListener mClicked = new View.OnClickListener() {
+        @Override
         public void onClick(View v) {
             if (mPinFieldContainer.getVisibility() != View.VISIBLE) {
                 return;
@@ -395,8 +405,9 @@ public void onClick(View v) {
         }
     };
 
-    View.OnFocusChangeListener mOnFocusChangeHandler =
+    private final View.OnFocusChangeListener mOnFocusChangeHandler =
             new View.OnFocusChangeListener() {
+        @Override
         public void onFocusChange(View v, boolean hasFocus) {
             if (hasFocus) {
                 TextView textView = (TextView) v;
@@ -415,8 +426,7 @@ protected void onQueryComplete(int token, Object cookie, Cursor c) {
         }
 
         @Override
-        protected void onInsertComplete(int token, Object cookie,
-                                        Uri uri) {
+        protected void onInsertComplete(int token, Object cookie, Uri uri) {
             if (DBG) log("onInsertComplete");
             displayProgress(false);
             handleResult(uri != null, false);
diff --git a/src/com/android/phone/EditPinPreference.java b/src/com/android/phone/EditPinPreference.java
index 84cded324..af0040ddd 100644
--- a/src/com/android/phone/EditPinPreference.java
+++ b/src/com/android/phone/EditPinPreference.java
@@ -19,6 +19,7 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.preference.EditTextPreference;
+import android.text.InputType;
 import android.text.method.DigitsKeyListener;
 import android.text.method.PasswordTransformationMethod;
 import android.util.AttributeSet;
@@ -64,13 +65,10 @@ protected View onCreateDialogView() {
         setDialogLayoutResource(R.layout.pref_dialog_editpin);
         
         View dialog = super.onCreateDialogView();
-        
-        // set the transformation method and the key listener to ensure
-        // correct input and presentation of the pin / puk.
-        final EditText textfield = getEditText();
-        textfield.setTransformationMethod(PasswordTransformationMethod.getInstance());
-        textfield.setKeyListener(DigitsKeyListener.getInstance());
-        
+
+        getEditText().setInputType(InputType.TYPE_CLASS_NUMBER |
+            InputType.TYPE_NUMBER_VARIATION_PASSWORD);
+
         return dialog;
     }
     
diff --git a/src/com/android/phone/EmergencyCallHelper.java b/src/com/android/phone/EmergencyCallHelper.java
index 3a9be54ae..8a2392b0c 100644
--- a/src/com/android/phone/EmergencyCallHelper.java
+++ b/src/com/android/phone/EmergencyCallHelper.java
@@ -47,7 +47,7 @@
  */
 public class EmergencyCallHelper extends Handler {
     private static final String TAG = "EmergencyCallHelper";
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
 
     // Number of times to retry the call, and time between retry attempts.
     public static final int MAX_NUM_RETRIES = 6;
diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 02cceb49c..a3c8d89a4 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -25,13 +25,10 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
-import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
 import android.media.ToneGenerator;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.provider.Settings;
 import android.telephony.PhoneNumberUtils;
 import android.text.Editable;
@@ -85,13 +82,11 @@ public class EmergencyDialer extends Activity
     private static final int TONE_RELATIVE_VOLUME = 80;
 
     /** Stream type used to play the DTMF tones off call, and mapped to the volume control keys */
-    private static final int DIAL_TONE_STREAM_TYPE = AudioManager.STREAM_MUSIC;
+    private static final int DIAL_TONE_STREAM_TYPE = AudioManager.STREAM_DTMF;
 
     private static final int BAD_EMERGENCY_NUMBER_DIALOG = 0;
 
     EditText mDigits;
-    // If mVoicemailDialAndDeleteRow is null, mDialButton and mDelete are also null.
-    private View mAdditionalButtons;
     private View mDialButton;
     private View mDelete;
 
@@ -106,6 +101,7 @@ public class EmergencyDialer extends Activity
 
     // close activity when screen turns off
     private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+        @Override
         public void onReceive(Context context, Intent intent) {
             if (Intent.ACTION_SCREEN_OFF.equals(intent.getAction())) {
                 finish();
@@ -115,15 +111,17 @@ public void onReceive(Context context, Intent intent) {
 
     private String mLastNumber; // last number we tried to dial. Used to restore error dialog.
 
+    @Override
     public void beforeTextChanged(CharSequence s, int start, int count, int after) {
         // Do nothing
     }
 
+    @Override
     public void onTextChanged(CharSequence input, int start, int before, int changeCount) {
         // Do nothing
     }
 
-
+    @Override
     public void afterTextChanged(Editable input) {
         // Check for special sequences, in particular the "**04" or "**05"
         // sequences that allow you to enter PIN or PUK-related codes.
@@ -167,23 +165,18 @@ protected void onCreate(Bundle icicle) {
             setupKeypad();
         }
 
-        mAdditionalButtons = findViewById(R.id.dialpadAdditionalButtons);
+        mDelete = findViewById(R.id.deleteButton);
+        mDelete.setOnClickListener(this);
+        mDelete.setOnLongClickListener(this);
+
+        mDialButton = findViewById(R.id.dialButton);
 
         // Check whether we should show the onscreen "Dial" button and co.
         Resources res = getResources();
         if (res.getBoolean(R.bool.config_show_onscreen_dial_button)) {
-            // Make sure it is disabled.
-            mAdditionalButtons.findViewById(R.id.searchButton).setEnabled(false);
-
-            mDialButton = mAdditionalButtons.findViewById(R.id.dialButton);
             mDialButton.setOnClickListener(this);
-
-            mDelete = mAdditionalButtons.findViewById(R.id.deleteButton);
-            mDelete.setOnClickListener(this);
-            mDelete.setOnLongClickListener(this);
         } else {
-            mAdditionalButtons.setVisibility(View.GONE); // It's VISIBLE by default
-            mAdditionalButtons = null;
+            mDialButton.setVisibility(View.GONE);
         }
 
         if (icicle != null) {
@@ -204,11 +197,7 @@ protected void onCreate(Bundle icicle) {
         synchronized (mToneGeneratorLock) {
             if (mToneGenerator == null) {
                 try {
-                    // we want the user to be able to control the volume of the dial tones
-                    // outside of a call, so we use the stream type that is also mapped to the
-                    // volume control keys for this activity
                     mToneGenerator = new ToneGenerator(DIAL_TONE_STREAM_TYPE, TONE_RELATIVE_VOLUME);
-                    setVolumeControlStream(DIAL_TONE_STREAM_TYPE);
                 } catch (RuntimeException e) {
                     Log.w(LOG_TAG, "Exception caught while creating local tone generator: " + e);
                     mToneGenerator = null;
@@ -295,6 +284,7 @@ private void setupKeypad() {
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         switch (keyCode) {
+            // Happen when there's a "Call" hard button.
             case KeyEvent.KEYCODE_CALL: {
                 if (TextUtils.isEmpty(mDigits.getText().toString())) {
                     // if we are adding a call from the InCallScreen and the phone
@@ -317,10 +307,14 @@ private void keyPressed(int keyCode) {
         mDigits.onKeyDown(keyCode, event);
     }
 
+    @Override
     public boolean onKey(View view, int keyCode, KeyEvent event) {
         switch (view.getId()) {
             case R.id.digits:
-                if (keyCode == KeyEvent.KEYCODE_ENTER) {
+                // Happen when "Done" button of the IME is pressed. This can happen when this
+                // Activity is forced into landscape mode due to a desk dock.
+                if (keyCode == KeyEvent.KEYCODE_ENTER
+                        && event.getAction() == KeyEvent.ACTION_UP) {
                     placeCall();
                     return true;
                 }
@@ -329,6 +323,7 @@ public boolean onKey(View view, int keyCode, KeyEvent event) {
         return false;
     }
 
+    @Override
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.one: {
@@ -412,6 +407,7 @@ public void onClick(View view) {
     /**
      * called for long touch events
      */
+    @Override
     public boolean onLongClick(View view) {
         int id = view.getId();
         switch (id) {
@@ -486,7 +482,7 @@ public void onPause() {
     /**
      * place the call, but check to make sure it is a viable number.
      */
-    void placeCall() {
+    private void placeCall() {
         mLastNumber = mDigits.getText().toString();
         if (PhoneNumberUtils.isLocalEmergencyNumber(mLastNumber, this)) {
             if (DBG) Log.d(LOG_TAG, "placing call to " + mLastNumber);
@@ -587,11 +583,9 @@ protected void onPrepareDialog(int id, Dialog dialog) {
      * Update the enabledness of the "Dial" and "Backspace" buttons if applicable.
      */
     private void updateDialAndDeleteButtonStateEnabledAttr() {
-        if (null != mAdditionalButtons) {
-            final boolean notEmpty = mDigits.length() != 0;
+        final boolean notEmpty = mDigits.length() != 0;
 
-            mDialButton.setEnabled(notEmpty);
-            mDelete.setEnabled(notEmpty);
-        }
+        mDialButton.setEnabled(notEmpty);
+        mDelete.setEnabled(notEmpty);
     }
 }
diff --git a/src/com/android/phone/FdnSetting.java b/src/com/android/phone/FdnSetting.java
index a63143d9f..4f21e2ff0 100644
--- a/src/com/android/phone/FdnSetting.java
+++ b/src/com/android/phone/FdnSetting.java
@@ -16,23 +16,23 @@
 
 package com.android.phone;
 
-import com.android.internal.telephony.CommandException;
-import com.android.internal.telephony.Phone;
-
 import android.app.ActionBar;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.AsyncResult;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.util.Log;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
 import android.view.MenuItem;
 import android.view.WindowManager;
 import android.widget.Toast;
 
+import com.android.internal.telephony.CommandException;
+import com.android.internal.telephony.Phone;
+
 /**
  * FDN settings UI for the Phone app.
  * Rewritten to look and behave closer to the other preferences.
@@ -40,6 +40,9 @@
 public class FdnSetting extends PreferenceActivity
         implements EditPinPreference.OnPinEnteredListener, DialogInterface.OnCancelListener {
 
+    private static final String LOG_TAG = PhoneApp.LOG_TAG;
+    private static final boolean DBG = false;
+
     private Phone mPhone;
 
     /**
@@ -61,12 +64,15 @@ public class FdnSetting extends PreferenceActivity
     // State variables
     private String mOldPin;
     private String mNewPin;
+    private String mPuk2;
     private static final int PIN_CHANGE_OLD = 0;
     private static final int PIN_CHANGE_NEW = 1;
     private static final int PIN_CHANGE_REENTER = 2;
     private static final int PIN_CHANGE_PUK = 3;
+    private static final int PIN_CHANGE_NEW_PIN_FOR_PUK = 4;
+    private static final int PIN_CHANGE_REENTER_PIN_FOR_PUK = 5;
     private int mPinChangeState;
-    private boolean mSkipOldPin;    // Indicates we know that we are PUK2 blocked.
+    private boolean mIsPuk2Locked;    // Indicates we know that we are PUK2 blocked.
 
     private static final String SKIP_OLD_PIN_KEY = "skip_old_pin_key";
     private static final String PIN_CHANGE_STATE_KEY = "pin_change_state_key";
@@ -82,6 +88,7 @@ public class FdnSetting extends PreferenceActivity
     /**
      * Delegate to the respective handlers.
      */
+    @Override
     public void onPinEntered(EditPinPreference preference, boolean positiveResult) {
         if (preference == mButtonEnableFDN) {
             toggleFDNEnable(positiveResult);
@@ -119,9 +126,13 @@ private void toggleFDNEnable(boolean positiveResult) {
      * Attempt to change the pin.
      */
     private void updatePINChangeState(boolean positiveResult) {
+        if (DBG) log("updatePINChangeState positive=" + positiveResult
+                + " mPinChangeState=" + mPinChangeState
+                + " mSkipOldPin=" + mIsPuk2Locked);
+
         if (!positiveResult) {
             // reset the state on cancel, either to expect PUK2 or PIN2
-            if (!mSkipOldPin) {
+            if (!mIsPuk2Locked) {
                 resetPinChangeState();
             } else {
                 resetPinChangeStateForPUK2();
@@ -168,39 +179,62 @@ private void updatePINChangeState(boolean positiveResult) {
                     mButtonChangePin2.setText("");
                     displayPinChangeDialog(R.string.mismatchPin2, true);
                 } else {
-                    // If the PIN is valid, then we either submit the change PIN request or
-                    // display the PUK2 dialog if we KNOW that we're PUK2 locked.
+                    // If the PIN is valid, then we submit the change PIN request.
                     mButtonChangePin2.setText("");
-                    if (!mSkipOldPin) {
-                        Message onComplete = mFDNHandler.obtainMessage(EVENT_PIN2_CHANGE_COMPLETE);
-                        mPhone.getIccCard().changeIccFdnPassword(mOldPin, mNewPin, onComplete);
-                    } else {
-                        mPinChangeState = PIN_CHANGE_PUK;
-                        displayPinChangeDialog();
-                    }
+                    Message onComplete = mFDNHandler.obtainMessage(
+                            EVENT_PIN2_CHANGE_COMPLETE);
+                    mPhone.getIccCard().changeIccFdnPassword(
+                            mOldPin, mNewPin, onComplete);
                 }
                 break;
             case PIN_CHANGE_PUK: {
                     // Doh! too many incorrect requests, PUK requested.
-                    // if the pin is not valid, display a message and reset the state.
-                    String puk2 = mButtonChangePin2.getText();
+                    mPuk2 = mButtonChangePin2.getText();
                     mButtonChangePin2.setText("");
-                    // make sure that the puk is valid before submitting it.
-                    if (validatePin (puk2, true)) {
-                        Message onComplete = mFDNHandler.obtainMessage(EVENT_PIN2_CHANGE_COMPLETE);
-                        mPhone.getIccCard().supplyPuk2(puk2, mNewPin, onComplete);
+                    // if the puk is not valid, display
+                    // a message and reset the state.
+                    if (validatePin (mPuk2, true)) {
+                        mPinChangeState = PIN_CHANGE_NEW_PIN_FOR_PUK;
+                        displayPinChangeDialog();
                     } else {
                         displayPinChangeDialog(R.string.invalidPuk2, true);
                     }
                 }
                 break;
+            case PIN_CHANGE_NEW_PIN_FOR_PUK:
+                mNewPin = mButtonChangePin2.getText();
+                mButtonChangePin2.setText("");
+                // if the new pin is not valid, display
+                // a message and reset the state.
+                if (validatePin (mNewPin, false)) {
+                    mPinChangeState = PIN_CHANGE_REENTER_PIN_FOR_PUK;
+                    displayPinChangeDialog();
+                } else {
+                    displayPinChangeDialog(R.string.invalidPin2, true);
+                }
+                break;
+            case PIN_CHANGE_REENTER_PIN_FOR_PUK:
+                // if the re-entered pin is not valid, display
+                // a message and reset the state.
+                if (!mNewPin.equals(mButtonChangePin2.getText())) {
+                    mPinChangeState = PIN_CHANGE_NEW_PIN_FOR_PUK;
+                    mButtonChangePin2.setText("");
+                    displayPinChangeDialog(R.string.mismatchPin2, true);
+                } else {
+                    // Both puk2 and new pin2 are ready to submit
+                    mButtonChangePin2.setText("");
+                    Message onComplete = mFDNHandler.obtainMessage(
+                            EVENT_PIN2_CHANGE_COMPLETE);
+                    mPhone.getIccCard().supplyPuk2(mPuk2, mNewPin, onComplete);
+                }
+                break;
         }
     }
 
     /**
      * Handler for asynchronous replies from the sim.
      */
-    private Handler mFDNHandler = new Handler() {
+    private final Handler mFDNHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             switch (msg.what) {
@@ -229,6 +263,8 @@ public void handleMessage(Message msg) {
                 // the error requests a PUK (usually after too many incorrect tries)
                 // Set the state accordingly.
                 case EVENT_PIN2_CHANGE_COMPLETE: {
+                        if (DBG)
+                            log("Handle EVENT_PIN2_CHANGE_COMPLETE");
                         AsyncResult ar = (AsyncResult) msg.obj;
                         if (ar.exception != null) {
                             CommandException ce = (CommandException) ar.exception;
@@ -246,23 +282,18 @@ public void handleMessage(Message msg) {
                                 a.show();
                             } else {
                                 // set the correct error message depending upon the state.
-                                if (mPinChangeState == PIN_CHANGE_PUK) {
-                                    displayMessage(R.string.badPuk2);
-                                } else {
-                                    displayMessage(R.string.badPin2);
-                                }
-
                                 // Reset the state depending upon or knowledge of the PUK state.
-                                if (!mSkipOldPin) {
+                                if (!mIsPuk2Locked) {
+                                    displayMessage(R.string.badPin2);
                                     resetPinChangeState();
                                 } else {
+                                    displayMessage(R.string.badPuk2);
                                     resetPinChangeStateForPUK2();
                                 }
                             }
                         } else {
                             // reset to normal behaviour on successful change.
                             displayMessage(R.string.pin2_changed);
-                            mSkipOldPin = false;
                             resetPinChangeState();
                         }
                     }
@@ -274,9 +305,10 @@ public void handleMessage(Message msg) {
     /**
      * Cancel listener for the PUK2 request alert dialog.
      */
+    @Override
     public void onCancel(DialogInterface dialog) {
         // set the state of the preference and then display the dialog.
-        mPinChangeState = PIN_CHANGE_PUK;
+        resetPinChangeStateForPUK2();
         displayPinChangeDialog(0, true);
     }
 
@@ -302,9 +334,11 @@ private final void displayPinChangeDialog(int strId, boolean shouldDisplay) {
                 msgId = R.string.oldPin2Label;
                 break;
             case PIN_CHANGE_NEW:
+            case PIN_CHANGE_NEW_PIN_FOR_PUK:
                 msgId = R.string.newPin2Label;
                 break;
             case PIN_CHANGE_REENTER:
+            case PIN_CHANGE_REENTER_PIN_FOR_PUK:
                 msgId = R.string.confirmPin2Label;
                 break;
             case PIN_CHANGE_PUK:
@@ -330,19 +364,22 @@ private final void displayPinChangeDialog(int strId, boolean shouldDisplay) {
      * Reset the state of the pin change dialog.
      */
     private final void resetPinChangeState() {
+        if (DBG) log("resetPinChangeState");
         mPinChangeState = PIN_CHANGE_OLD;
         displayPinChangeDialog(0, false);
         mOldPin = mNewPin = "";
+        mIsPuk2Locked = false;
     }
 
     /**
      * Reset the state of the pin change dialog solely for PUK2 use.
      */
     private final void resetPinChangeStateForPUK2() {
-        mPinChangeState = PIN_CHANGE_NEW;
+        if (DBG) log("resetPinChangeStateForPUK2");
+        mPinChangeState = PIN_CHANGE_PUK;
         displayPinChangeDialog(0, false);
-        mOldPin = mNewPin = "";
-        mSkipOldPin = true;
+        mOldPin = mNewPin = mPuk2 = "";
+        mIsPuk2Locked = true;
     }
 
     /**
@@ -352,10 +389,10 @@ private final void resetPinChangeStateForPUK2() {
      * @param isPuk Boolean indicating whether we are to treat
      * the pin input as a puk.
      */
-    private boolean validatePin(String pin, boolean isPUK) {
+    private boolean validatePin(String pin, boolean isPuk) {
 
         // for pin, we have 4-8 numbers, or puk, we use only 8.
-        int pinMinimum = isPUK ? MAX_PIN_LENGTH : MIN_PIN_LENGTH;
+        int pinMinimum = isPuk ? MAX_PIN_LENGTH : MIN_PIN_LENGTH;
 
         // check validity
         if (pin == null || pin.length() < pinMinimum || pin.length() > MAX_PIN_LENGTH) {
@@ -403,7 +440,7 @@ protected void onCreate(Bundle icicle) {
         if (icicle == null) {
             resetPinChangeState();
         } else {
-            mSkipOldPin = icicle.getBoolean(SKIP_OLD_PIN_KEY);
+            mIsPuk2Locked = icicle.getBoolean(SKIP_OLD_PIN_KEY);
             mPinChangeState = icicle.getInt(PIN_CHANGE_STATE_KEY);
             mOldPin = icicle.getString(OLD_PIN_KEY);
             mNewPin = icicle.getString(NEW_PIN_KEY);
@@ -431,7 +468,7 @@ protected void onResume() {
     @Override
     protected void onSaveInstanceState(Bundle out) {
         super.onSaveInstanceState(out);
-        out.putBoolean(SKIP_OLD_PIN_KEY, mSkipOldPin);
+        out.putBoolean(SKIP_OLD_PIN_KEY, mIsPuk2Locked);
         out.putInt(PIN_CHANGE_STATE_KEY, mPinChangeState);
         out.putString(OLD_PIN_KEY, mOldPin);
         out.putString(NEW_PIN_KEY, mNewPin);
@@ -448,5 +485,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    private void log(String msg) {
+        Log.d(LOG_TAG, "FdnSetting: " + msg);
+    }
 }
 
diff --git a/src/com/android/phone/GetPin2Screen.java b/src/com/android/phone/GetPin2Screen.java
index 3f9c7f39e..c3fda6649 100644
--- a/src/com/android/phone/GetPin2Screen.java
+++ b/src/com/android/phone/GetPin2Screen.java
@@ -23,36 +23,35 @@
 import android.text.TextUtils;
 import android.text.method.DigitsKeyListener;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
+import android.widget.Button;
 import android.widget.EditText;
+import android.widget.TextView;
 
 /**
  * Pin2 entry screen.
  */
-public class GetPin2Screen extends Activity {
+public class GetPin2Screen extends Activity implements TextView.OnEditorActionListener {
     private static final String LOG_TAG = PhoneApp.LOG_TAG;
 
     private EditText mPin2Field;
+    private Button mOkButton;
 
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
         setContentView(R.layout.get_pin2_screen);
-        setupView();
-    }
 
-    /**
-     * Reflect the changes in the layout that force the user to open
-     * the keyboard. 
-     */
-    private void setupView() {
         mPin2Field = (EditText) findViewById(R.id.pin);
-        if (mPin2Field != null) {
-            mPin2Field.setKeyListener(DigitsKeyListener.getInstance());
-            mPin2Field.setMovementMethod(null);
-            mPin2Field.setOnClickListener(mClicked);
-        }
+        mPin2Field.setKeyListener(DigitsKeyListener.getInstance());
+        mPin2Field.setMovementMethod(null);
+        mPin2Field.setOnEditorActionListener(this);
+
+        mOkButton = (Button) findViewById(R.id.ok);
+        mOkButton.setOnClickListener(mClicked);
     }
 
     private String getPin2() {
@@ -72,7 +71,17 @@ private void returnResult() {
         finish();
     }
 
-    private View.OnClickListener mClicked = new View.OnClickListener() {
+    @Override
+    public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+        if (actionId == EditorInfo.IME_ACTION_DONE) {
+            mOkButton.performClick();
+            return true;
+        }
+        return false;
+    }
+
+    private final View.OnClickListener mClicked = new View.OnClickListener() {
+        @Override
         public void onClick(View v) {
             if (TextUtils.isEmpty(mPin2Field.getText())) {
                 return;
diff --git a/src/com/android/phone/GsmUmtsAdditionalCallOptions.java b/src/com/android/phone/GsmUmtsAdditionalCallOptions.java
index 69a025ccd..72e7d5c4a 100644
--- a/src/com/android/phone/GsmUmtsAdditionalCallOptions.java
+++ b/src/com/android/phone/GsmUmtsAdditionalCallOptions.java
@@ -8,6 +8,9 @@
 import android.util.Log;
 import android.view.MenuItem;
 
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneFactory;
+
 import java.util.ArrayList;
 
 public class GsmUmtsAdditionalCallOptions extends
@@ -17,11 +20,13 @@ public class GsmUmtsAdditionalCallOptions extends
 
     private static final String BUTTON_CLIR_KEY  = "button_clir_key";
     private static final String BUTTON_CW_KEY    = "button_cw_key";
+    private static final String BUTTON_PN_KEY    = "button_pn_key";
 
     private CLIRListPreference mCLIRButton;
     private CallWaitingCheckBoxPreference mCWButton;
+    private MSISDNEditPreference mMSISDNButton;
 
-    private ArrayList<Preference> mPreferences = new ArrayList<Preference> ();
+    private final ArrayList<Preference> mPreferences = new ArrayList<Preference>();
     private int mInitIndex= 0;
 
     @Override
@@ -33,9 +38,11 @@ protected void onCreate(Bundle icicle) {
         PreferenceScreen prefSet = getPreferenceScreen();
         mCLIRButton = (CLIRListPreference) prefSet.findPreference(BUTTON_CLIR_KEY);
         mCWButton = (CallWaitingCheckBoxPreference) prefSet.findPreference(BUTTON_CW_KEY);
+        mMSISDNButton = (MSISDNEditPreference) prefSet.findPreference(BUTTON_PN_KEY);
 
         mPreferences.add(mCLIRButton);
         mPreferences.add(mCWButton);
+        mPreferences.add(mMSISDNButton);
 
         if (icicle == null) {
             if (DBG) Log.d(LOG_TAG, "start to init ");
@@ -45,6 +52,8 @@ protected void onCreate(Bundle icicle) {
             mInitIndex = mPreferences.size();
             mCLIRButton.init(this, true);
             mCWButton.init(this, true);
+            mMSISDNButton.init(this, true);
+
             int[] clirArray = icicle.getIntArray(mCLIRButton.getKey());
             if (clirArray != null) {
                 if (DBG) Log.d(LOG_TAG, "onCreate:  clirArray[0]="
@@ -78,6 +87,8 @@ public void onFinished(Preference preference, boolean reading) {
             Preference pref = mPreferences.get(mInitIndex);
             if (pref instanceof CallWaitingCheckBoxPreference) {
                 ((CallWaitingCheckBoxPreference) pref).init(this, false);
+            } else if (pref instanceof MSISDNEditPreference) {
+                ((MSISDNEditPreference) pref).init(this, false);
             }
         }
         super.onFinished(preference, reading);
diff --git a/src/com/android/phone/HapticFeedback.java b/src/com/android/phone/HapticFeedback.java
index edca4ab0c..7001ee032 100644
--- a/src/com/android/phone/HapticFeedback.java
+++ b/src/com/android/phone/HapticFeedback.java
@@ -16,13 +16,14 @@
 
 package com.android.phone;
 
-import android.content.Context;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.res.Resources;
+import android.os.SystemVibrator;
 import android.os.Vibrator;
-import android.util.Log;
 import android.provider.Settings;
 import android.provider.Settings.System;
+import android.util.Log;
 
 /**
  * Handles the haptic feedback: a light buzz happening when the user
@@ -89,7 +90,9 @@ public class HapticFeedback {
     public void init(Context context, boolean enabled) {
         mEnabled = enabled;
         if (enabled) {
-            mVibrator = new Vibrator();
+            // We don't rely on getSystemService(Context.VIBRATOR_SERVICE) to make sure this
+            // vibrator object will be isolated from others.
+            mVibrator = new SystemVibrator();
             if (!loadHapticSystemPattern(context.getResources())) {
                 mHapticPattern = new long[] {0, DURATION, 2 * DURATION, 3 * DURATION};
             }
@@ -127,7 +130,16 @@ public void vibrate() {
         if (!mEnabled || !mSettingEnabled) {
             return;
         }
-        mVibrator.vibrate(mHapticPattern, NO_REPEAT);
+        // System-wide configuration may return different styles of haptic feedback pattern.
+        // - an array with one value implies "one-shot vibration"
+        // - an array with multiple values implies "pattern vibration"
+        // We need to switch methods to call depending on the difference.
+        // See also PhoneWindowManager#performHapticFeedbackLw() for another example.
+        if (mHapticPattern != null && mHapticPattern.length == 1) {
+            mVibrator.vibrate(mHapticPattern[0]);
+        } else {
+            mVibrator.vibrate(mHapticPattern, NO_REPEAT);
+        }
     }
 
     /**
diff --git a/src/com/android/phone/InCallContactPhoto.java b/src/com/android/phone/InCallContactPhoto.java
deleted file mode 100644
index c98ec0d4b..000000000
--- a/src/com/android/phone/InCallContactPhoto.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (C) 2011 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.phone;
-
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.SystemClock;
-import android.os.SystemProperties;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
-import android.widget.ImageView;
-
-
-/**
- * ImageView subclass used for contact photos in the in-call UI.
- *
- * For contact photos larger than 96x96, this view behaves just like a regular
- * ImageView.  But for 96x96 or smaller (i.e. the size of contact thumbnails
- * we typically get from contacts sync), apply a "blur + inset" special effect
- * rather than simply scaling up the image.  (Scaling looks terrible because
- * the onscreen ImageView is so much larger than the source image.)
- *
- * Watch out: this widget only does the "blur + inset" effect in one very
- * specific case: you must set the photo using the setImageDrawable() API,
- * *and* pass in a drawable that's an instance of BitmapDrawable.
- * (This is exactly what the in-call UI does; see CallCard.java and also
- * android.pim.ContactsAsyncHelper.)
- *
- * TODO: If we ever intend to expose this class for more general use (or move
- * it into the framework) we'll need to make this effect work for all the
- * various setImage*() calls, with any kind of drawable.
- *
- * TODO: other features to consider adding here:
- * - any special scaling / cropping behavior?
- * - special handling for the "unknown" contact photo and the "conference
-     call" state?
- * - allow the whole image to be blurred or dimmed, regardless of the
- *   size of the input image (like for a call that's on hold)
- */
-public class InCallContactPhoto extends ImageView {
-    private static final String TAG = "InCallContactPhoto";
-    private static final boolean DBG =
-            (PhoneApp.DBG_LEVEL >= 1) && (SystemProperties.getInt("ro.debuggable", 0) == 1);
-    private static final boolean VDBG = false;
-
-    /**
-     * If true, enable the "blur + inset" special effect for lo-res
-     * images.  (This flag provides a quick way to disable this class
-     * entirely; if false, InCallContactPhoto instances will behave just
-     * like plain old ImageViews.)
-     */
-    private static final boolean ENABLE_BLUR_INSET_EFFECT = false;
-
-    private Drawable mPreviousImageDrawable;
-    private ImageView mInsetImageView;
-
-    public InCallContactPhoto(Context context) {
-        super(context);
-    }
-
-    public InCallContactPhoto(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public InCallContactPhoto(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    public void setInsetImageView(ImageView imageView) {
-        mInsetImageView = imageView;
-    }
-
-    @Override
-    public void setImageResource(int resId) {
-        if (DBG) log("setImageResource(" + resId + ")...");
-        // For now, at least, this method doesn't trigger any special effects
-        // (see the TODO comment in the class javadoc.)
-        mPreviousImageDrawable = null;
-        hideInset();
-        super.setImageResource(resId);
-    }
-
-    @Override
-    public void setImageURI(Uri uri) {
-        if (DBG) log("setImageURI(" + uri + ")...");
-        // For now, at least, this method doesn't trigger any special effects
-        // (see the TODO comment in the class javadoc.)
-        mPreviousImageDrawable = null;
-        hideInset();
-        super.setImageURI(uri);
-    }
-
-    @Override
-    public void setImageBitmap(Bitmap bm) {
-        if (DBG) log("setImageBitmap(" + bm + ")...");
-        // For now, at least, this method doesn't trigger any special effects
-        // (see the TODO comment in the class javadoc.)
-        mPreviousImageDrawable = null;
-        hideInset();
-        super.setImageBitmap(bm);
-    }
-
-    @Override
-    public void setImageDrawable(Drawable inputDrawable) {
-        if (DBG) log("setImageDrawable(" + inputDrawable + ")...");
-        long startTime = SystemClock.uptimeMillis();
-
-        BitmapDrawable blurredBitmapDrawable = null;
-
-        if (VDBG) log("################# setImageDrawable()... ################");
-        if (VDBG) log("- this: " + this);
-        if (VDBG) log("- inputDrawable: " + inputDrawable);
-        if (VDBG) log("- mPreviousImageDrawable: " + mPreviousImageDrawable);
-
-        if (inputDrawable != mPreviousImageDrawable) {
-
-            mPreviousImageDrawable = inputDrawable;
-
-            if (inputDrawable instanceof BitmapDrawable) {
-                Bitmap inputBitmap = ((BitmapDrawable) inputDrawable).getBitmap();
-
-                if (VDBG) log("- inputBitmap: " + inputBitmap);
-                if (VDBG) log("  - dimensions: " + inputBitmap.getWidth()
-                              + " x " + inputBitmap.getHeight());
-                if (VDBG) log("  - config: " + inputBitmap.getConfig());
-                if (VDBG) log("  - byte count: " + inputBitmap.getByteCount());
-
-                if (!ENABLE_BLUR_INSET_EFFECT) {
-                    if (DBG) log("- blur+inset disabled; no special effect.");
-                    // ...and leave blurredBitmapDrawable = null so that we'll
-                    // fall back to the regular ImageView behavior (see below.)
-                } else if (inputBitmap == null) {
-                    Log.w(TAG, "setImageDrawable: null bitmap from inputDrawable.getBitmap()!");
-                    // ...and leave blurredBitmapDrawable = null so that we'll
-                    // fall back to the regular ImageView behavior (see below.)
-                } else if (!isLoRes(inputBitmap)) {
-                    if (DBG) log("- not a lo-res bitmap; no special effect.");
-                    // ...and leave blurredBitmapDrawable = null so that we'll
-                    // fall back to the regular ImageView behavior (see below.)
-                } else {
-                    // Ok, we have a valid bitmap *and* it's lo-res.
-                    // Do the blur + inset effect.
-                    if (DBG) log("- got a lo-res bitmap; blurring...");
-                    Bitmap blurredBitmap = BitmapUtils.createBlurredBitmap(inputBitmap);
-                    if (VDBG) log("- blurredBitmap: " + blurredBitmap);
-                    if (VDBG) log("  - dimensions: " + blurredBitmap.getWidth()
-                                  + " x " + blurredBitmap.getHeight());
-                    if (VDBG) log("  - config: " + blurredBitmap.getConfig());
-                    if (VDBG) log("  - byte count: " + blurredBitmap.getByteCount());
-
-                    blurredBitmapDrawable = new BitmapDrawable(getResources(), blurredBitmap);
-                    if (DBG) log("- Created blurredBitmapDrawable: " + blurredBitmapDrawable);
-                }
-            } else {
-                Log.w(TAG, "setImageDrawable: inputDrawable '" + inputDrawable
-                      + "' is not a BitmapDrawable");
-                // For now, at least, we don't trigger any special effects in
-                // this case (see the TODO comment in the class javadoc.)
-                // Just leave blurredBitmapDrawable = null so that we'll
-                // fall back to the regular ImageView behavior (see below.)
-            }
-
-            if (blurredBitmapDrawable != null) {
-                if (DBG) log("- Show the special effect!  blurredBitmapDrawable = "
-                             + blurredBitmapDrawable);
-                super.setImageDrawable(blurredBitmapDrawable);
-                // And show the original (sharp) image in the inset.
-                showInset(inputDrawable);
-            } else {
-                if (DBG) log("- null blurredBitmapDrawable; don't show the special effect.");
-                // Otherwise,  Just fall back to the regular ImageView behavior.
-                super.setImageDrawable(inputDrawable);
-                hideInset();
-            }
-        }
-
-        long endTime = SystemClock.uptimeMillis();
-        if (DBG) log("setImageDrawable() done: *ELAPSED* = " + (endTime - startTime) + " msec");
-    }
-
-    /**
-     * @return true if the specified bitmap is a lo-res contact photo
-     *         (i.e. if we *should* use the blur+inset effect for this photo
-     *         in the in-call UI.)
-     */
-    private boolean isLoRes(Bitmap bitmap) {
-        // In practice, contact photos will almost always be either 96x96 (for
-        // thumbnails from contacts sync) or 256x256 (if you pick a photo from
-        // the gallery or camera via the contacts app.)
-        //
-        // So enable the blur+inset effect *only* for width = 96 or smaller.
-        // (If the user somehow gets a contact to have a photo that's between
-        // 97 and 255 pixels wide, that's OK, we'll just show it as-is with no
-        // special effects.)
-        final int LO_RES_THRESHOLD_WIDTH = 96;
-        if (DBG) log("- isLoRes: checking bitmap with width " + bitmap.getWidth() + "...");
-        return (bitmap.getWidth() <= LO_RES_THRESHOLD_WIDTH);
-    }
-
-    private void hideInset() {
-        if (DBG) log("- hideInset()...");
-        if (mInsetImageView != null) {
-            mInsetImageView.setVisibility(View.GONE);
-        }
-    }
-
-    private void showInset(Drawable drawable) {
-        if (DBG) log("- showInset(Drawable " + drawable + ")...");
-        if (mInsetImageView != null) {
-            mInsetImageView.setImageDrawable(drawable);
-            mInsetImageView.setVisibility(View.VISIBLE);
-        }
-    }
-
-    private void log(String msg) {
-        Log.d(TAG, msg);
-    }
-}
diff --git a/src/com/android/phone/InCallControlState.java b/src/com/android/phone/InCallControlState.java
index e78a065f1..b44e3107a 100644
--- a/src/com/android/phone/InCallControlState.java
+++ b/src/com/android/phone/InCallControlState.java
@@ -23,7 +23,7 @@
 import com.android.internal.telephony.Connection;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.CallManager;
-
+import com.android.internal.telephony.TelephonyCapabilities;
 
 /**
  * Helper class to keep track of enabledness, visibility, and "on/off"
@@ -119,12 +119,13 @@ public void update() {
         // "Add call":
         canAddCall = PhoneUtils.okToAddCall(mCM);
 
-        // "End call": always enabled.
-        // We keep this button enabled even in states where it's technically not
-        // needed, like during the brief "Call ended" state, where the phone is
-        // IDLE.  (See InCallScreen.internalHangup() for the handling of that
-        // case.)
-        canEndCall = true;
+        // "End call": always enabled unless the phone is totally idle.
+        // Note that while the phone is ringing, the InCallTouchUi widget isn't
+        // visible at all, so the state of the End button doesn't matter.  However
+        // we *do* still set canEndCall to true in this case, purely to prevent a
+        // UI glitch when the InCallTouchUi widget first appears, immediately after
+        // answering an incoming call.
+        canEndCall = (mCM.hasActiveFgCall() || mCM.hasActiveRingingCall() || mCM.hasActiveBgCall());
 
         // Swap / merge calls
         canSwap = PhoneUtils.okToSwapCalls(mCM);
diff --git a/src/com/android/phone/InCallScreen.java b/src/com/android/phone/InCallScreen.java
index 26733ed54..008efd84e 100755
--- a/src/com/android/phone/InCallScreen.java
+++ b/src/com/android/phone/InCallScreen.java
@@ -17,6 +17,7 @@
 package com.android.phone;
 
 import android.app.Activity;
+import android.app.ActivityOptions;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -27,8 +28,8 @@
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.DialogInterface.OnCancelListener;
 import android.content.DialogInterface;
+import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Configuration;
@@ -65,9 +66,9 @@
 import com.android.internal.telephony.Connection;
 import com.android.internal.telephony.MmiCode;
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.TelephonyCapabilities;
 import com.android.phone.Constants.CallStatusCode;
 import com.android.phone.InCallUiState.InCallScreenMode;
-import com.android.phone.OtaUtils.CdmaOtaInCallScreenUiState;
 import com.android.phone.OtaUtils.CdmaOtaScreenState;
 
 import java.util.List;
@@ -121,13 +122,14 @@ public class InCallScreen extends Activity
     // "long" value is for calls ended by the remote caller.
     private static final int CALL_ENDED_SHORT_DELAY =  200;  // msec
     private static final int CALL_ENDED_LONG_DELAY = 2000;  // msec
+    private static final int CALL_ENDED_EXTRA_LONG_DELAY = 5000;  // msec
 
     // Amount of time that we display the PAUSE alert Dialog showing the
     // post dial string yet to be send out to the n/w
     private static final int PAUSE_PROMPT_DIALOG_TIMEOUT = 2000;  //msec
 
-    // Amount of time that we display the provider's overlay if applicable.
-    private static final int PROVIDER_OVERLAY_TIMEOUT = 5000;  // msec
+    // Amount of time that we display the provider info if applicable.
+    private static final int PROVIDER_INFO_TIMEOUT = 5000;  // msec
 
     // These are values for the settings of the auto retry mode:
     // 0 = disabled
@@ -154,7 +156,7 @@ public class InCallScreen extends Activity
     private static final int REQUEST_CLOSE_SPC_ERROR_NOTICE = 118;
     private static final int REQUEST_CLOSE_OTA_FAILURE_NOTICE = 119;
     private static final int EVENT_PAUSE_DIALOG_COMPLETE = 120;
-    private static final int EVENT_HIDE_PROVIDER_OVERLAY = 121;  // Time to remove the overlay.
+    private static final int EVENT_HIDE_PROVIDER_INFO = 121;  // Time to remove the info.
     private static final int REQUEST_UPDATE_SCREEN = 122;
     private static final int PHONE_INCOMING_RING = 123;
     private static final int PHONE_NEW_RINGING_CONNECTION = 124;
@@ -200,10 +202,7 @@ private enum SyncWithPhoneStateStatus {
     private boolean mBluetoothConnectionPending;
     private long mBluetoothConnectionRequestTime;
 
-    // Main in-call UI ViewGroups
-    private ViewGroup mInCallPanel;
-
-    // Main in-call UI elements:
+    /** Main in-call UI elements. */
     private CallCard mCallCard;
 
     // UI controls:
@@ -214,7 +213,6 @@ private enum SyncWithPhoneStateStatus {
 
     // DTMF Dialer controller and its view:
     private DTMFTwelveKeyDialer mDialer;
-    private DTMFTwelveKeyDialerView mDialerView;
 
     private EditText mWildPromptText;
 
@@ -311,9 +309,11 @@ public void handleMessage(Message msg) {
 
                     break;
 
-                case PhoneApp.MMI_INITIATE:
-                    onMMIInitiate((AsyncResult) msg.obj);
-                    break;
+                // TODO: sort out MMI code (probably we should remove this method entirely).
+                // See also MMI handling code in onResume()
+                // case PhoneApp.MMI_INITIATE:
+                // onMMIInitiate((AsyncResult) msg.obj);
+                //    break;
 
                 case PhoneApp.MMI_CANCEL:
                     onMMICancel();
@@ -324,20 +324,7 @@ public void handleMessage(Message msg) {
                 // a system dialog in PhoneUtils.displayMMIComplete(), we
                 // should finish the activity here to close the window.
                 case PhoneApp.MMI_COMPLETE:
-                    // Check the code to see if the request is ready to
-                    // finish, this includes any MMI state that is not
-                    // PENDING.
-                    MmiCode mmiCode = (MmiCode) ((AsyncResult) msg.obj).result;
-                    // if phone is a CDMA phone display feature code completed message
-                    int phoneType = mPhone.getPhoneType();
-                    if (phoneType == Phone.PHONE_TYPE_CDMA) {
-                        PhoneUtils.displayMMIComplete(mPhone, mApp, mmiCode, null, null);
-                    } else if (phoneType == Phone.PHONE_TYPE_GSM) {
-                        if (mmiCode.getState() != MmiCode.State.PENDING) {
-                            if (DBG) log("Got MMI_COMPLETE, finishing InCallScreen...");
-                            endInCallScreenSession();
-                        }
-                    }
+                    onMMIComplete((MmiCode) ((AsyncResult) msg.obj).result);
                     break;
 
                 case POST_ON_DIAL_CHARS:
@@ -408,11 +395,12 @@ public void handleMessage(Message msg) {
                     }
                     break;
 
-                case EVENT_HIDE_PROVIDER_OVERLAY:
-                    mApp.inCallUiState.providerOverlayVisible = false;
-                    updateProviderOverlay();  // Clear the overlay.
+                case EVENT_HIDE_PROVIDER_INFO:
+                    mApp.inCallUiState.providerInfoVisible = false;
+                    if (mCallCard != null) {
+                        mCallCard.updateState(mCM);
+                    }
                     break;
-
                 case REQUEST_UPDATE_SCREEN:
                     updateScreen();
                     break;
@@ -485,12 +473,6 @@ protected void onCreate(Bundle icicle) {
         }
         getWindow().addFlags(flags);
 
-        // Also put the system bar (if present on this device) into
-        // "lights out" mode any time we're the foreground activity.
-        WindowManager.LayoutParams params = getWindow().getAttributes();
-        params.systemUiVisibility = View.SYSTEM_UI_FLAG_LOW_PROFILE;
-        getWindow().setAttributes(params);
-
         setPhone(mApp.phone);  // Sets mPhone
 
         mCM =  mApp.mCM;
@@ -536,15 +518,17 @@ protected void onCreate(Bundle icicle) {
     }
 
      private BluetoothProfile.ServiceListener mBluetoothProfileServiceListener =
-        new BluetoothProfile.ServiceListener() {
-        public void onServiceConnected(int profile, BluetoothProfile proxy) {
-            mBluetoothHeadset = (BluetoothHeadset) proxy;
-            if (VDBG) log("- Got BluetoothHeadset: " + mBluetoothHeadset);
-        }
-
-        public void onServiceDisconnected(int profile) {
-            mBluetoothHeadset = null;
-        }
+             new BluetoothProfile.ServiceListener() {
+         @Override
+         public void onServiceConnected(int profile, BluetoothProfile proxy) {
+             mBluetoothHeadset = (BluetoothHeadset) proxy;
+             if (VDBG) log("- Got BluetoothHeadset: " + mBluetoothHeadset);
+         }
+
+         @Override
+         public void onServiceDisconnected(int profile) {
+             mBluetoothHeadset = null;
+         }
     };
 
     /**
@@ -567,6 +551,11 @@ protected void onResume() {
         mIsForegroundActivity = true;
         mIsForegroundActivityForProximity = true;
 
+        // The flag shouldn't be turned on when there are actual phone calls.
+        if (mCM.hasActiveFgCall() || mCM.hasActiveBgCall() || mCM.hasActiveRingingCall()) {
+            mApp.inCallUiState.showAlreadyDisconnectedState = false;
+        }
+
         final InCallUiState inCallUiState = mApp.inCallUiState;
         if (VDBG) inCallUiState.dumpState();
 
@@ -575,9 +564,8 @@ protected void onResume() {
         // prevent the device from going to sleep.
         mApp.setIgnoreTouchUserActivity(true);
 
-        // Disable the status bar "window shade" the entire time we're on
-        // the in-call screen.
-        mApp.notificationMgr.statusBarHelper.enableExpandedView(false);
+        updateExpandedViewState();
+
         // ...and update the in-call notification too, since the status bar
         // icon needs to be hidden while we're the foreground activity:
         mApp.notificationMgr.updateInCallNotification();
@@ -593,12 +581,14 @@ protected void onResume() {
 
         // Update the onscreen dialpad state to match the InCallUiState.
         if (inCallUiState.showDialpad) {
-            showDialpadInternal(false);  // no "opening" animation
+            openDialpadInternal(false);  // no "opening" animation
         } else {
-            hideDialpadInternal(false);  // no "closing" animation
+            closeDialpadInternal(false);  // no "closing" animation
         }
-        //
-        // TODO: also need to load inCallUiState.dialpadDigits into the dialpad
+
+        // Reset the dialpad context
+        // TODO: Dialpad digits should be set here as well (once they are saved)
+        mDialer.setDialpadContext(inCallUiState.dialpadContextText);
 
         // If there's a "Respond via SMS" popup still around since the
         // last time we were the foreground activity, make sure it's not
@@ -607,9 +597,7 @@ protected void onResume() {
         // come to the foreground; it only ever comes up in response to
         // the user selecting the "SMS" option from the incoming call
         // widget.)
-        if (mRespondViaSmsManager != null) {
-            mRespondViaSmsManager.dismissPopup();  // safe even if already dismissed
-        }
+        mRespondViaSmsManager.dismissPopup();  // safe even if already dismissed
 
         // Display an error / diagnostic indication if necessary.
         //
@@ -713,7 +701,7 @@ protected void onResume() {
         } else if (TelephonyCapabilities.supportsOtasp(mPhone)) {
             if (inCallUiState.inCallScreenMode == InCallScreenMode.OTA_NORMAL ||
                     inCallUiState.inCallScreenMode == InCallScreenMode.OTA_ENDED) {
-                if (mInCallPanel != null) mInCallPanel.setVisibility(View.GONE);
+                if (mCallCard != null) mCallCard.setVisibility(View.GONE);
                 updateScreen();
                 return;
             }
@@ -722,11 +710,8 @@ protected void onResume() {
         // InCallScreen is now active.
         EventLog.writeEvent(EventLogTags.PHONE_UI_ENTER);
 
-        // Update the poke lock and wake lock when we move to
-        // the foreground.
-        //
-        // But we need to do something special if we're coming
-        // to the foreground while an incoming call is ringing:
+        // Coming to the foreground while in an incoming call is ringing.
+        // We need to do something special.
         if (mCM.getState() == Phone.State.RINGING) {
             // If the phone is ringing, we *should* already be holding a
             // full wake lock (which we would have acquired before
@@ -759,6 +744,8 @@ protected void onResume() {
             // but let's do this just to be safe:
             mApp.preventScreenOn(false);
         }
+        // Update the poke lock and wake lock when we move to the foreground.
+        // This will be no-op when prox sensor is effective.
         mApp.updateWakeState();
 
         // Restore the mute state if the last mute state change was NOT
@@ -770,6 +757,50 @@ protected void onResume() {
         }
 
         Profiler.profileViewCreate(getWindow(), InCallScreen.class.getName());
+
+        // If there's a pending MMI code, we'll show a dialog here.
+        //
+        // Note: previously we had shown the dialog when MMI_INITIATE event's coming
+        // from telephony layer, while right now we don't because the event comes
+        // too early (before in-call screen is prepared).
+        // Now we instead check pending MMI code and show the dialog here.
+        //
+        // This *may* cause some problem, e.g. when the user really quickly starts
+        // MMI sequence and calls an actual phone number before the MMI request
+        // being completed, which is rather rare.
+        //
+        // TODO: streamline this logic and have a UX in a better manner.
+        // Right now syncWithPhoneState() above will return SUCCESS based on
+        // mPhone.getPendingMmiCodes().isEmpty(), while we check it again here.
+        // Also we show pre-populated in-call UI under the dialog, which looks
+        // not great. (issue 5210375, 5545506)
+        // After cleaning them, remove commented-out MMI handling code elsewhere.
+        if (!mPhone.getPendingMmiCodes().isEmpty()) {
+            if (mMmiStartedDialog == null) {
+                MmiCode mmiCode = mPhone.getPendingMmiCodes().get(0);
+                Message message = Message.obtain(mHandler, PhoneApp.MMI_CANCEL);
+                mMmiStartedDialog = PhoneUtils.displayMMIInitiate(this, mmiCode,
+                        message, mMmiStartedDialog);
+                // mInCallScreen needs to receive MMI_COMPLETE/MMI_CANCEL event from telephony,
+                // which will dismiss the entire screen.
+            }
+        }
+
+        // This means the screen is shown even though there's no connection, which only happens
+        // when the phone call has hung up while the screen is turned off at that moment.
+        // We want to show "disconnected" state with photos with appropriate elapsed time for
+        // the finished phone call.
+        if (mApp.inCallUiState.showAlreadyDisconnectedState) {
+            // if (DBG) {
+            log("onResume(): detected \"show already disconnected state\" situation."
+                    + " set up DELAYED_CLEANUP_AFTER_DISCONNECT message with "
+                    + CALL_ENDED_LONG_DELAY + " msec delay.");
+            //}
+            mHandler.removeMessages(DELAYED_CLEANUP_AFTER_DISCONNECT);
+            mHandler.sendEmptyMessageDelayed(DELAYED_CLEANUP_AFTER_DISCONNECT,
+                    CALL_ENDED_LONG_DELAY);
+        }
+
         if (VDBG) log("onResume() done.");
     }
 
@@ -781,15 +812,20 @@ protected void onPause() {
         super.onPause();
 
         if (mPowerManager.isScreenOn()) {
+            // Set to false when the screen went background *not* by screen turned off. Probably
+            // the user bailed out of the in-call screen (by pressing BACK, HOME, etc.)
             mIsForegroundActivityForProximity = false;
         }
         mIsForegroundActivity = false;
 
-        // Force a clear of the provider overlay' frame. Since the
-        // overlay is removed using a timed message, it is
+        // Force a clear of the provider info frame. Since the
+        // frame is removed using a timed message, it is
         // possible we missed it if the prev call was interrupted.
-        mApp.inCallUiState.providerOverlayVisible = false;
-        updateProviderOverlay();
+        mApp.inCallUiState.providerInfoVisible = false;
+
+        // "show-already-disconnected-state" should be effective just during the first wake-up.
+        // We should never allow it to stay true after that.
+        mApp.inCallUiState.showAlreadyDisconnectedState = false;
 
         // A safety measure to disable proximity sensor in case call failed
         // and the telephony state did not change.
@@ -832,7 +868,7 @@ protected void onPause() {
         // end up causing the sleep request to be ignored.
         if (mHandler.hasMessages(DELAYED_CLEANUP_AFTER_DISCONNECT)
                 && mCM.getState() != Phone.State.RINGING) {
-            log("DELAYED_CLEANUP_AFTER_DISCONNECT detected, moving UI to background.");
+            if (DBG) log("DELAYED_CLEANUP_AFTER_DISCONNECT detected, moving UI to background.");
             endInCallScreenSession();
         }
 
@@ -842,8 +878,8 @@ protected void onPause() {
         // sure they won't still be around when we get back here.
         dismissAllDialogs();
 
-        // Re-enable the status bar (which we disabled in onResume().)
-        mApp.notificationMgr.statusBarHelper.enableExpandedView(true);
+        updateExpandedViewState();
+
         // ...and the in-call notification too:
         mApp.notificationMgr.updateInCallNotification();
         // ...and *always* reset the system bar back to its normal state
@@ -875,6 +911,14 @@ public void run() {
         // clear the dismiss keyguard flag so we are back to the default state
         // when we next resume
         updateKeyguardPolicy(false);
+
+        // See also PhoneApp#updatePhoneState(), which takes care of all the other release() calls.
+        if (mApp.getUpdateLock().isHeld() && mApp.getPhoneState() == Phone.State.IDLE) {
+            if (DBG) {
+                log("Release UpdateLock on onPause() because there's no active phone call.");
+            }
+            mApp.getUpdateLock().release();
+        }
     }
 
     @Override
@@ -888,6 +932,13 @@ protected void onStop() {
         if (DBG) log("onStop: state = " + state);
 
         if (state == Phone.State.IDLE) {
+            if (mRespondViaSmsManager.isShowingPopup()) {
+                // This means that the user has been opening the "Respond via SMS" dialog even
+                // after the incoming call hanging up, and the screen finally went background.
+                // In that case we just close the dialog and exit the whole in-call screen.
+                mRespondViaSmsManager.dismissPopup();
+            }
+
             // when OTA Activation, OTA Success/Failure dialog or OTA SPC
             // failure dialog is running, do not destroy inCallScreen. Because call
             // is already ended and dialog will not get redrawn on slider event.
@@ -927,9 +978,7 @@ protected void onDestroy() {
         if (mInCallTouchUi != null) {
             mInCallTouchUi.setInCallScreenInstance(null);
         }
-        if (mRespondViaSmsManager != null) {
-            mRespondViaSmsManager.setInCallScreenInstance(null);
-        }
+        mRespondViaSmsManager.setInCallScreenInstance(null);
 
         mDialer.clearInCallScreenReference();
         mDialer = null;
@@ -998,7 +1047,9 @@ public void endInCallScreenSession() {
      *        @see finish()
      */
     private void endInCallScreenSession(boolean forceFinish) {
-        log("endInCallScreenSession(" + forceFinish + ")...  phone state = " + mCM.getState());
+        if (DBG) {
+            log("endInCallScreenSession(" + forceFinish + ")...  phone state = " + mCM.getState());
+        }
         if (forceFinish) {
             Log.i(LOG_TAG, "endInCallScreenSession(): FORCING a call to super.finish()!");
             super.finish();  // Call super.finish() rather than our own finish() method,
@@ -1009,10 +1060,19 @@ private void endInCallScreenSession(boolean forceFinish) {
         setInCallScreenMode(InCallScreenMode.UNDEFINED);
     }
 
+    /**
+     * True when this Activity is in foreground (between onResume() and onPause()).
+     */
     /* package */ boolean isForegroundActivity() {
         return mIsForegroundActivity;
     }
 
+    /**
+     * Returns true when the Activity is in foreground (between onResume() and onPause()),
+     * or, is in background due to user's bailing out of the screen, not by screen turning off.
+     *
+     * @see #isForegroundActivity()
+     */
     /* package */ boolean isForegroundActivityForProximity() {
         return mIsForegroundActivityForProximity;
     }
@@ -1029,7 +1089,10 @@ private void registerForPhoneStates() {
         if (!mRegisteredForPhoneStates) {
             mCM.registerForPreciseCallStateChanged(mHandler, PHONE_STATE_CHANGED, null);
             mCM.registerForDisconnect(mHandler, PHONE_DISCONNECT, null);
-            mCM.registerForMmiInitiate(mHandler, PhoneApp.MMI_INITIATE, null);
+            // TODO: sort out MMI code (probably we should remove this method entirely).
+            // See also MMI handling code in onResume()
+            // mCM.registerForMmiInitiate(mHandler, PhoneApp.MMI_INITIATE, null);
+
             // register for the MMI complete message.  Upon completion,
             // PhoneUtils will bring up a system dialog instead of the
             // message display class in PhoneUtils.displayMMIComplete().
@@ -1145,6 +1208,15 @@ private void internalResolveIntent(Intent intent) {
                 // If SHOW_DIALPAD_EXTRA is specified, that overrides whatever
                 // the previous state of inCallUiState.showDialpad was.
                 mApp.inCallUiState.showDialpad = showDialpad;
+
+                final boolean hasActiveCall = mCM.hasActiveFgCall();
+                final boolean hasHoldingCall = mCM.hasActiveBgCall();
+
+                // There's only one line in use, AND it's on hold, at which we're sure the user
+                // wants to use the dialpad toward the exact line, so un-hold the holding line.
+                if (showDialpad && !hasActiveCall && hasHoldingCall) {
+                    PhoneUtils.switchHoldingAndActive(mCM.getFirstActiveBgCall());
+                }
             }
             // ...and in onResume() we'll update the onscreen dialpad state to
             // match the InCallUiState.
@@ -1212,8 +1284,6 @@ private void initInCallScreen() {
         // Have the WindowManager filter out touch events that are "too fat".
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_IGNORE_CHEEK_PRESSES);
 
-        mInCallPanel = (ViewGroup) findViewById(R.id.inCallPanel);
-
         // Initialize the CallCard.
         mCallCard = (CallCard) findViewById(R.id.callCard);
         if (VDBG) log("  - mCallCard = " + mCallCard);
@@ -1229,19 +1299,8 @@ private void initInCallScreen() {
         mManageConferenceUtils = new ManageConferenceUtils(this, mCM);
 
         // The DTMF Dialpad.
-        // TODO: Don't inflate this until the first time it's needed.
-        ViewStub stub = (ViewStub)findViewById(R.id.dtmf_twelve_key_dialer_stub);
-        stub.inflate();
-        mDialerView = (DTMFTwelveKeyDialerView) findViewById(R.id.dtmf_twelve_key_dialer_view);
-        if (DBG) log("- Found dialerView: " + mDialerView);
-
-        // Sanity-check that (regardless of the device) at least the
-        // dialer view is present:
-        if (mDialerView == null) {
-            Log.e(LOG_TAG, "onCreate: couldn't find dialerView", new IllegalStateException());
-        }
-        // Finally, create the DTMFTwelveKeyDialer instance.
-        mDialer = new DTMFTwelveKeyDialer(this, mDialerView);
+        ViewStub stub = (ViewStub) findViewById(R.id.dtmf_twelve_key_dialer_stub);
+        mDialer = new DTMFTwelveKeyDialer(this, stub);
         mPowerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
     }
 
@@ -1299,7 +1358,7 @@ public void onBackPressed() {
         // in-call UI:
 
         if (mDialer.isOpened()) {
-            hideDialpadInternal(true);  // do the "closing" animation
+            closeDialpadInternal(true);  // do the "closing" animation
             return;
         }
 
@@ -1617,6 +1676,8 @@ private void onPhoneStateChanged(AsyncResult r) {
             return;
         }
 
+        updateExpandedViewState();
+
         // Update the onscreen UI.
         // We use requestUpdateScreen() here (which posts a handler message)
         // instead of calling updateScreen() directly, which allows us to avoid
@@ -1649,7 +1710,8 @@ private void onPhoneStateChanged(AsyncResult r) {
     private void onDisconnect(AsyncResult r) {
         Connection c = (Connection) r.result;
         Connection.DisconnectCause cause = c.getDisconnectCause();
-        if (DBG) log("onDisconnect: connection '" + c + "', cause = " + cause);
+        if (DBG) log("onDisconnect: connection '" + c + "', cause = " + cause
+                + ", showing screen: " + mApp.isShowingCallScreen());
 
         boolean currentlyIdle = !phoneIsInUse();
         int autoretrySetting = AUTO_RETRY_OFF;
@@ -1743,7 +1805,7 @@ private void onDisconnect(AsyncResult r) {
         // conference call there's no "call ended" state at all; in that
         // case we blow away any DISCONNECTED connections right now to make sure
         // the UI updates instantly to reflect the current state.]
-        Call call = c.getCall();
+        final Call call = c.getCall();
         if (call != null) {
             // We only care about situation of a single caller
             // disconnecting from a conference call.  In that case, the
@@ -1795,24 +1857,27 @@ private void onDisconnect(AsyncResult r) {
                  || (cause == Connection.DisconnectCause.INCOMING_REJECTED))
                 && currentlyIdle;
 
+        boolean showingQuickResponseDialog =
+                mRespondViaSmsManager != null && mRespondViaSmsManager.isShowingPopup();
+
         // Note: we also do some special handling for the case when a call
         // disconnects with cause==OUT_OF_SERVICE while making an
         // emergency call from airplane mode.  That's handled by
         // EmergencyCallHelper.onDisconnect().
 
-        // TODO: one more case where we *shouldn't* bail out immediately:
-        // If the disconnect event was from an incoming ringing call, but
-        // the "Respond via SMS" popup is visible onscreen.  (In this
-        // case, we let the popup stay up even after the incoming call
-        // stops ringing, to give people extra time to choose a response.)
-        //
-        // But watch out: if we allow the popup to stay onscreen even
-        // after the incoming call disconnects, then we'll *also* have to
-        // forcibly dismiss it if the InCallScreen gets paused in that
-        // state (like by the user pressing Power or the screen timing
-        // out).
+        if (bailOutImmediately && showingQuickResponseDialog) {
+            if (DBG) log("- onDisconnect: Respond-via-SMS dialog is still being displayed...");
 
-        if (bailOutImmediately) {
+            // Do *not* exit the in-call UI yet!
+            // If the call was an incoming call that was missed *and* the user is using
+            // quick response screen, we keep showing the screen for a moment, assuming the
+            // user wants to reply the call anyway.
+            //
+            // For this case, we will exit the screen when:
+            // - the message is sent (RespondViaSmsManager)
+            // - the message is canceled (RespondViaSmsManager), or
+            // - when the whole in-call UI becomes background (onPause())
+        } else if (bailOutImmediately) {
             if (DBG) log("- onDisconnect: bailOutImmediately...");
 
             // Exit the in-call UI!
@@ -1889,16 +1954,67 @@ private void onDisconnect(AsyncResult r) {
                 }
             }
 
+            // This is onDisconnect() request from the last phone call; no available call anymore.
+            //
+            // When the in-call UI is in background *because* the screen is turned off (unlike the
+            // other case where the other activity is being shown), we wake up the screen and
+            // show "DISCONNECTED" state once, with appropriate elapsed time. After showing that
+            // we *must* bail out of the screen again, showing screen lock if needed.
+            //
+            // See also comments for isForegroundActivityForProximity()
+            //
+            // TODO: Consider moving this to CallNotifier. This code assumes the InCallScreen
+            // never gets destroyed. For this exact case, it works (since InCallScreen won't be
+            // destroyed), while technically this isn't right; Activity may be destroyed when
+            // in background.
+            if (currentlyIdle && !isForegroundActivity() && isForegroundActivityForProximity()) {
+                log("Force waking up the screen to let users see \"disconnected\" state");
+                if (call != null) {
+                    mCallCard.updateElapsedTimeWidget(call);
+                }
+                // This variable will be kept true until the next InCallScreen#onPause(), which
+                // forcibly turns it off regardless of the situation (for avoiding unnecessary
+                // confusion around this special case).
+                mApp.inCallUiState.showAlreadyDisconnectedState = true;
+
+                // Finally request wake-up..
+                mApp.wakeUpScreen();
+
+                // InCallScreen#onResume() will set DELAYED_CLEANUP_AFTER_DISCONNECT message,
+                // so skip the following section.
+                return;
+            }
+
             // Finally, arrange for delayedCleanupAfterDisconnect() to get
             // called after a short interval (during which we display the
             // "call ended" state.)  At that point, if the
             // Phone is idle, we'll finish out of this activity.
-            int callEndedDisplayDelay =
-                    (cause == Connection.DisconnectCause.LOCAL)
-                    ? CALL_ENDED_SHORT_DELAY : CALL_ENDED_LONG_DELAY;
+            final int callEndedDisplayDelay;
+            switch (cause) {
+                // When the local user hanged up the ongoing call, it is ok to dismiss the screen
+                // soon. In other cases, we show the "hung up" screen longer.
+                //
+                // - For expected reasons we will use CALL_ENDED_LONG_DELAY.
+                // -- when the peer hanged up the call
+                // -- when the local user rejects the incoming call during the other ongoing call
+                // (TODO: there may be other cases which should be in this category)
+                //
+                // - For other unexpected reasons, we will use CALL_ENDED_EXTRA_LONG_DELAY,
+                //   assuming the local user wants to confirm the disconnect reason.
+                case LOCAL:
+                    callEndedDisplayDelay = CALL_ENDED_SHORT_DELAY;
+                    break;
+                case NORMAL:
+                case INCOMING_REJECTED:
+                    callEndedDisplayDelay = CALL_ENDED_LONG_DELAY;
+                    break;
+                default:
+                    callEndedDisplayDelay = CALL_ENDED_EXTRA_LONG_DELAY;
+                    break;
+            }
             mHandler.removeMessages(DELAYED_CLEANUP_AFTER_DISCONNECT);
             mHandler.sendEmptyMessageDelayed(DELAYED_CLEANUP_AFTER_DISCONNECT,
-                                             callEndedDisplayDelay);
+                    callEndedDisplayDelay);
         }
 
         // Remove 3way timer (only meaningful for CDMA)
@@ -1910,6 +2026,8 @@ private void onDisconnect(AsyncResult r) {
     /**
      * Brings up the "MMI Started" dialog.
      */
+    /* TODO: sort out MMI code (probably we should remove this method entirely). See also
+       MMI handling code in onResume()
     private void onMMIInitiate(AsyncResult r) {
         if (VDBG) log("onMMIInitiate()...  AsyncResult r = " + r);
 
@@ -1935,13 +2053,12 @@ private void onMMIInitiate(AsyncResult r) {
         Message message = Message.obtain(mHandler, PhoneApp.MMI_CANCEL);
         mMmiStartedDialog = PhoneUtils.displayMMIInitiate(this, mmiCode,
                                                           message, mMmiStartedDialog);
-    }
+    }*/
 
     /**
      * Handles an MMI_CANCEL event, which is triggered by the button
      * (labeled either "OK" or "Cancel") on the "MMI Started" dialog.
-     * @see onMMIInitiate
-     * @see PhoneUtils.cancelMmiCode
+     * @see PhoneUtils#cancelMmiCode(Phone)
      */
     private void onMMICancel() {
         if (VDBG) log("onMMICancel()...");
@@ -1959,9 +2076,32 @@ private void onMMICancel() {
         // partially-constructed state as soon as the "MMI Started" dialog
         // gets dismissed.  So let's forcibly bail out right now.
         if (DBG) log("onMMICancel: finishing InCallScreen...");
+        dismissAllDialogs();
         endInCallScreenSession();
     }
 
+    /**
+     * Handles an MMI_COMPLETE event, which is triggered by telephony,
+     * implying MMI
+     */
+    private void onMMIComplete(MmiCode mmiCode) {
+        // Check the code to see if the request is ready to
+        // finish, this includes any MMI state that is not
+        // PENDING.
+
+        // if phone is a CDMA phone display feature code completed message
+        int phoneType = mPhone.getPhoneType();
+        if (phoneType == Phone.PHONE_TYPE_CDMA) {
+            PhoneUtils.displayMMIComplete(mPhone, mApp, mmiCode, null, null);
+        } else if (phoneType == Phone.PHONE_TYPE_GSM) {
+            if (mmiCode.getState() != MmiCode.State.PENDING) {
+                if (DBG) log("Got MMI_COMPLETE, finishing InCallScreen...");
+                dismissAllDialogs();
+                endInCallScreenSession();
+            }
+        }
+    }
+
     /**
      * Handles the POST_ON_DIAL_CHARS message from the Phone
      * (see our call to mPhone.setOnPostDialCharacter() above.)
@@ -2054,18 +2194,21 @@ private void showWaitPromptDialog(final Connection c, String postDialStr) {
         mWaitPromptDialog = new AlertDialog.Builder(this)
                 .setMessage(buf.toString())
                 .setPositiveButton(R.string.pause_prompt_yes,
-                    new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int whichButton) {
-                            if (DBG) log("handle WAIT_PROMPT_CONFIRMED, proceed...");
-                            c.proceedAfterWaitChar();
-                        }
-                    })
-                .setNegativeButton(R.string.pause_prompt_no, new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int whichButton) {
-                            if (DBG) log("handle POST_DIAL_CANCELED!");
-                            c.cancelPostDial();
-                        }
-                    })
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int whichButton) {
+                                if (DBG) log("handle WAIT_PROMPT_CONFIRMED, proceed...");
+                                c.proceedAfterWaitChar();
+                            }
+                        })
+                .setNegativeButton(R.string.pause_prompt_no,
+                        new DialogInterface.OnClickListener() {
+                            @Override
+                            public void onClick(DialogInterface dialog, int whichButton) {
+                                if (DBG) log("handle POST_DIAL_CANCELED!");
+                                c.cancelPostDial();
+                            }
+                        })
                 .create();
         mWaitPromptDialog.getWindow().addFlags(
                 WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
@@ -2146,6 +2289,7 @@ private void showWildPromptDialog(final Connection c) {
                 .setPositiveButton(
                         R.string.send_button,
                         new DialogInterface.OnClickListener() {
+                            @Override
                             public void onClick(DialogInterface dialog, int whichButton) {
                                 if (VDBG) log("handle WILD_PROMPT_CHAR_ENTERED, proceed...");
                                 String replacement = null;
@@ -2159,6 +2303,7 @@ public void onClick(DialogInterface dialog, int whichButton) {
                         })
                 .setOnCancelListener(
                         new DialogInterface.OnCancelListener() {
+                            @Override
                             public void onCancel(DialogInterface dialog) {
                                 if (VDBG) log("handle POST_DIAL_CANCELED!");
                                 c.cancelPostDial();
@@ -2183,6 +2328,9 @@ public void onCancel(DialogInterface dialog) {
      * some other thread, or if you just want to "post a request" for the screen
      * to be updated (rather than doing it synchronously), call
      * requestUpdateScreen() instead.
+     *
+     * Right now this method will update UI visibility immediately, with no animation.
+     * TODO: have animate flag here and use it anywhere possible.
      */
     private void updateScreen() {
         if (DBG) log("updateScreen()...");
@@ -2204,18 +2352,21 @@ private void updateScreen() {
         }
 
         if (inCallScreenMode == InCallScreenMode.OTA_NORMAL) {
-            if (DBG) log("- updateScreen: OTA call state NORMAL...");
+            if (DBG) log("- updateScreen: OTA call state NORMAL (NOT updating in-call UI)...");
+            mCallCard.setVisibility(View.GONE);
             if (mApp.otaUtils != null) {
-                if (DBG) log("- updateScreen: mApp.otaUtils is not null, call otaShowProperScreen");
                 mApp.otaUtils.otaShowProperScreen();
+            } else {
+                Log.w(LOG_TAG, "OtaUtils object is null, not showing any screen for that.");
             }
-            return;
+            return;  // Return without updating in-call UI.
         } else if (inCallScreenMode == InCallScreenMode.OTA_ENDED) {
-            if (DBG) log("- updateScreen: OTA call ended state ...");
+            if (DBG) log("- updateScreen: OTA call ended state (NOT updating in-call UI)...");
+            mCallCard.setVisibility(View.GONE);
             // Wake up the screen when we get notification, good or bad.
             mApp.wakeUpScreen();
             if (mApp.cdmaOtaScreenState.otaScreenState
-                == CdmaOtaScreenState.OtaScreenState.OTA_STATUS_ACTIVATION) {
+                    == CdmaOtaScreenState.OtaScreenState.OTA_STATUS_ACTIVATION) {
                 if (DBG) log("- updateScreen: OTA_STATUS_ACTIVATION");
                 if (mApp.otaUtils != null) {
                     if (DBG) log("- updateScreen: mApp.otaUtils is not null, "
@@ -2229,11 +2380,12 @@ private void updateScreen() {
                     mApp.otaUtils.otaShowSuccessFailure();
                 }
             }
-            return;
+            return;  // Return without updating in-call UI.
         } else if (inCallScreenMode == InCallScreenMode.MANAGE_CONFERENCE) {
             if (DBG) log("- updateScreen: manage conference mode (NOT updating in-call UI)...");
+            mCallCard.setVisibility(View.GONE);
             updateManageConferencePanelIfNecessary();
-            return;
+            return;  // Return without updating in-call UI.
         } else if (inCallScreenMode == InCallScreenMode.CALL_ENDED) {
             if (DBG) log("- updateScreen: call ended state...");
             // Continue with the rest of updateScreen() as usual, since we do
@@ -2247,8 +2399,39 @@ private void updateScreen() {
         // space the InCallTouchUi widget needs.
         updateInCallTouchUi();
         mCallCard.updateState(mCM);
-        updateDialpadVisibility();
-        updateProviderOverlay();
+
+        // If an incoming call is ringing, make sure the dialpad is
+        // closed.  (We do this to make sure we're not covering up the
+        // "incoming call" UI.)
+        if (mCM.getState() == Phone.State.RINGING) {
+            if (mDialer.isOpened()) {
+              Log.i(LOG_TAG, "During RINGING state we force hiding dialpad.");
+              closeDialpadInternal(false);  // don't do the "closing" animation
+            }
+
+            // At this point, we are guranteed that the dialer is closed.
+            // This means that it is safe to clear out the "history" of DTMF digits
+            // you may have typed into the previous call (so you don't see the
+            // previous call's digits if you answer this call and then bring up the
+            // dialpad.)
+            //
+            // TODO: it would be more precise to do this when you *answer* the
+            // incoming call, rather than as soon as it starts ringing, but
+            // the InCallScreen doesn't keep enough state right now to notice
+            // that specific transition in onPhoneStateChanged().
+            // TODO: This clears out the dialpad context as well so when a second
+            // call comes in while a voicemail call is happening, the voicemail
+            // dialpad will no longer have the "Voice Mail" context. It's a small
+            // case so not terribly bad, but we need to maintain a better
+            // call-to-callstate mapping before we can fix this.
+            mDialer.clearDigits();
+        }
+
+
+        // Now that we're sure DTMF dialpad is in an appropriate state, reflect
+        // the dialpad state into CallCard
+        updateCallCardVisibilityPerDialerState(false);
+
         updateProgressIndication();
 
         // Forcibly take down all dialog if an incoming call is ringing.
@@ -2338,8 +2521,10 @@ private SyncWithPhoneStateStatus syncWithPhoneState() {
         // happening in the background.
         boolean showProgressIndication = mApp.inCallUiState.isProgressIndicationActive();
 
+        boolean showScreenEvenAfterDisconnect = mApp.inCallUiState.showAlreadyDisconnectedState;
+
         if (mCM.hasActiveFgCall() || mCM.hasActiveBgCall() || mCM.hasActiveRingingCall()
-                || hasPendingMmiCodes || showProgressIndication) {
+                || hasPendingMmiCodes || showProgressIndication || showScreenEvenAfterDisconnect) {
             if (VDBG) log("syncWithPhoneState: it's ok to be here; update the screen...");
             updateScreen();
             return SyncWithPhoneStateStatus.SUCCESS;
@@ -2433,7 +2618,7 @@ private void dontAddVoiceMailNumber() {
      * nothing, and instead stay here on the InCallScreen.
      */
     private void delayedCleanupAfterDisconnect() {
-        log("delayedCleanupAfterDisconnect()...  Phone state = " + mCM.getState());
+        if (VDBG) log("delayedCleanupAfterDisconnect()...  Phone state = " + mCM.getState());
 
         // Clean up any connections in the DISCONNECTED state.
         //
@@ -2456,7 +2641,7 @@ private void delayedCleanupAfterDisconnect() {
         boolean stayHere = phoneIsInUse() || mApp.inCallUiState.isProgressIndicationActive();
 
         if (stayHere) {
-            log("- delayedCleanupAfterDisconnect: staying on the InCallScreen...");
+            if (DBG) log("- delayedCleanupAfterDisconnect: staying on the InCallScreen...");
         } else {
             // Phone is idle!  We should exit the in-call UI now.
             if (DBG) log("- delayedCleanupAfterDisconnect: phone is idle...");
@@ -2501,13 +2686,14 @@ private void delayedCleanupAfterDisconnect() {
                         && !isPhoneStateRestricted()
                         && PhoneApp.sVoiceCapable) {
                     final Intent intent = mApp.createPhoneEndIntentUsingCallOrigin();
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+                    ActivityOptions opts = ActivityOptions.makeCustomAnimation(this,
+                            R.anim.activity_close_enter, R.anim.activity_close_exit);
                     if (VDBG) {
                         log("- Show Call Log (or Dialtacts) after disconnect. Current intent: "
                                 + intent);
                     }
                     try {
-                        startActivity(intent);
+                        startActivity(intent, opts.toBundle());
                     } catch (ActivityNotFoundException e) {
                         // Don't crash if there's somehow no "Call log" at
                         // all on this device.
@@ -2539,11 +2725,15 @@ private void delayedCleanupAfterDisconnect() {
      * This method handles clicks from UI elements that use the
      * InCallScreen itself as their OnClickListener.
      *
-     * Note: Currently this method is used only for a few special buttons: the
-     * mButtonManageConferenceDone "Back to call" button, and the OTASP-specific
-     * buttons managed by OtaUtils.java.  *Most* in-call controls are handled by
-     * the handleOnscreenButtonClick() method, via the InCallTouchUi widget.
+     * Note: Currently this method is used only for a few special buttons:
+     * - the mButtonManageConferenceDone "Back to call" button
+     * - the "dim" effect for the secondary call photo in CallCard as the second "swap" button
+     * - other OTASP-specific buttons managed by OtaUtils.java.
+     *
+     * *Most* in-call controls are handled by the handleOnscreenButtonClick() method, via the
+     * InCallTouchUi widget.
      */
+    @Override
     public void onClick(View view) {
         int id = view.getId();
         if (VDBG) log("onClick(View " + view + ", id " + id + ")...");
@@ -2556,6 +2746,12 @@ public void onClick(View view) {
                 requestUpdateScreen();
                 break;
 
+            case R.id.dim_effect_for_secondary_photo:
+                if (mInCallControlState.canSwap) {
+                    internalSwapCalls();
+                }
+                break;
+
             default:
                 // Presumably one of the OTASP-specific buttons managed by
                 // OtaUtils.java.
@@ -2613,7 +2809,7 @@ private void onHoldClick() {
         // enough.)
 
         // Also, any time we hold or unhold, force the DTMF dialpad to close.
-        hideDialpadInternal(true);  // do the "closing" animation
+        closeDialpadInternal(true);  // do the "closing" animation
     }
 
     /**
@@ -2756,19 +2952,23 @@ public void switchInCallAudio(InCallAudioMode newMode) {
     }
 
     /**
-     * Handle a click on the "Show/Hide dialpad" button.
+     * Handle a click on the "Open/Close dialpad" button.
+     *
+     * @see DTMFTwelveKeyDialer#openDialer(boolean)
+     * @see DTMFTwelveKeyDialer#closeDialer(boolean)
      */
-    private void onShowHideDialpad() {
-        if (VDBG) log("onShowHideDialpad()...");
+    private void onOpenCloseDialpad() {
+        if (VDBG) log("onOpenCloseDialpad()...");
         if (mDialer.isOpened()) {
-            hideDialpadInternal(true);  // do the "closing" animation
+            closeDialpadInternal(true);  // do the "closing" animation
         } else {
-            showDialpadInternal(true);  // do the "opening" animation
+            openDialpadInternal(true);  // do the "opening" animation
         }
+        mApp.updateProximitySensorMode(mCM.getState());
     }
 
-    // Internal wrapper around DTMFTwelveKeyDialer.openDialer()
-    private void showDialpadInternal(boolean animate) {
+    /** Internal wrapper around {@link DTMFTwelveKeyDialer#openDialer(boolean)} */
+    private void openDialpadInternal(boolean animate) {
         mDialer.openDialer(animate);
         // And update the InCallUiState (so that we'll restore the dialpad
         // to the correct state if we get paused/resumed).
@@ -2776,7 +2976,7 @@ private void showDialpadInternal(boolean animate) {
     }
 
     // Internal wrapper around DTMFTwelveKeyDialer.closeDialer()
-    private void hideDialpadInternal(boolean animate) {
+    private void closeDialpadInternal(boolean animate) {
         mDialer.closeDialer(animate);
         // And update the InCallUiState (so that we'll restore the dialpad
         // to the correct state if we get paused/resumed).
@@ -2812,7 +3012,7 @@ private void hideDialpadInternal(boolean animate) {
                 internalHangup();
                 break;
             case R.id.dialpadButton:
-                onShowHideDialpad();
+                onOpenCloseDialpad();
                 break;
             case R.id.muteButton:
                 onMuteClick();
@@ -2857,45 +3057,6 @@ private void hideDialpadInternal(boolean animate) {
         updateInCallTouchUi();
     }
 
-    /**
-     * Update the network provider's overlay based on the value of
-     * InCallUiState.providerOverlayVisible.
-     * If false the overlay is hidden otherwise it is shown.  A
-     * delayed message is posted to take the overalay down after
-     * PROVIDER_OVERLAY_TIMEOUT. This ensures the user will see the
-     * overlay even if the call setup phase is very short.
-     */
-    private void updateProviderOverlay() {
-        final InCallUiState inCallUiState = mApp.inCallUiState;
-
-        if (VDBG) log("updateProviderOverlay: " + inCallUiState.providerOverlayVisible);
-
-        ViewGroup overlay = (ViewGroup) findViewById(R.id.inCallProviderOverlay);
-
-        if (inCallUiState.providerOverlayVisible) {
-            CharSequence template = getText(R.string.calling_via_template);
-            CharSequence text = TextUtils.expandTemplate(template,
-                                                         inCallUiState.providerLabel,
-                                                         inCallUiState.providerAddress);
-
-            TextView message = (TextView) findViewById(R.id.callingVia);
-            message.setText(text);
-
-            ImageView image = (ImageView) findViewById(R.id.callingViaIcon);
-            image.setImageDrawable(inCallUiState.providerIcon);
-
-            overlay.setVisibility(View.VISIBLE);
-
-            // Remove any zombie messages and then send a message to
-            // self to remove the overlay after some time.
-            mHandler.removeMessages(EVENT_HIDE_PROVIDER_OVERLAY);
-            Message msg = Message.obtain(mHandler, EVENT_HIDE_PROVIDER_OVERLAY);
-            mHandler.sendMessageDelayed(msg, PROVIDER_OVERLAY_TIMEOUT);
-        } else {
-            overlay.setVisibility(View.GONE);
-        }
-    }
-
     /**
      * Display a status or error indication to the user according to the
      * specified InCallUiState.CallStatusCode value.
@@ -3074,7 +3235,7 @@ private void showCallLostDialog() {
 
         mCallLostDialog = new AlertDialog.Builder(this)
                 .setMessage(R.string.call_lost)
-                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .create();
         mCallLostDialog.show();
     }
@@ -3332,7 +3493,7 @@ private void dismissProgressIndication() {
      * ringing or waiting call.
      */
     private void internalAnswerCall() {
-        log("internalAnswerCall()...");
+        if (DBG) log("internalAnswerCall()...");
         // if (DBG) PhoneUtils.dumpCallState(mPhone);
 
         final boolean hasRingingCall = mCM.hasActiveRingingCall();
@@ -3376,7 +3537,8 @@ private void internalAnswerCall() {
                 } else {
                     PhoneUtils.answerCall(ringing);
                 }
-            }else if (phoneType == Phone.PHONE_TYPE_GSM){
+            } else if (phoneType == Phone.PHONE_TYPE_GSM) {
+                if (DBG) log("internalAnswerCall: answering (GSM)...");
                 // GSM: this is usually just a wrapper around
                 // PhoneUtils.answerCall(), *but* we also need to do
                 // something special for the "both lines in use" case.
@@ -3450,11 +3612,6 @@ private void internalRespondViaSms() {
         log("internalRespondViaSms()...");
         if (VDBG) PhoneUtils.dumpCallManager();
 
-        if (mRespondViaSmsManager == null) {
-            throw new IllegalStateException(
-                "got internalRespondViaSms(), but mRespondViaSmsManager was never initialized");
-        }
-
         // In the rare case when multiple calls are ringing, the UI policy
         // it to always act on the first ringing call.
         Call ringingCall = mCM.getFirstActiveRingingCall();
@@ -3528,7 +3685,7 @@ private void internalSwapCalls() {
         // Any time we swap calls, force the DTMF dialpad to close.
         // (We want the regular in-call UI to be visible right now, so the
         // user can clearly see which call is now in the foreground.)
-        hideDialpadInternal(true);  // do the "closing" animation
+        closeDialpadInternal(true);  // do the "closing" animation
 
         // Also, clear out the "history" of DTMF digits you typed, to make
         // sure you don't see digits from call #1 while call #2 is active.
@@ -3599,7 +3756,7 @@ private void setInCallScreenMode(InCallScreenMode newMode) {
                 mManageConferenceUtils.updateManageConferencePanel(connections);
 
                 // The "Manage conference" UI takes up the full main frame,
-                // replacing the inCallPanel and CallCard PopupWindow.
+                // replacing the CallCard PopupWindow.
                 mManageConferenceUtils.setPanelVisible(true);
 
                 // Start the chronometer.
@@ -3614,31 +3771,13 @@ private void setInCallScreenMode(InCallScreenMode newMode) {
                 mManageConferenceUtils.startConferenceTime(
                         SystemClock.elapsedRealtime() - callDuration);
 
-                mInCallPanel.setVisibility(View.GONE);
-
                 // No need to close the dialer here, since the Manage
                 // Conference UI will just cover it up anyway.
 
                 break;
 
             case CALL_ENDED:
-                // Display the CallCard (in the "Call ended" state)
-                // and hide all other UI.
-
-                mManageConferenceUtils.setPanelVisible(false);
-                mManageConferenceUtils.stopConferenceTime();
-
-                // Make sure the CallCard (which is a child of mInCallPanel) is visible.
-                mInCallPanel.setVisibility(View.VISIBLE);
-
-                break;
-
             case NORMAL:
-                if (isDialerOpened()) {
-                    mInCallPanel.setVisibility(View.GONE);
-                } else {
-                    mInCallPanel.setVisibility(View.VISIBLE);
-                }
                 mManageConferenceUtils.setPanelVisible(false);
                 mManageConferenceUtils.stopConferenceTime();
                 break;
@@ -3646,13 +3785,11 @@ private void setInCallScreenMode(InCallScreenMode newMode) {
             case OTA_NORMAL:
                 mApp.otaUtils.setCdmaOtaInCallScreenUiState(
                         OtaUtils.CdmaOtaInCallScreenUiState.State.NORMAL);
-                mInCallPanel.setVisibility(View.GONE);
                 break;
 
             case OTA_ENDED:
                 mApp.otaUtils.setCdmaOtaInCallScreenUiState(
                         OtaUtils.CdmaOtaInCallScreenUiState.State.ENDED);
-                mInCallPanel.setVisibility(View.GONE);
                 break;
 
             case UNDEFINED:
@@ -3692,7 +3829,6 @@ private void setInCallScreenMode(InCallScreenMode newMode) {
                     log("WARNING: Setting mode to UNDEFINED but phone is OFFHOOK,"
                             + " skip cleanOtaScreen.");
                 }
-                mInCallPanel.setVisibility(View.VISIBLE);
                 break;
         }
     }
@@ -3758,55 +3894,46 @@ private void updateManageConferencePanelIfNecessary() {
     }
 
     /**
-     * Updates the visibility of the DTMF dialpad (and its onscreen
-     * "handle", if applicable), based on the current state of the phone
-     * and/or the current InCallScreenMode.
+     * Updates {@link #mCallCard}'s visibility state per DTMF dialpad visibility. They
+     * cannot be shown simultaneously and thus we should reflect DTMF dialpad visibility into
+     * another.
+     *
+     * Note: During OTA calls or users' managing conference calls, we should *not* call this method
+     * but manually manage both visibility.
+     *
+     * @see #updateScreen()
      */
-    private void updateDialpadVisibility() {
-        //
-        // (1) The dialpad itself:
-        //
-        // If an incoming call is ringing, make sure the dialpad is
-        // closed.  (We do this to make sure we're not covering up the
-        // "incoming call" UI, and especially to make sure that the "touch
-        // lock" overlay won't appear.)
-        if (mCM.getState() == Phone.State.RINGING) {
-            hideDialpadInternal(false);  // don't do the "closing" animation
-
-            // Also, clear out the "history" of DTMF digits you may have typed
-            // into the previous call (so you don't see the previous call's
-            // digits if you answer this call and then bring up the dialpad.)
-            //
-            // TODO: it would be more precise to do this when you *answer* the
-            // incoming call, rather than as soon as it starts ringing, but
-            // the InCallScreen doesn't keep enough state right now to notice
-            // that specific transition in onPhoneStateChanged().
-            mDialer.clearDigits();
-        }
-
-        //
-        // (2) The main in-call panel (containing the CallCard):
-        //
-        // We need to hide the CallCard (which is a
-        // child of mInCallPanel) while the dialpad is visible.
-        //
-
+    private void updateCallCardVisibilityPerDialerState(boolean animate) {
+        // We need to hide the CallCard while the dialpad is visible.
         if (isDialerOpened()) {
-            if (VDBG) log("- updateDialpadVisibility: dialpad open, hide mInCallPanel...");
-            CallCard.Fade.hide(mInCallPanel, View.GONE);
+            if (VDBG) {
+                log("- updateCallCardVisibilityPerDialerState(animate="
+                        + animate + "): dialpad open, hide mCallCard...");
+            }
+            if (animate) {
+                AnimationUtils.Fade.hide(mCallCard, View.GONE);
+            } else {
+                mCallCard.setVisibility(View.GONE);
+            }
         } else {
-            // Dialpad is dismissed; bring back the CallCard if
-            // it's supposed to be visible.
+            // Dialpad is dismissed; bring back the CallCard if it's supposed to be visible.
             if ((mApp.inCallUiState.inCallScreenMode == InCallScreenMode.NORMAL)
                 || (mApp.inCallUiState.inCallScreenMode == InCallScreenMode.CALL_ENDED)) {
-                if (VDBG) log("- updateDialpadVisibility: dialpad dismissed, show mInCallPanel...");
-                CallCard.Fade.show(mInCallPanel);
+                if (VDBG) {
+                    log("- updateCallCardVisibilityPerDialerState(animate="
+                            + animate + "): dialpad dismissed, show mCallCard...");
+                }
+                if (animate) {
+                    AnimationUtils.Fade.show(mCallCard);
+                } else {
+                    mCallCard.setVisibility(View.VISIBLE);
+                }
             }
         }
     }
 
     /**
-     * @return true if the DTMF dialpad is currently visible.
+     * @see DTMFTwelveKeyDialer#isOpened()
      */
     /* package */ boolean isDialerOpened() {
         return (mDialer != null && mDialer.isOpened());
@@ -3814,16 +3941,16 @@ private void updateDialpadVisibility() {
 
     /**
      * Called any time the DTMF dialpad is opened.
-     * @see DTMFTwelveKeyDialer.onDialerOpen()
+     * @see DTMFTwelveKeyDialer#openDialer(boolean)
      */
-    /* package */ void onDialerOpen() {
+    /* package */ void onDialerOpen(boolean animate) {
         if (DBG) log("onDialerOpen()...");
 
         // Update the in-call touch UI.
         updateInCallTouchUi();
 
-        // Update any other onscreen UI elements that depend on the dialpad.
-        updateDialpadVisibility();
+        // Update CallCard UI, which depends on the dialpad.
+        updateCallCardVisibilityPerDialerState(animate);
 
         // This counts as explicit "user activity".
         mApp.pokeUserActivity();
@@ -3840,9 +3967,9 @@ private void updateDialpadVisibility() {
 
     /**
      * Called any time the DTMF dialpad is closed.
-     * @see DTMFTwelveKeyDialer.onDialerClose()
+     * @see DTMFTwelveKeyDialer#closeDialer(boolean)
      */
-    /* package */ void onDialerClose() {
+    /* package */ void onDialerClose(boolean animate) {
         if (DBG) log("onDialerClose()...");
 
         // OTA-specific cleanup upon closing the dialpad.
@@ -3859,9 +3986,8 @@ private void updateDialpadVisibility() {
         // Update the in-call touch UI.
         updateInCallTouchUi();
 
-        // Update the visibility of the dialpad itself (and any other
-        // onscreen UI elements that depend on it.)
-        updateDialpadVisibility();
+        // Update CallCard UI, which depends on the dialpad.
+        updateCallCardVisibilityPerDialerState(animate);
 
         // This counts as explicit "user activity".
         mApp.pokeUserActivity();
@@ -3870,7 +3996,7 @@ private void updateDialpadVisibility() {
     /**
      * Determines when we can dial DTMF tones.
      */
-    private boolean okToDialDTMFTones() {
+    /* package */ boolean okToDialDTMFTones() {
         final boolean hasRingingCall = mCM.hasActiveRingingCall();
         final Call.State fgCallState = mCM.getActiveFgCallState();
 
@@ -3903,9 +4029,9 @@ private boolean okToDialDTMFTones() {
      *      dialpad" onscreen button; see InCallControlState.dialpadEnabled.)
      */
     /* package */ boolean okToShowDialpad() {
-        // The dialpad is available only when it's OK to dial DTMF
-        // tones given the current state of the current call.
-        return okToDialDTMFTones();
+        // Very similar to okToDialDTMFTones(), but allow DIALING here.
+        final Call.State fgCallState = mCM.getActiveFgCallState();
+        return okToDialDTMFTones() || (fgCallState == Call.State.DIALING);
     }
 
     /**
@@ -3959,29 +4085,6 @@ private void updateInCallTouchUi() {
         mHandler.sendEmptyMessage(REQUEST_UPDATE_SCREEN);
     }
 
-    /**
-     * @return true if it's OK to display the in-call touch UI, given the
-     * current state of the InCallScreen.
-     */
-    /* package */ boolean okToShowInCallTouchUi() {
-        // Note that this method is concerned only with the internal state
-        // of the InCallScreen.  (The InCallTouchUi widget has separate
-        // logic to make sure it's OK to display the touch UI given the
-        // current telephony state, and that it's allowed on the current
-        // device in the first place.)
-
-        // The touch UI is available in the following InCallScreenModes:
-        // - NORMAL (obviously)
-        // - CALL_ENDED (which is intended to look mostly the same as
-        //               a normal in-call state, even though the in-call
-        //               buttons are mostly disabled)
-        // and is hidden in any of the other modes, like MANAGE_CONFERENCE
-        // or one of the OTA modes (which use totally different UIs.)
-
-        return ((mApp.inCallUiState.inCallScreenMode == InCallScreenMode.NORMAL)
-                || (mApp.inCallUiState.inCallScreenMode == InCallScreenMode.CALL_ENDED));
-    }
-
     /**
      * @return true if we're in restricted / emergency dialing only mode.
      */
@@ -4291,7 +4394,7 @@ private boolean checkOtaspStateOnResume() {
             // (This call has no effect if the UI widgets have already been set up.
             // It only really matters  the very first time that the InCallScreen instance
             // is onResume()d after starting an OTASP call.)
-            mApp.otaUtils.updateUiWidgets(this, mInCallPanel, mInCallTouchUi, mCallCard);
+            mApp.otaUtils.updateUiWidgets(this, mInCallTouchUi, mCallCard);
 
             // Also update the InCallScreenMode based on the cdmaOtaInCallScreenState.
 
@@ -4403,6 +4506,24 @@ public void resetInCallScreenMode() {
         }
     }
 
+
+    /**
+     * Used when we need to update buttons outside InCallTouchUi's updateInCallControls() along
+     * with that method being called. CallCard may call this too because it doesn't have
+     * enough information to update buttons inside itself (more specifically, the class cannot
+     * obtain mInCallControllState without some side effect. See also
+     * {@link #getUpdatedInCallControlState()}. We probably don't want a method like
+     * getRawCallControlState() which returns raw intance with no side effect just for this
+     * corner case scenario)
+     *
+     * TODO: need better design for buttons outside InCallTouchUi.
+     */
+    /* package */ void updateButtonStateOutsideInCallTouchUi() {
+        if (mCallCard != null) {
+            mCallCard.setSecondaryCallClickable(mInCallControlState.canSwap);
+        }
+    }
+
     @Override
     public boolean dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
         super.dispatchPopulateAccessibilityEvent(event);
@@ -4464,14 +4585,20 @@ private void onIncomingRing() {
 
     /**
      * Handles a "new ringing connection" event from the telephony layer.
+     *
+     * This event comes in right at the start of the incoming-call sequence,
+     * exactly once per incoming call.
+     *
+     * Watch out: this won't be called if InCallScreen isn't ready yet,
+     * which typically happens for the first incoming phone call (even before
+     * the possible first outgoing call).
      */
     private void onNewRingingConnection() {
         if (DBG) log("onNewRingingConnection()...");
 
-        // This event comes in right at the start of the incoming-call
-        // sequence, exactly once per incoming call.  We use this event to
-        // reset any incoming-call-related UI elements that might have
-        // been left in an inconsistent state after a prior incoming call.
+        // We use this event to reset any incoming-call-related UI elements
+        // that might have been left in an inconsistent state after a prior
+        // incoming call.
         // (Note we do this whether or not we're the foreground activity,
         // since this event comes in *before* we actually get launched to
         // display the incoming-call UI.)
@@ -4484,12 +4611,44 @@ private void onNewRingingConnection() {
         // need it here too, to make sure the popup gets reset in the case
         // where a call-waiting call comes in while the InCallScreen is
         // already in the foreground.)
-        if (mRespondViaSmsManager != null) {
-            mRespondViaSmsManager.dismissPopup();  // safe even if already dismissed
+        mRespondViaSmsManager.dismissPopup();  // safe even if already dismissed
+    }
+
+    /**
+     * Enables or disables the status bar "window shade" based on the current situation.
+     */
+    private void updateExpandedViewState() {
+        if (mIsForegroundActivity) {
+            if (mApp.proximitySensorModeEnabled()) {
+                // We should not enable notification's expanded view on RINGING state.
+                mApp.notificationMgr.statusBarHelper.enableExpandedView(
+                        mCM.getState() != Phone.State.RINGING);
+            } else {
+                // If proximity sensor is unavailable on the device, disable it to avoid false
+                // touches toward notifications.
+                mApp.notificationMgr.statusBarHelper.enableExpandedView(false);
+            }
+        } else {
+            mApp.notificationMgr.statusBarHelper.enableExpandedView(true);
         }
     }
 
     private void log(String msg) {
         Log.d(LOG_TAG, msg);
     }
+
+    /**
+     * Requests to remove provider info frame after having
+     * {@link #PROVIDER_INFO_TIMEOUT}) msec delay.
+     */
+    /* package */ void requestRemoveProviderInfoWithDelay() {
+        // Remove any zombie messages and then send a message to
+        // self to remove the provider info after some time.
+        mHandler.removeMessages(EVENT_HIDE_PROVIDER_INFO);
+        Message msg = Message.obtain(mHandler, EVENT_HIDE_PROVIDER_INFO);
+        mHandler.sendMessageDelayed(msg, PROVIDER_INFO_TIMEOUT);
+        if (DBG) {
+            log("Requested to remove provider info after " + PROVIDER_INFO_TIMEOUT + " msec.");
+        }
+    }
 }
diff --git a/src/com/android/phone/InCallScreenShowActivation.java b/src/com/android/phone/InCallScreenShowActivation.java
index 2e5192e16..ad13186f4 100644
--- a/src/com/android/phone/InCallScreenShowActivation.java
+++ b/src/com/android/phone/InCallScreenShowActivation.java
@@ -24,6 +24,7 @@
 import android.util.Log;
 
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.TelephonyCapabilities;
 
 /**
  * Invisible activity that handles the com.android.phone.PERFORM_CDMA_PROVISIONING intent.
diff --git a/src/com/android/phone/InCallTouchUi.java b/src/com/android/phone/InCallTouchUi.java
index f8ddc8f34..9845fa830 100644
--- a/src/com/android/phone/InCallTouchUi.java
+++ b/src/com/android/phone/InCallTouchUi.java
@@ -16,20 +16,24 @@
 
 package com.android.phone;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
-import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.LayoutInflater;
+import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewPropertyAnimator;
+import android.view.ViewStub;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 import android.view.animation.Animation.AnimationListener;
@@ -37,13 +41,14 @@
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.PopupMenu;
+import android.widget.Toast;
 
 import com.android.internal.telephony.Call;
-import com.android.internal.telephony.Phone;
-import com.android.internal.widget.multiwaveview.MultiWaveView;
-import com.android.internal.widget.multiwaveview.MultiWaveView.OnTriggerListener;
 import com.android.internal.telephony.CallManager;
-
+import com.android.internal.telephony.Phone;
+import com.android.internal.widget.multiwaveview.GlowPadView;
+import com.android.internal.widget.multiwaveview.GlowPadView.OnTriggerListener;
+import com.android.phone.InCallUiState.InCallScreenMode;
 
 /**
  * In-call onscreen touch UI elements, used on some platforms.
@@ -52,9 +57,8 @@
  * non-touch-sensitive parts of the in-call UI (i.e. the call card).
  */
 public class InCallTouchUi extends FrameLayout
-        implements View.OnClickListener, OnTriggerListener,
+        implements View.OnClickListener, View.OnLongClickListener, OnTriggerListener,
         PopupMenu.OnMenuItemClickListener, PopupMenu.OnDismissListener {
-    private static final int IN_CALL_WIDGET_TRANSITION_TIME = 250; // in ms
     private static final String LOG_TAG = "InCallTouchUi";
     private static final boolean DBG = (PhoneApp.DBG_LEVEL >= 2);
 
@@ -74,8 +78,14 @@ public class InCallTouchUi extends FrameLayout
     private PhoneApp mApp;
 
     // UI containers / elements
-    private MultiWaveView mIncomingCallWidget;  // UI used for an incoming call
-    private View mInCallControls;  // UI elements while on a regular call
+    private GlowPadView mIncomingCallWidget;  // UI used for an incoming call
+    private boolean mIncomingCallWidgetIsFadingOut;
+    private boolean mIncomingCallWidgetShouldBeReset = true;
+
+    /** UI elements while on a regular call (bottom buttons, DTMF dialpad) */
+    private View mInCallControls;
+    private boolean mShowInCallControlsDuringHidingAnimation;
+
     //
     private ImageButton mAddButton;
     private ImageButton mMergeButton;
@@ -86,8 +96,9 @@ public class InCallTouchUi extends FrameLayout
     private CompoundButton mHoldButton;
     private ImageButton mSwapButton;
     private View mHoldSwapSpacer;
-    //
-    private ViewGroup mExtraButtonRow;
+
+    // "Extra button row"
+    private ViewStub mExtraButtonRow;
     private ViewGroup mCdmaMergeButton;
     private ViewGroup mManageConferenceButton;
     private ImageButton mManageConferenceButtonImage;
@@ -99,7 +110,7 @@ public class InCallTouchUi extends FrameLayout
     // Time of the most recent "answer" or "reject" action (see updateState())
     private long mLastIncomingCallActionTime;  // in SystemClock.uptimeMillis() time base
 
-    // Parameters for the MultiWaveView "ping" animation; see triggerPing().
+    // Parameters for the GlowPadView "ping" animation; see triggerPing().
     private static final boolean ENABLE_PING_ON_RING_EVENTS = false;
     private static final boolean ENABLE_PING_AUTO_REPEAT = true;
     private static final long PING_AUTO_REPEAT_DELAY_MSEC = 1200;
@@ -124,21 +135,12 @@ public void handleMessage(Message msg) {
             }
         };
 
-
     public InCallTouchUi(Context context, AttributeSet attrs) {
         super(context, attrs);
 
         if (DBG) log("InCallTouchUi constructor...");
         if (DBG) log("- this = " + this);
         if (DBG) log("- context " + context + ", attrs " + attrs);
-
-        // Inflate our contents, and add it (to ourself) as a child.
-        LayoutInflater inflater = LayoutInflater.from(context);
-        inflater.inflate(
-                R.layout.incall_touch_ui,  // resource
-                this,                      // root
-                true);
-
         mApp = PhoneApp.getInstance();
     }
 
@@ -154,7 +156,7 @@ protected void onFinishInflate() {
         // Look up the various UI elements.
 
         // "Drag-to-answer" widget for incoming calls.
-        mIncomingCallWidget = (MultiWaveView) findViewById(R.id.incomingCallWidget);
+        mIncomingCallWidget = (GlowPadView) findViewById(R.id.incomingCallWidget);
         mIncomingCallWidget.setOnTriggerListener(this);
 
         // Container for the UI elements shown while on a regular call.
@@ -164,20 +166,27 @@ protected void onFinishInflate() {
         // Main cluster of buttons:
         mAddButton = (ImageButton) mInCallControls.findViewById(R.id.addButton);
         mAddButton.setOnClickListener(this);
+        mAddButton.setOnLongClickListener(this);
         mMergeButton = (ImageButton) mInCallControls.findViewById(R.id.mergeButton);
         mMergeButton.setOnClickListener(this);
+        mMergeButton.setOnLongClickListener(this);
         mEndButton = (ImageButton) mInCallControls.findViewById(R.id.endButton);
         mEndButton.setOnClickListener(this);
         mDialpadButton = (CompoundButton) mInCallControls.findViewById(R.id.dialpadButton);
         mDialpadButton.setOnClickListener(this);
+        mDialpadButton.setOnLongClickListener(this);
         mMuteButton = (CompoundButton) mInCallControls.findViewById(R.id.muteButton);
         mMuteButton.setOnClickListener(this);
+        mMuteButton.setOnLongClickListener(this);
         mAudioButton = (CompoundButton) mInCallControls.findViewById(R.id.audioButton);
         mAudioButton.setOnClickListener(this);
+        mAudioButton.setOnLongClickListener(this);
         mHoldButton = (CompoundButton) mInCallControls.findViewById(R.id.holdButton);
         mHoldButton.setOnClickListener(this);
+        mHoldButton.setOnLongClickListener(this);
         mSwapButton = (ImageButton) mInCallControls.findViewById(R.id.swapButton);
         mSwapButton.setOnClickListener(this);
+        mSwapButton.setOnLongClickListener(this);
         mHoldSwapSpacer = mInCallControls.findViewById(R.id.holdSwapSpacer);
 
         // TODO: Back when these buttons had text labels, we changed
@@ -195,34 +204,9 @@ protected void onFinishInflate() {
         // button in CDMA.
 
         // Buttons shown on the "extra button row", only visible in certain (rare) states.
-        mExtraButtonRow = (ViewGroup) mInCallControls.findViewById(R.id.extraButtonRow);
-        // The two "buttons" here (mCdmaMergeButton and mManageConferenceButton)
-        // are actually layouts containing an icon and a text label side-by-side.
-        mCdmaMergeButton =
-                (ViewGroup) mInCallControls.findViewById(R.id.cdmaMergeButton);
-        mCdmaMergeButton.setOnClickListener(this);
-        //
-        mManageConferenceButton =
-                (ViewGroup) mInCallControls.findViewById(R.id.manageConferenceButton);
-        mManageConferenceButton.setOnClickListener(this);
-        mManageConferenceButtonImage =
-                (ImageButton) mInCallControls.findViewById(R.id.manageConferenceButtonImage);
+        mExtraButtonRow = (ViewStub) mInCallControls.findViewById(R.id.extraButtonRow);
 
-        // Add a custom OnTouchListener to manually shrink the "hit
-        // target" of some buttons.
-        // (We do this for a few specific buttons which are vulnerable to
-        // "false touches" because either (1) they're near the edge of the
-        // screen and might be unintentionally touched while holding the
-        // device in your hand, or (2) they're in the upper corners and might
-        // be touched by the user's ear before the prox sensor has a chance to
-        // kick in.)
-        //
-        // TODO (new ICS layout): not sure which buttons need this yet.
-        // For now, use it only with the "End call" button (which extends all
-        // the way to the edges of the screen).  But we can consider doing
-        // this for "Dialpad" and/or "Add call" if those turn out to be a
-        // problem too.
-        //
+        // Add a custom OnTouchListener to manually shrink the "hit target".
         View.OnTouchListener smallerHitTargetTouchListener = new SmallerHitTargetTouchListener();
         mEndButton.setOnTouchListener(smallerHitTargetTouchListener);
     }
@@ -231,7 +215,7 @@ protected void onFinishInflate() {
      * Updates the visibility and/or state of our UI elements, based on
      * the current state of the phone.
      */
-    void updateState(CallManager cm) {
+    /* package */ void updateState(CallManager cm) {
         if (mInCallScreen == null) {
             log("- updateState: mInCallScreen has been destroyed; bailing out...");
             return;
@@ -251,8 +235,7 @@ void updateState(CallManager cm) {
         // layer rejects the ringing call while the FG call is dialing/alerting,
         // but the incoming call *does* briefly exist in the DISCONNECTING or
         // DISCONNECTED state.
-        if ((ringingCall.getState() != Call.State.IDLE)
-                && !fgCallState.isDialing()) {
+        if ((ringingCall.getState() != Call.State.IDLE) && !fgCallState.isDialing()) {
             // A phone call is ringing *or* call waiting.
 
             // Watch out: even if the phone state is RINGING, it's
@@ -266,9 +249,14 @@ void updateState(CallManager cm) {
             }
 
             // Ugly hack to cover up slow response from the radio:
-            // if we attempted to answer or reject an incoming call
-            // within the last 500 msec, *don't* show the incoming call
+            // if we get an updateState() call immediately after answering/rejecting a call
+            // (via onTrigger()), *don't* show the incoming call
             // UI even if the phone is still in the RINGING state.
+            // This covers up a slow response from the radio for some actions.
+            // To detect that situation, we are using "500 msec" heuristics.
+            //
+            // Watch out: we should *not* rely on this behavior when "instant text response" action
+            // has been chosen. See also onTrigger() for why.
             long now = SystemClock.uptimeMillis();
             if (now < mLastIncomingCallActionTime + 500) {
                 log("updateState: Too soon after last action; not drawing!");
@@ -276,20 +264,31 @@ void updateState(CallManager cm) {
             }
         } else {
             // Ok, show the regular in-call touch UI (with some exceptions):
-            if (mInCallScreen.okToShowInCallTouchUi()) {
+            if (okToShowInCallControls()) {
                 showInCallControls = true;
             } else {
                 if (DBG) log("- updateState: NOT OK to show touch UI; disabling...");
             }
         }
 
-        // Update visibility and state of the incoming call controls or
-        // the normal in-call controls.
-
+        // In usual cases we don't allow showing both incoming call controls and in-call controls.
+        //
+        // There's one exception: if this call is during fading-out animation for the incoming
+        // call controls, we need to show both for smoother transition.
         if (showIncomingCallControls && showInCallControls) {
             throw new IllegalStateException(
                 "'Incoming' and 'in-call' touch controls visible at the same time!");
         }
+        if (mShowInCallControlsDuringHidingAnimation) {
+            if (DBG) {
+                log("- updateState: FORCE showing in-call controls during incoming call widget"
+                        + " being hidden with animation");
+            }
+            showInCallControls = true;
+        }
+
+        // Update visibility and state of the incoming call controls or
+        // the normal in-call controls.
 
         if (showInCallControls) {
             if (DBG) log("- updateState: showing in-call controls...");
@@ -340,7 +339,26 @@ void updateState(CallManager cm) {
         }
     }
 
-    // View.OnClickListener implementation
+    private boolean okToShowInCallControls() {
+        // Note that this method is concerned only with the internal state
+        // of the InCallScreen.  (The InCallTouchUi widget has separate
+        // logic to make sure it's OK to display the touch UI given the
+        // current telephony state, and that it's allowed on the current
+        // device in the first place.)
+
+        // The touch UI is available in the following InCallScreenModes:
+        // - NORMAL (obviously)
+        // - CALL_ENDED (which is intended to look mostly the same as
+        //               a normal in-call state, even though the in-call
+        //               buttons are mostly disabled)
+        // and is hidden in any of the other modes, like MANAGE_CONFERENCE
+        // or one of the OTA modes (which use totally different UIs.)
+
+        return ((mApp.inCallUiState.inCallScreenMode == InCallScreenMode.NORMAL)
+                || (mApp.inCallUiState.inCallScreenMode == InCallScreenMode.CALL_ENDED));
+    }
+
+    @Override
     public void onClick(View view) {
         int id = view.getId();
         if (DBG) log("onClick(View " + view + ", id " + id + ")...");
@@ -370,17 +388,48 @@ public void onClick(View view) {
         }
     }
 
+    @Override
+    public boolean onLongClick(View view) {
+        final int id = view.getId();
+        if (DBG) log("onLongClick(View " + view + ", id " + id + ")...");
+
+        switch (id) {
+            case R.id.addButton:
+            case R.id.mergeButton:
+            case R.id.dialpadButton:
+            case R.id.muteButton:
+            case R.id.holdButton:
+            case R.id.swapButton:
+            case R.id.audioButton: {
+                final CharSequence description = view.getContentDescription();
+                if (!TextUtils.isEmpty(description)) {
+                    // Show description as ActionBar's menu buttons do.
+                    // See also ActionMenuItemView#onLongClick() for the original implementation.
+                    final Toast cheatSheet =
+                            Toast.makeText(view.getContext(), description, Toast.LENGTH_SHORT);
+                    cheatSheet.setGravity(
+                            Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL, 0, view.getHeight());
+                    cheatSheet.show();
+                }
+                return true;
+            }
+            default:
+                Log.w(LOG_TAG, "onLongClick() with unexpected View " + view + ". Ignoring it.");
+                break;
+        }
+        return false;
+    }
     /**
      * Updates the enabledness and "checked" state of the buttons on the
      * "inCallControls" panel, based on the current telephony state.
      */
-    void updateInCallControls(CallManager cm) {
+    private void updateInCallControls(CallManager cm) {
         int phoneType = cm.getActiveFgCall().getPhone().getPhoneType();
 
         // Note we do NOT need to worry here about cases where the entire
         // in-call touch UI is disabled, like during an OTA call or if the
         // dtmf dialpad is up.  (That's handled by updateState(), which
-        // calls InCallScreen.okToShowInCallTouchUi().)
+        // calls okToShowInCallControls().)
         //
         // If we get here, it *is* OK to show the in-call touch UI, so we
         // now need to update the enabledness and/or "checked" state of
@@ -391,9 +440,10 @@ void updateInCallControls(CallManager cm) {
         // state of the various onscreen buttons:
         InCallControlState inCallControlState = mInCallScreen.getUpdatedInCallControlState();
 
-        // The "extra button row" will be visible only if any of its
-        // buttons need to be visible.
-        boolean showExtraButtonRow = false;
+        if (DBG) {
+            log("updateInCallControls()...");
+            inCallControlState.dumpState();
+        }
 
         // "Add" / "Merge":
         // These two buttons occupy the same space onscreen, so at any
@@ -499,6 +549,7 @@ void updateInCallControls(CallManager cm) {
                 mHoldSwapSpacer.setVisibility(View.GONE);
             }
         }
+        mInCallScreen.updateButtonStateOutsideInCallTouchUi();
         if (inCallControlState.canSwap && inCallControlState.canHold) {
             // Uh oh, the InCallControlState thinks that Swap *and* Hold
             // should both be available.  This *should* never happen with
@@ -508,17 +559,6 @@ void updateInCallControls(CallManager cm) {
             Log.w(LOG_TAG, "updateInCallControls: Hold *and* Swap enabled, but can't show both!");
         }
 
-        // CDMA-specific "Merge" button.
-        // This button and its label are totally hidden (rather than just disabled)
-        // when the operation isn't available.
-        boolean showCdmaMerge =
-                (phoneType == Phone.PHONE_TYPE_CDMA) && inCallControlState.canMerge;
-        if (showCdmaMerge) {
-            mCdmaMergeButton.setVisibility(View.VISIBLE);
-            showExtraButtonRow = true;
-        } else {
-            mCdmaMergeButton.setVisibility(View.GONE);
-        }
         if (phoneType == Phone.PHONE_TYPE_CDMA) {
             if (inCallControlState.canSwap && inCallControlState.canMerge) {
                 // Uh oh, the InCallControlState thinks that Swap *and* Merge
@@ -531,24 +571,94 @@ void updateInCallControls(CallManager cm) {
             }
         }
 
-        // "Manage conference" (used only on GSM devices)
-        // This button and its label are shown or hidden together.
-        if (inCallControlState.manageConferenceVisible) {
-            mManageConferenceButton.setVisibility(View.VISIBLE);
-            showExtraButtonRow = true;
-            mManageConferenceButtonImage.setEnabled(inCallControlState.manageConferenceEnabled);
-        } else {
-            mManageConferenceButton.setVisibility(View.GONE);
-        }
-
         // Finally, update the "extra button row": It's displayed above the
         // "End" button, but only if necessary.  Also, it's never displayed
         // while the dialpad is visible (since it would overlap.)
+        //
+        // The row contains two buttons:
+        //
+        // - "Manage conference" (used only on GSM devices)
+        // - "Merge" button (used only on CDMA devices)
+        //
+        // Note that mExtraButtonRow is ViewStub, which will be inflated for the first time when
+        // any of its buttons becomes visible.
+        final boolean showCdmaMerge =
+                (phoneType == Phone.PHONE_TYPE_CDMA) && inCallControlState.canMerge;
+        final boolean showExtraButtonRow =
+                showCdmaMerge || inCallControlState.manageConferenceVisible;
         if (showExtraButtonRow && !inCallControlState.dialpadVisible) {
+            // This will require the ViewStub inflate itself.
             mExtraButtonRow.setVisibility(View.VISIBLE);
+
+            // Need to set up mCdmaMergeButton and mManageConferenceButton if this is the first
+            // time they're visible.
+            if (mCdmaMergeButton == null) {
+                setupExtraButtons();
+            }
+            mCdmaMergeButton.setVisibility(showCdmaMerge ? View.VISIBLE : View.GONE);
+            if (inCallControlState.manageConferenceVisible) {
+                mManageConferenceButton.setVisibility(View.VISIBLE);
+                mManageConferenceButtonImage.setEnabled(inCallControlState.manageConferenceEnabled);
+            } else {
+                mManageConferenceButton.setVisibility(View.GONE);
+            }
         } else {
             mExtraButtonRow.setVisibility(View.GONE);
         }
+
+        if (DBG) {
+            log("At the end of updateInCallControls().");
+            dumpBottomButtonState();
+        }
+    }
+
+    /**
+     * Set up the buttons that are part of the "extra button row"
+     */
+    private void setupExtraButtons() {
+        // The two "buttons" here (mCdmaMergeButton and mManageConferenceButton)
+        // are actually layouts containing an icon and a text label side-by-side.
+        mCdmaMergeButton = (ViewGroup) mInCallControls.findViewById(R.id.cdmaMergeButton);
+        if (mCdmaMergeButton == null) {
+            Log.wtf(LOG_TAG, "CDMA Merge button is null even after ViewStub being inflated.");
+            return;
+        }
+        mCdmaMergeButton.setOnClickListener(this);
+
+        mManageConferenceButton =
+                (ViewGroup) mInCallControls.findViewById(R.id.manageConferenceButton);
+        mManageConferenceButton.setOnClickListener(this);
+        mManageConferenceButtonImage =
+                (ImageButton) mInCallControls.findViewById(R.id.manageConferenceButtonImage);
+    }
+
+    private void dumpBottomButtonState() {
+        log(" - dialpad: " + getButtonState(mDialpadButton));
+        log(" - speaker: " + getButtonState(mAudioButton));
+        log(" - mute: " + getButtonState(mMuteButton));
+        log(" - hold: " + getButtonState(mHoldButton));
+        log(" - swap: " + getButtonState(mSwapButton));
+        log(" - add: " + getButtonState(mAddButton));
+        log(" - merge: " + getButtonState(mMergeButton));
+        log(" - cdmaMerge: " + getButtonState(mCdmaMergeButton));
+        log(" - swap: " + getButtonState(mSwapButton));
+        log(" - manageConferenceButton: " + getButtonState(mManageConferenceButton));
+    }
+
+    private static String getButtonState(View view) {
+        if (view == null) {
+            return "(null)";
+        }
+        StringBuilder builder = new StringBuilder();
+        builder.append("visibility: " + (view.getVisibility() == View.VISIBLE ? "VISIBLE"
+                : view.getVisibility() == View.INVISIBLE ? "INVISIBLE" : "GONE"));
+        if (view instanceof ImageButton) {
+            builder.append(", enabled: " + ((ImageButton) view).isEnabled());
+        } else if (view instanceof CompoundButton) {
+            builder.append(", enabled: " + ((CompoundButton) view).isEnabled());
+            builder.append(", checked: " + ((CompoundButton) view).isChecked());
+        }
+        return builder.toString();
     }
 
     /**
@@ -580,7 +690,8 @@ private void updateAudioButton(InCallControlState inCallControlState) {
         boolean showMoreIndicator = false;
         //
         // - Foreground icons for the button.  Exactly one of these is enabled:
-        boolean showSpeakerIcon = false;
+        boolean showSpeakerOnIcon = false;
+        boolean showSpeakerOffIcon = false;
         boolean showHandsetIcon = false;
         boolean showBluetoothIcon = false;
 
@@ -598,7 +709,7 @@ private void updateAudioButton(InCallControlState inCallControlState) {
             if (inCallControlState.bluetoothIndicatorOn) {
                 showBluetoothIcon = true;
             } else if (inCallControlState.speakerOn) {
-                showSpeakerIcon = true;
+                showSpeakerOnIcon = true;
             } else {
                 showHandsetIcon = true;
                 // TODO: if a wired headset is plugged in, that takes precedence
@@ -617,7 +728,9 @@ private void updateAudioButton(InCallControlState inCallControlState) {
 
             // Update desired layers:
             showToggleStateIndication = true;
-            showSpeakerIcon = true;
+
+            showSpeakerOnIcon = inCallControlState.speakerOn;
+            showSpeakerOffIcon = !inCallControlState.speakerOn;
         } else {
             if (DBG) log("- updateAudioButton: disabled...");
 
@@ -628,7 +741,7 @@ private void updateAudioButton(InCallControlState inCallControlState) {
 
             // Update desired layers:
             showToggleStateIndication = true;
-            showSpeakerIcon = true;
+            showSpeakerOffIcon = true;
         }
 
         // Finally, update the drawable layers (see btn_compound_audio.xml).
@@ -652,8 +765,11 @@ private void updateAudioButton(InCallControlState inCallControlState) {
         layers.findDrawableByLayerId(R.id.handsetItem)
                 .setAlpha(showHandsetIcon ? VISIBLE : HIDDEN);
 
-        layers.findDrawableByLayerId(R.id.speakerphoneItem)
-                .setAlpha(showSpeakerIcon ? VISIBLE : HIDDEN);
+        layers.findDrawableByLayerId(R.id.speakerphoneOnItem)
+                .setAlpha(showSpeakerOnIcon ? VISIBLE : HIDDEN);
+
+        layers.findDrawableByLayerId(R.id.speakerphoneOffItem)
+                .setAlpha(showSpeakerOffIcon ? VISIBLE : HIDDEN);
     }
 
     /**
@@ -762,6 +878,7 @@ public void refreshAudioModePopup() {
     }
 
     // PopupMenu.OnMenuItemClickListener implementation; see showAudioModePopup()
+    @Override
     public boolean onMenuItemClick(MenuItem item) {
         if (DBG) log("- onMenuItemClick: " + item);
         if (DBG) log("  id: " + item.getItemId());
@@ -798,6 +915,7 @@ public boolean onMenuItemClick(MenuItem item) {
     // This gets called when the PopupMenu gets dismissed for *any* reason, like
     // the user tapping outside its bounds, or pressing Back, or selecting one
     // of the menu items.
+    @Override
     public void onDismiss(PopupMenu menu) {
         if (DBG) log("- onDismiss: " + menu);
         mAudioModePopupVisible = false;
@@ -814,7 +932,7 @@ public void onDismiss(PopupMenu menu) {
      * actually used.  Specifically:
      *
      *   - If an incoming call is ringing, the button cluster isn't
-     *     visible at all.  (And the MultiWaveView widget is actually
+     *     visible at all.  (And the GlowPadView widget is actually
      *     much taller than the button cluster.)
      *
      *   - If the InCallTouchUi widget's "extra button row" is visible
@@ -845,13 +963,15 @@ public int getTouchUiHeight() {
 
 
     //
-    // MultiWaveView.OnTriggerListener implementation
+    // GlowPadView.OnTriggerListener implementation
     //
 
+    @Override
     public void onGrabbed(View v, int handle) {
 
     }
 
+    @Override
     public void onReleased(View v, int handle) {
 
     }
@@ -861,16 +981,15 @@ public void onReleased(View v, int handle) {
      * We get this callback from the incoming call widget
      * when the user triggers an action.
      */
-    public void onTrigger(View v, int whichHandle) {
-        if (DBG) log("onDialTrigger(whichHandle = " + whichHandle + ")...");
-
-        // On any action by the user, hide the widget:
-        hideIncomingCallWidget();
+    @Override
+    public void onTrigger(View view, int whichHandle) {
+        if (DBG) log("onTrigger(whichHandle = " + whichHandle + ")...");
 
-        // ...and also prevent it from reappearing right away.
-        // (This covers up a slow response from the radio for some
-        // actions; see updateState().)
-        mLastIncomingCallActionTime = SystemClock.uptimeMillis();
+        if (mInCallScreen == null) {
+            Log.wtf(LOG_TAG, "onTrigger(" + whichHandle
+                    + ") from incoming-call widget, but null mInCallScreen!");
+            return;
+        }
 
         // The InCallScreen actually implements all of these actions.
         // Each possible action from the incoming call widget corresponds
@@ -878,25 +997,54 @@ public void onTrigger(View v, int whichHandle) {
         // click" handler (even though the UI elements aren't actually
         // buttons; see InCallScreen.handleOnscreenButtonClick().)
 
-        if (mInCallScreen == null) {
-            Log.wtf(LOG_TAG, "onTrigger(" + whichHandle
-                    + ") from incoming-call widget, but null mInCallScreen!");
-            return;
-        }
+        mShowInCallControlsDuringHidingAnimation = false;
         switch (whichHandle) {
             case ANSWER_CALL_ID:
                 if (DBG) log("ANSWER_CALL_ID: answer!");
                 mInCallScreen.handleOnscreenButtonClick(R.id.incomingCallAnswer);
+                mShowInCallControlsDuringHidingAnimation = true;
+
+                // ...and also prevent it from reappearing right away.
+                // (This covers up a slow response from the radio for some
+                // actions; see updateState().)
+                mLastIncomingCallActionTime = SystemClock.uptimeMillis();
                 break;
 
             case SEND_SMS_ID:
                 if (DBG) log("SEND_SMS_ID!");
                 mInCallScreen.handleOnscreenButtonClick(R.id.incomingCallRespondViaSms);
+
+                // Watch out: mLastIncomingCallActionTime should not be updated for this case.
+                //
+                // The variable is originally for avoiding a problem caused by delayed phone state
+                // update; RINGING state may remain just after answering/declining an incoming
+                // call, so we need to wait a bit (500ms) until we get the effective phone state.
+                // For this case, we shouldn't rely on that hack.
+                //
+                // When the user selects this case, there are two possibilities, neither of which
+                // should rely on the hack.
+                //
+                // 1. The first possibility is that, the device eventually sends one of canned
+                //    responses per the user's "send" request, and reject the call after sending it.
+                //    At that moment the code introducing the canned responses should handle the
+                //    case separately.
+                //
+                // 2. The second possibility is that, the device will show incoming call widget
+                //    again per the user's "cancel" request, where the incoming call will still
+                //    remain. At that moment the incoming call will keep its RINGING state.
+                //    The remaining phone state should never be ignored by the hack for
+                //    answering/declining calls because the RINGING state is legitimate. If we
+                //    use the hack for answer/decline cases, the user loses the incoming call
+                //    widget, until further screen update occurs afterward, which often results in
+                //    missed calls.
                 break;
 
             case DECLINE_CALL_ID:
                 if (DBG) log("DECLINE_CALL_ID: reject!");
                 mInCallScreen.handleOnscreenButtonClick(R.id.incomingCallReject);
+
+                // Same as "answer" case.
+                mLastIncomingCallActionTime = SystemClock.uptimeMillis();
                 break;
 
             default:
@@ -904,83 +1052,132 @@ public void onTrigger(View v, int whichHandle) {
                 break;
         }
 
+        // On any action by the user, hide the widget.
+        //
+        // If requested above (i.e. if mShowInCallControlsDuringHidingAnimation is set to true),
+        // in-call controls will start being shown too.
+        hideIncomingCallWidget();
+
         // Regardless of what action the user did, be sure to clear out
         // the hint text we were displaying while the user was dragging.
         mInCallScreen.updateIncomingCallWidgetHint(0, 0);
     }
 
+    public void onFinishFinalAnimation() {
+        // Not used
+    }
+
     /**
      * Apply an animation to hide the incoming call widget.
      */
     private void hideIncomingCallWidget() {
-        if (DBG) log("hideIncomingCallWidget()...");
+        // if (DBG) log("hideIncomingCallWidget()...");
         if (mIncomingCallWidget.getVisibility() != View.VISIBLE
-                || mIncomingCallWidget.getAnimation() != null) {
+                || mIncomingCallWidgetIsFadingOut) {
             // Widget is already hidden or in the process of being hidden
             return;
         }
-        // Hide the incoming call screen with a transition
-        AlphaAnimation anim = new AlphaAnimation(1.0f, 0.0f);
-        anim.setDuration(IN_CALL_WIDGET_TRANSITION_TIME);
-        anim.setAnimationListener(new AnimationListener() {
-
-            public void onAnimationStart(Animation animation) {
 
-            }
-
-            public void onAnimationRepeat(Animation animation) {
+        // TODO: remove this once we fixed issue 6603655
+        log("hideIncomingCallWidget()");
 
+        // Hide the incoming call screen with a transition
+        mIncomingCallWidgetIsFadingOut = true;
+        ViewPropertyAnimator animator = mIncomingCallWidget.animate();
+        animator.cancel();
+        animator.setDuration(AnimationUtils.ANIMATION_DURATION);
+        animator.setListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+                if (mShowInCallControlsDuringHidingAnimation) {
+                    if (DBG) log("IncomingCallWidget's hiding animation started");
+                    updateInCallControls(mApp.mCM);
+                    mInCallControls.setVisibility(View.VISIBLE);
+                }
             }
-
-            public void onAnimationEnd(Animation animation) {
-                // hide the incoming call UI.
-                mIncomingCallWidget.clearAnimation();
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                if (DBG) log("IncomingCallWidget's hiding animation ended");
+                mIncomingCallWidget.setAlpha(1);
                 mIncomingCallWidget.setVisibility(View.GONE);
+                mIncomingCallWidget.animate().setListener(null);
+                mShowInCallControlsDuringHidingAnimation = false;
+                mIncomingCallWidgetIsFadingOut = false;
+                mIncomingCallWidgetShouldBeReset = true;
+            }
+            @Override
+            public void onAnimationCancel(Animator animation) {
+                mIncomingCallWidget.animate().setListener(null);
+                mShowInCallControlsDuringHidingAnimation = false;
+                mIncomingCallWidgetIsFadingOut = false;
+                mIncomingCallWidgetShouldBeReset = true;
+
+                // Note: the code which reset this animation should be responsible for
+                // alpha and visibility.
             }
         });
-        mIncomingCallWidget.startAnimation(anim);
+        animator.alpha(0f);
     }
 
     /**
      * Shows the incoming call widget and cancels any animation that may be fading it out.
      */
     private void showIncomingCallWidget(Call ringingCall) {
-        if (DBG) log("showIncomingCallWidget()...");
+        // if (DBG) log("showIncomingCallWidget()...");
+
+        // TODO: remove this once we fixed issue 6603655
+        // TODO: wouldn't be ok to suppress this whole request if the widget is already VISIBLE
+        //       and we don't need to reset it?
+        log("showIncomingCallWidget(). widget visibility: " + mIncomingCallWidget.getVisibility());
 
-        Animation anim = mIncomingCallWidget.getAnimation();
-        if (anim != null) {
-            anim.reset();
-            mIncomingCallWidget.clearAnimation();
+        ViewPropertyAnimator animator = mIncomingCallWidget.animate();
+        if (animator != null) {
+            animator.cancel();
         }
+        mIncomingCallWidget.setAlpha(1.0f);
 
-        // Update the MultiWaveView widget's targets based on the state of
+        // Update the GlowPadView widget's targets based on the state of
         // the ringing call.  (Specifically, we need to disable the
         // "respond via SMS" option for certain types of calls, like SIP
         // addresses or numbers with blocked caller-id.)
+        final boolean allowRespondViaSms =
+                RespondViaSmsManager.allowRespondViaSmsForCall(mInCallScreen, ringingCall);
+        final int targetResourceId = allowRespondViaSms
+                ? R.array.incoming_call_widget_3way_targets
+                : R.array.incoming_call_widget_2way_targets;
+        // The widget should be updated only when appropriate; if the previous choice can be reused
+        // for this incoming call, we'll just keep using it. Otherwise we'll see UI glitch
+        // everytime when this method is called during a single incoming call.
+        if (targetResourceId != mIncomingCallWidget.getTargetResourceId()) {
+            if (allowRespondViaSms) {
+                // The GlowPadView widget is allowed to have all 3 choices:
+                // Answer, Decline, and Respond via SMS.
+                mIncomingCallWidget.setTargetResources(targetResourceId);
+                mIncomingCallWidget.setTargetDescriptionsResourceId(
+                        R.array.incoming_call_widget_3way_target_descriptions);
+                mIncomingCallWidget.setDirectionDescriptionsResourceId(
+                        R.array.incoming_call_widget_3way_direction_descriptions);
+            } else {
+                // You only get two choices: Answer or Decline.
+                mIncomingCallWidget.setTargetResources(targetResourceId);
+                mIncomingCallWidget.setTargetDescriptionsResourceId(
+                        R.array.incoming_call_widget_2way_target_descriptions);
+                mIncomingCallWidget.setDirectionDescriptionsResourceId(
+                        R.array.incoming_call_widget_2way_direction_descriptions);
+            }
 
-        boolean allowRespondViaSms = RespondViaSmsManager.allowRespondViaSmsForCall(ringingCall);
-        if (allowRespondViaSms) {
-            // The MultiWaveView widget is allowed to have all 3 choices:
-            // Answer, Decline, and Respond via SMS.
-            mIncomingCallWidget.setTargetResources(R.array.incoming_call_widget_3way_targets);
-            mIncomingCallWidget.setTargetDescriptionsResourceId(
-                    R.array.incoming_call_widget_3way_target_descriptions);
-            mIncomingCallWidget.setDirectionDescriptionsResourceId(
-                    R.array.incoming_call_widget_3way_direction_descriptions);
-        } else {
-            // You only get two choices: Answer or Decline.
-            mIncomingCallWidget.setTargetResources(R.array.incoming_call_widget_2way_targets);
-            mIncomingCallWidget.setTargetDescriptionsResourceId(
-                    R.array.incoming_call_widget_2way_target_descriptions);
-            mIncomingCallWidget.setDirectionDescriptionsResourceId(
-                    R.array.incoming_call_widget_2way_direction_descriptions);
+            // This will be used right after this block.
+            mIncomingCallWidgetShouldBeReset = true;
+        }
+        if (mIncomingCallWidgetShouldBeReset) {
+            // Watch out: be sure to call reset() and setVisibility() *after*
+            // updating the target resources, since otherwise the GlowPadView
+            // widget will make the targets visible initially (even before you
+            // touch the widget.)
+            mIncomingCallWidget.reset(false);
+            mIncomingCallWidgetShouldBeReset = false;
         }
 
-        // Watch out: be sure to call reset() and setVisibility() *after*
-        // updating the target resources, since otherwise the MultiWaveView
-        // widget will make the targets visible initially (even before you
-        // touch the widget.)
-        mIncomingCallWidget.reset(false);
         mIncomingCallWidget.setVisibility(View.VISIBLE);
 
         // Finally, manually trigger a "ping" animation.
@@ -997,7 +1194,7 @@ private void showIncomingCallWidget(Call ringingCall) {
         mHandler.sendEmptyMessageDelayed(
                 INCOMING_CALL_WIDGET_PING,
                 // Visual polish: add a small delay here, to make the
-                // MultiWaveView widget visible for a brief moment
+                // GlowPadView widget visible for a brief moment
                 // *before* starting the ping animation.
                 // This value doesn't need to be very precise.
                 250 /* msec */);
@@ -1008,10 +1205,11 @@ private void showIncomingCallWidget(Call ringingCall) {
      *
      * In previous releases (where we used a SlidingTab widget) we would
      * display an onscreen hint depending on which "handle" the user was
-     * dragging.  But we now use a MultiWaveView widget, which has only
+     * dragging.  But we now use a GlowPadView widget, which has only
      * one handle, so for now we don't display a hint at all (see the TODO
      * comment below.)
      */
+    @Override
     public void onGrabbedStateChange(View v, int grabbedState) {
         if (mInCallScreen != null) {
             // Look up the hint based on which handle is currently grabbed.
@@ -1020,22 +1218,11 @@ public void onGrabbedStateChange(View v, int grabbedState) {
             // handle means "Answer" and the right handle means "Decline".)
             int hintTextResId, hintColorResId;
             switch (grabbedState) {
-                case MultiWaveView.OnTriggerListener.NO_HANDLE:
-                case MultiWaveView.OnTriggerListener.CENTER_HANDLE:
+                case GlowPadView.OnTriggerListener.NO_HANDLE:
+                case GlowPadView.OnTriggerListener.CENTER_HANDLE:
                     hintTextResId = 0;
                     hintColorResId = 0;
                     break;
-                // TODO: MultiWaveView only has one handle. MultiWaveView could send an event
-                // indicating that a snap (but not release) happened. Could be used to show text
-                // when user hovers over an item.
-                //        case SlidingTab.OnTriggerListener.LEFT_HANDLE:
-                //            hintTextResId = R.string.slide_to_answer;
-                //            hintColorResId = R.color.incall_textConnected;  // green
-                //            break;
-                //        case SlidingTab.OnTriggerListener.RIGHT_HANDLE:
-                //            hintTextResId = R.string.slide_to_decline;
-                //            hintColorResId = R.color.incall_textEnded;  // red
-                //            break;
                 default:
                     Log.e(LOG_TAG, "onGrabbedStateChange: unexpected grabbedState: "
                           + grabbedState);
@@ -1056,7 +1243,7 @@ public void onGrabbedStateChange(View v, int grabbedState) {
     public void onIncomingRing() {
         if (ENABLE_PING_ON_RING_EVENTS) {
             // Each RING from the telephony layer triggers a "ping" animation
-            // of the MultiWaveView widget.  (The intent here is to make the
+            // of the GlowPadView widget.  (The intent here is to make the
             // pinging appear to be synchronized with the ringtone, although
             // that only works for non-looping ringtones.)
             triggerPing();
@@ -1064,11 +1251,11 @@ public void onIncomingRing() {
     }
 
     /**
-     * Runs a single "ping" animation of the MultiWaveView widget,
-     * or do nothing if the MultiWaveView widget is no longer visible.
+     * Runs a single "ping" animation of the GlowPadView widget,
+     * or do nothing if the GlowPadView widget is no longer visible.
      *
      * Also, if ENABLE_PING_AUTO_REPEAT is true, schedule the next ping as
-     * well (but again, only if the MultiWaveView widget is still visible.)
+     * well (but again, only if the GlowPadView widget is still visible.)
      */
     public void triggerPing() {
         if (DBG) log("triggerPing: mIncomingCallWidget = " + mIncomingCallWidget);
@@ -1081,7 +1268,7 @@ public void triggerPing() {
         }
 
         if (mIncomingCallWidget == null) {
-            // This shouldn't happen; the MultiWaveView widget should
+            // This shouldn't happen; the GlowPadView widget should
             // always be present in our layout file.
             Log.w(LOG_TAG, "- triggerPing: null mIncomingCallWidget!");
             return;
@@ -1122,97 +1309,6 @@ public void triggerPing() {
         }
     }
 
-    /**
-     * OnTouchListener used to shrink the "hit target" of some onscreen
-     * buttons.
-     */
-    class SmallerHitTargetTouchListener implements View.OnTouchListener {
-        /**
-         * Width of the allowable "hit target" as a percentage of
-         * the total width of this button.
-         */
-        private static final int HIT_TARGET_PERCENT_X = 50;
-
-        /**
-         * Height of the allowable "hit target" as a percentage of
-         * the total height of this button.
-         *
-         * This is larger than HIT_TARGET_PERCENT_X because some of
-         * the onscreen buttons are wide but not very tall and we don't
-         * want to make the vertical hit target *too* small.
-         */
-        private static final int HIT_TARGET_PERCENT_Y = 80;
-
-        // Size (percentage-wise) of the "edge" area that's *not* touch-sensitive.
-        private static final int X_EDGE = (100 - HIT_TARGET_PERCENT_X) / 2;
-        private static final int Y_EDGE = (100 - HIT_TARGET_PERCENT_Y) / 2;
-        // Min/max values (percentage-wise) of the touch-sensitive hit target.
-        private static final int X_HIT_MIN = X_EDGE;
-        private static final int X_HIT_MAX = 100 - X_EDGE;
-        private static final int Y_HIT_MIN = Y_EDGE;
-        private static final int Y_HIT_MAX = 100 - Y_EDGE;
-
-        // True if the most recent DOWN event was a "hit".
-        boolean mDownEventHit;
-
-        /**
-         * Called when a touch event is dispatched to a view. This allows listeners to
-         * get a chance to respond before the target view.
-         *
-         * @return True if the listener has consumed the event, false otherwise.
-         *         (In other words, we return true when the touch is *outside*
-         *         the "smaller hit target", which will prevent the actual
-         *         button from handling these events.)
-         */
-        public boolean onTouch(View v, MotionEvent event) {
-            // if (DBG) log("SmallerHitTargetTouchListener: " + v + ", event " + event);
-
-            if (event.getAction() == MotionEvent.ACTION_DOWN) {
-                // Note that event.getX() and event.getY() are already
-                // translated into the View's coordinates.  (In other words,
-                // "0,0" is a touch on the upper-left-most corner of the view.)
-                int touchX = (int) event.getX();
-                int touchY = (int) event.getY();
-
-                int viewWidth = v.getWidth();
-                int viewHeight = v.getHeight();
-
-                // Touch location as a percentage of the total button width or height.
-                int touchXPercent = (int) ((float) (touchX * 100) / (float) viewWidth);
-                int touchYPercent = (int) ((float) (touchY * 100) / (float) viewHeight);
-                // if (DBG) log("- percentage:  x = " + touchXPercent + ",  y = " + touchYPercent);
-
-                // TODO: user research: add event logging here of the actual
-                // hit location (and button ID), and enable it for dogfooders
-                // for a few days.  That'll give us a good idea of how close
-                // to the center of the button(s) most touch events are, to
-                // help us fine-tune the HIT_TARGET_PERCENT_* constants.
-
-                if (touchXPercent < X_HIT_MIN || touchXPercent > X_HIT_MAX
-                        || touchYPercent < Y_HIT_MIN || touchYPercent > Y_HIT_MAX) {
-                    // Missed!
-                    // if (DBG) log("  -> MISSED!");
-                    mDownEventHit = false;
-                    return true;  // Consume this event; don't let the button see it
-                } else {
-                    // Hit!
-                    // if (DBG) log("  -> HIT!");
-                    mDownEventHit = true;
-                    return false;  // Let this event through to the actual button
-                }
-            } else {
-                // This is a MOVE, UP or CANCEL event.
-                //
-                // We only do the "smaller hit target" check on DOWN events.
-                // For the subsequent MOVE/UP/CANCEL events, we let them
-                // through to the actual button IFF the previous DOWN event
-                // got through to the actual button (i.e. it was a "hit".)
-                return !mDownEventHit;
-            }
-        }
-    }
-
-
     // Debugging / testing code
 
     private void log(String msg) {
diff --git a/src/com/android/phone/InCallUiState.java b/src/com/android/phone/InCallUiState.java
index 397112f3e..cfaed997d 100644
--- a/src/com/android/phone/InCallUiState.java
+++ b/src/com/android/phone/InCallUiState.java
@@ -145,6 +145,14 @@ public enum InCallScreenMode {
      */
     String dialpadDigits;
 
+    /**
+     * The contact/dialed number information shown in the DTMF digits text
+     * when the user has not yet typed any digits.
+     *
+     * Currently only used for displaying "Voice Mail" since voicemail calls
+     * start directly in the dialpad view.
+     */
+    String dialpadContextText;
 
     //
     // (3) Error / diagnostic indications
@@ -334,13 +342,14 @@ public boolean isProgressIndicationActive() {
 
 
     //
-    // (4) Optional overlay when a 3rd party "provider" is used.
-    //     @see InCallScreen.updateProviderOverlay()
+    // (4) Optional info when a 3rd party "provider" is used.
+    //     @see InCallScreen#requestRemoveProviderInfoWithDelay()
+    //     @see CallCard#updateCallStateWidgets()
     //
 
-    // TODO: maybe isolate all the provider-overlay-related stuff out to a
+    // TODO: maybe isolate all the provider-related stuff out to a
     //       separate inner class?
-    boolean providerOverlayVisible;
+    boolean providerInfoVisible;
     CharSequence providerLabel;
     Drawable providerIcon;
     Uri providerGatewayUri;
@@ -351,26 +360,26 @@ public boolean isProgressIndicationActive() {
      * Set the fields related to the provider support
      * based on the specified intent.
      */
-    public void setProviderOverlayInfo(Intent intent) {
+    public void setProviderInfo(Intent intent) {
         providerLabel = PhoneUtils.getProviderLabel(mContext, intent);
         providerIcon = PhoneUtils.getProviderIcon(mContext, intent);
         providerGatewayUri = PhoneUtils.getProviderGatewayUri(intent);
         providerAddress = PhoneUtils.formatProviderUri(providerGatewayUri);
-        providerOverlayVisible = true;
+        providerInfoVisible = true;
 
         // ...but if any of the "required" fields are missing, completely
         // disable the overlay.
         if (TextUtils.isEmpty(providerLabel) || providerIcon == null ||
             providerGatewayUri == null || TextUtils.isEmpty(providerAddress)) {
-            clearProviderOverlayInfo();
+            clearProviderInfo();
         }
     }
 
     /**
      * Clear all the fields related to the provider support.
      */
-    public void clearProviderOverlayInfo() {
-        providerOverlayVisible = false;
+    public void clearProviderInfo() {
+        providerInfoVisible = false;
         providerLabel = null;
         providerIcon = null;
         providerGatewayUri = null;
@@ -391,6 +400,26 @@ public void clearProviderOverlayInfo() {
      */
     String latestActiveCallOrigin;
 
+    /**
+     * Timestamp for "Call origin". This will be used to preserve when the call origin was set.
+     * {@link android.os.SystemClock#elapsedRealtime()} will be used.
+     */
+    long latestActiveCallOriginTimeStamp;
+
+    /**
+     * Flag forcing Phone app to show in-call UI even when there's no phone call and thus Phone
+     * is in IDLE state. This will be turned on only when:
+     *
+     * - the last phone call is hung up, and
+     * - the screen is being turned off in the middle of in-call UI (and thus when the screen being
+     *   turned on in-call UI is expected to be the next foreground activity)
+     *
+     * At that moment whole UI should show "previously disconnected phone call" for a moment and
+     * exit itself. {@link InCallScreen#onPause()} will turn this off and prevent possible weird
+     * cases which may happen with that exceptional case.
+     */
+    boolean showAlreadyDisconnectedState;
+
     //
     // Debugging
     //
@@ -398,6 +427,7 @@ public void clearProviderOverlayInfo() {
     public void dumpState() {
         log("dumpState():");
         log("  - showDialpad: " + showDialpad);
+        log("    - dialpadContextText: " + dialpadContextText);
         if (hasPendingCallStatusCode()) {
             log("  - status indication is pending!");
             log("    - pending call status code = " + mPendingCallStatusCode);
@@ -405,14 +435,14 @@ public void dumpState() {
             log("  - pending call status code: none");
         }
         log("  - progressIndication: " + progressIndication);
-        if (providerOverlayVisible) {
-            log("  - provider overlay VISIBLE: "
+        if (providerInfoVisible) {
+            log("  - provider info VISIBLE: "
                   + providerLabel + " / "
                   + providerIcon  + " / "
                   + providerGatewayUri + " / "
                   + providerAddress);
         } else {
-            log("  - provider overlay: none");
+            log("  - provider info: none");
         }
         log("  - latestActiveCallOrigin: " + latestActiveCallOrigin);
     }
diff --git a/src/com/android/phone/MSISDNEditPreference.java b/src/com/android/phone/MSISDNEditPreference.java
new file mode 100644
index 000000000..17613df18
--- /dev/null
+++ b/src/com/android/phone/MSISDNEditPreference.java
@@ -0,0 +1,130 @@
+
+package com.android.phone;
+
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneFactory;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.os.AsyncResult;
+import android.os.Handler;
+import android.os.Message;
+import android.preference.EditTextPreference;
+import android.util.AttributeSet;
+import android.util.Log;
+
+public class MSISDNEditPreference extends EditTextPreference {
+
+    private static final String LOG_TAG = "MSISDNListPreference";
+    public static final String PHONE_NUMBER = "phone_number";
+
+    private final boolean DBG = (PhoneApp.DBG_LEVEL >= 2);
+
+    private MyHandler mHandler = new MyHandler();
+
+    private Phone mPhone;
+    private Context mContext;
+
+    private TimeConsumingPreferenceListener tcpListener;
+
+    public MSISDNEditPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        mPhone = PhoneFactory.getDefaultPhone();
+        mContext = context;
+    }
+
+    public MSISDNEditPreference(Context context) {
+        this(context, null);
+    }
+
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+        super.onDialogClosed(positiveResult);
+
+        if (positiveResult) {
+            String alphaTag = mPhone.getLine1AlphaTag();
+            if (alphaTag == null || "".equals(alphaTag)) {
+                // No tag, set it.
+                alphaTag = "Voice Line 1";
+            }
+
+            mPhone.setLine1Number(alphaTag, getText(),
+                    mHandler.obtainMessage(MyHandler.MESSAGE_SET_MSISDN));
+            if (tcpListener != null) {
+                tcpListener.onStarted(this, false);
+            }
+
+            // Save the number into the system property
+            SharedPreferences prefs = mContext.getSharedPreferences(MSISDNEditPreference.class.getPackage().getName() + "_preferences", Context.MODE_PRIVATE);
+            Editor editor = prefs.edit();
+
+            String phoneNum = getText().trim();
+            String savedNum = prefs.getString(PHONE_NUMBER, null);
+
+            // If there is no string, treat it as null
+            if (phoneNum.length() == 0) {
+                phoneNum = null;
+            }
+
+            if (phoneNum == null && savedNum == null) {
+                Log.d(LOG_TAG, "No phone number set yet");
+            } else {
+                if (phoneNum != null && phoneNum.equals(savedNum) == false) {
+                    /* Save phone number only if there is some number set and
+                       it is not equal to the already saved one */
+                    if (DBG)
+                        Log.d(LOG_TAG, "Saving phone number: " + phoneNum);
+
+                    editor.putString(PHONE_NUMBER, phoneNum);
+                    editor.commit();
+                } else if (phoneNum == null && savedNum != null) {
+                    /* Remove saved number only if there is some saved and
+                       there is no number set */
+                    if (DBG)
+                        Log.d(LOG_TAG, "Removing phone number");
+
+                    editor.remove(PHONE_NUMBER);
+                    editor.commit();
+                } else if (DBG) {
+                    Log.d(LOG_TAG, "No change");
+                }
+            }
+        }
+    }
+
+    void init(TimeConsumingPreferenceListener listener, boolean skipReading) {
+        tcpListener = listener;
+        if (!skipReading) {
+            setText(mPhone.getLine1Number());
+        }
+    }
+
+    private class MyHandler extends Handler {
+        private static final int MESSAGE_SET_MSISDN = 0;
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MESSAGE_SET_MSISDN:
+                    handleSetMSISDNResponse(msg);
+                    break;
+            }
+        }
+
+        private void handleSetMSISDNResponse(Message msg) {
+            AsyncResult ar = (AsyncResult) msg.obj;
+
+            if (ar.exception != null) {
+                if (DBG)
+                    Log.d(LOG_TAG, "handleSetMSISDNResponse: ar.exception=" + ar.exception);
+                // setEnabled(false);
+            }
+            if (DBG)
+                Log.d(LOG_TAG, "handleSetMSISDNResponse: re get");
+
+            tcpListener.onFinished(MSISDNEditPreference.this, false);
+        }
+    }
+}
diff --git a/src/com/android/phone/ManageConferenceUtils.java b/src/com/android/phone/ManageConferenceUtils.java
index f7af0670a..e88479865 100644
--- a/src/com/android/phone/ManageConferenceUtils.java
+++ b/src/com/android/phone/ManageConferenceUtils.java
@@ -31,7 +31,6 @@
 import com.android.internal.telephony.CallerInfoAsyncQuery;
 import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.Connection;
-import com.android.internal.telephony.Phone;
 
 import java.util.List;
 
@@ -39,18 +38,51 @@
 /**
  * Helper class to initialize and run the InCallScreen's "Manage conference" UI.
  */
-public class ManageConferenceUtils
-        implements CallerInfoAsyncQuery.OnQueryCompleteListener {
+public class ManageConferenceUtils {
     private static final String LOG_TAG = "ManageConferenceUtils";
     private static final boolean DBG =
             (PhoneApp.DBG_LEVEL >= 1) && (SystemProperties.getInt("ro.debuggable", 0) == 1);
 
+    /**
+     * CallerInfoAsyncQuery.OnQueryCompleteListener implementation.
+     *
+     * This object listens for results from the caller-id info queries we
+     * fire off in updateManageConferenceRow(), and updates the
+     * corresponding conference row.
+     */
+    private final class QueryCompleteListener
+            implements CallerInfoAsyncQuery.OnQueryCompleteListener {
+        private final int mConferencCallListIndex;
+
+        public QueryCompleteListener(int index) {
+            mConferencCallListIndex = index;
+        }
+
+        @Override
+        public void onQueryComplete(int token, Object cookie, CallerInfo ci) {
+            if (DBG) log("callerinfo query complete, updating UI." + ci);
+
+            Connection connection = (Connection) cookie;
+            int presentation = connection.getNumberPresentation();
+
+            // get the viewgroup (conference call list item) and make it visible
+            ViewGroup viewGroup = mConferenceCallList[mConferencCallListIndex];
+            viewGroup.setVisibility(View.VISIBLE);
+
+            // update the list item with this information.
+            displayCallerInfoForConferenceRow(ci, presentation,
+                    (TextView) viewGroup.findViewById(R.id.conferenceCallerName),
+                    (TextView) viewGroup.findViewById(R.id.conferenceCallerNumberType),
+                    (TextView) viewGroup.findViewById(R.id.conferenceCallerNumber));
+        }
+    }
+
     private InCallScreen mInCallScreen;
     private CallManager mCM;
 
     // "Manage conference" UI elements and state
     private ViewGroup mManageConferencePanel;
-    private Button mButtonManageConferenceDone;
+    private View mButtonManageConferenceDone;
     private ViewGroup[] mConferenceCallList;
     private int mNumCallersInConference;
     private Chronometer mConferenceTime;
@@ -94,7 +126,7 @@ public void initManageConferencePanel() {
                         (ViewGroup) mInCallScreen.findViewById(viewGroupIdList[i]);
             }
 
-            mButtonManageConferenceDone = (Button) mInCallScreen.findViewById(R.id.manage_done);
+            mButtonManageConferenceDone = mInCallScreen.findViewById(R.id.manage_done);
             mButtonManageConferenceDone.setOnClickListener(mInCallScreen);
         }
     }
@@ -183,9 +215,8 @@ public void updateManageConferenceRow(final int i,
             mConferenceCallList[i].setVisibility(View.VISIBLE);
 
             // get the relevant children views
-            ImageButton endButton = (ImageButton) mConferenceCallList[i].findViewById(
-                    R.id.conferenceCallerDisconnect);
-            ImageButton separateButton = (ImageButton) mConferenceCallList[i].findViewById(
+            View endButton = mConferenceCallList[i].findViewById(R.id.conferenceCallerDisconnect);
+            View separateButton = mConferenceCallList[i].findViewById(
                     R.id.conferenceCallerSeparate);
             TextView nameTextView = (TextView) mConferenceCallList[i].findViewById(
                     R.id.conferenceCallerName);
@@ -198,6 +229,7 @@ public void updateManageConferenceRow(final int i,
 
             // Hook up this row's buttons.
             View.OnClickListener endThisConnection = new View.OnClickListener() {
+                    @Override
                     public void onClick(View v) {
                         endConferenceConnection(i, connection);
                         PhoneApp.getInstance().pokeUserActivity();
@@ -207,6 +239,7 @@ public void onClick(View v) {
             //
             if (canSeparate) {
                 View.OnClickListener separateThisConnection = new View.OnClickListener() {
+                        @Override
                         public void onClick(View v) {
                             separateConferenceConnection(i, connection);
                             PhoneApp.getInstance().pokeUserActivity();
@@ -219,17 +252,15 @@ public void onClick(View v) {
             }
 
             // Name/number for this caller.
-            // TODO: need to deal with private or blocked caller id?
+            QueryCompleteListener listener = new QueryCompleteListener(i);
             PhoneUtils.CallerInfoToken info =
                     PhoneUtils.startGetCallerInfo(mInCallScreen,
-                                                  connection,
-                                                  this,
-                                                  mConferenceCallList[i]);
+                            connection, listener, connection);
             if (DBG) log("  - got info from startGetCallerInfo(): " + info);
 
             // display the CallerInfo.
-            displayCallerInfoForConferenceRow(info.currentInfo, nameTextView,
-                                              numberTypeTextView, numberTextView);
+            displayCallerInfoForConferenceRow(info.currentInfo, connection.getNumberPresentation(),
+                    nameTextView, numberTypeTextView, numberTextView);
         } else {
             // Disable this row of the Manage conference panel:
             mConferenceCallList[i].setVisibility(View.GONE);
@@ -239,11 +270,11 @@ public void onClick(View v) {
     /**
      * Helper function to fill out the Conference Call(er) information
      * for each item in the "Manage Conference Call" list.
+     *
+     * @param presentation presentation specified by {@link Connection}.
      */
-    public final void displayCallerInfoForConferenceRow(CallerInfo ci,
-                                                        TextView nameTextView,
-                                                        TextView numberTypeTextView,
-                                                        TextView numberTextView) {
+    public final void displayCallerInfoForConferenceRow(CallerInfo ci, int presentation,
+            TextView nameTextView, TextView numberTypeTextView, TextView numberTextView) {
         // gather the correct name and number information.
         String callerName = "";
         String callerNumber = "";
@@ -251,9 +282,15 @@ public final void displayCallerInfoForConferenceRow(CallerInfo ci,
         if (ci != null) {
             callerName = ci.name;
             if (TextUtils.isEmpty(callerName)) {
-                callerName = ci.phoneNumber;
-                if (TextUtils.isEmpty(callerName)) {
-                    callerName = mInCallScreen.getString(R.string.unknown);
+                // Do similar fallback as CallCard does.
+                // See also CallCard#updateDisplayForPerson().
+                if (TextUtils.isEmpty(ci.phoneNumber)) {
+                    callerName = PhoneUtils.getPresentationString(mInCallScreen, presentation);
+                } else if (!TextUtils.isEmpty(ci.cnapName)) {
+                    // No name, but we do have a valid CNAP name, so use that.
+                    callerName = ci.cnapName;
+                } else {
+                    callerName = ci.phoneNumber;
                 }
             } else {
                 callerNumber = ci.phoneNumber;
@@ -314,27 +351,6 @@ public void separateConferenceConnection(int i, Connection connection) {
         // separateCall().)
     }
 
-    /**
-     * CallerInfoAsyncQuery.OnQueryCompleteListener implementation.
-     *
-     * This method listens for results from the caller-id info queries we
-     * fire off in updateManageConferenceRow(), and updates the
-     * corresponding conference row.
-     */
-    public void onQueryComplete(int token, Object cookie, CallerInfo ci) {
-        if (DBG) log("callerinfo query complete, updating UI." + ci);
-
-        // get the viewgroup (conference call list item) and make it visible
-        ViewGroup vg = (ViewGroup) cookie;
-        vg.setVisibility(View.VISIBLE);
-
-        // update the list item with this information.
-        displayCallerInfoForConferenceRow(ci,
-                (TextView) vg.findViewById(R.id.conferenceCallerName),
-                (TextView) vg.findViewById(R.id.conferenceCallerNumberType),
-                (TextView) vg.findViewById(R.id.conferenceCallerNumber));
-    }
-
 
     private void log(String msg) {
         Log.d(LOG_TAG, msg);
diff --git a/src/com/android/phone/Settings.java b/src/com/android/phone/MobileNetworkSettings.java
similarity index 74%
rename from src/com/android/phone/Settings.java
rename to src/com/android/phone/MobileNetworkSettings.java
index 969bab097..58b1b32a3 100644
--- a/src/com/android/phone/Settings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -53,24 +53,24 @@
  * you reach it from the "Wireless & Networks" section of the main
  * Settings app.  It's not part of the "Call settings" hierarchy that's
  * available from the Phone app (see CallFeaturesSetting for that.)
- *
- * TODO: Rename this to be "NetworkSettings.java" to be more clear.
- * (But be careful in case the Settings app has any hardwired references
- * to this class name...)
  */
-public class Settings extends PreferenceActivity implements DialogInterface.OnClickListener,
+public class MobileNetworkSettings extends PreferenceActivity
+        implements DialogInterface.OnClickListener,
         DialogInterface.OnDismissListener, Preference.OnPreferenceChangeListener{
 
     // debug data
     private static final String LOG_TAG = "NetworkSettings";
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
     public static final int REQUEST_CODE_EXIT_ECM = 17;
 
     //String keys for preference lookup
     private static final String BUTTON_DATA_ENABLED_KEY = "button_data_enabled_key";
     private static final String BUTTON_DATA_USAGE_KEY = "button_data_usage_key";
     private static final String BUTTON_PREFERED_NETWORK_MODE = "preferred_network_mode_key";
+    private static final String BUTTON_PREFERED_UMTS_NETWORK_MODE = "preferred_umts_network_mode_key";
+    private static final String BUTTON_PREFERED_CDMA_NETWORK_MODE = "preferred_cdma_network_mode_key";
     private static final String BUTTON_ROAMING_KEY = "button_roaming_key";
+    private static final String BUTTON_NATIONAL_ROAMING_KEY = "button_national_roaming_key";
     private static final String BUTTON_CDMA_LTE_DATA_SERVICE_KEY = "cdma_lte_data_service_key";
 
     static final int preferredNetworkMode = Phone.PREFERRED_NT_MODE;
@@ -82,7 +82,10 @@ public class Settings extends PreferenceActivity implements DialogInterface.OnCl
 
     //UI objects
     private ListPreference mButtonPreferredNetworkMode;
+    private ListPreference mButtonPreferredUmtsNetworkMode;
+    private ListPreference mButtonPreferredCdmaNetworkMode;
     private CheckBoxPreference mButtonDataRoam;
+    private CheckBoxPreference mButtonNationalDataRoam;
     private CheckBoxPreference mButtonDataEnabled;
     private Preference mLteDataServicePref;
 
@@ -144,11 +147,17 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen
                     REQUEST_CODE_EXIT_ECM);
             }
             return true;
-        } else if (preference == mButtonPreferredNetworkMode) {
+
+        } else if (preference == mButtonPreferredNetworkMode ||
+                       preference == mButtonPreferredUmtsNetworkMode ||
+                       preference == mButtonPreferredCdmaNetworkMode) {
             //displays the value taken from the Settings.System
+            int phoneType = mPhone.getPhoneType();
             int settingsNetworkMode = android.provider.Settings.Secure.getInt(mPhone.getContext().
                     getContentResolver(), android.provider.Settings.Secure.PREFERRED_NETWORK_MODE,
                     preferredNetworkMode);
+            mButtonPreferredUmtsNetworkMode.setValue(Integer.toString(settingsNetworkMode));
+            mButtonPreferredCdmaNetworkMode.setValue(Integer.toString(settingsNetworkMode));
             mButtonPreferredNetworkMode.setValue(Integer.toString(settingsNetworkMode));
             return true;
         } else if (preference == mButtonDataRoam) {
@@ -161,7 +170,7 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen
                 new AlertDialog.Builder(this).setMessage(
                         getResources().getString(R.string.roaming_warning))
                         .setTitle(android.R.string.dialog_alert_title)
-                        .setIcon(android.R.drawable.ic_dialog_alert)
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
                         .setPositiveButton(android.R.string.yes, this)
                         .setNegativeButton(android.R.string.no, this)
                         .show()
@@ -170,12 +179,20 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen
                 mPhone.setDataRoamingEnabled(false);
             }
             return true;
+        } else if (preference == mButtonNationalDataRoam){
+             android.provider.Settings.System.putInt(mPhone.getContext().getContentResolver(),
+                 android.provider.Settings.System.MVNO_ROAMING, mButtonNationalDataRoam.isChecked() ? 1 : 0);
+	    return true;
         } else if (preference == mButtonDataEnabled) {
             if (DBG) log("onPreferenceTreeClick: preference == mButtonDataEnabled.");
             ConnectivityManager cm =
                     (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
 
             cm.setMobileDataEnabled(mButtonDataEnabled.isChecked());
+
+            Intent intent = new Intent(PhoneToggler.MOBILE_DATA_CHANGED);
+            intent.putExtra(PhoneToggler.NETWORK_MODE, mButtonDataEnabled.isChecked());
+            mPhone.getContext().sendBroadcast(intent);
             return true;
         } else if (preference == mLteDataServicePref) {
             String tmpl = android.provider.Settings.Secure.getString(getContentResolver(),
@@ -219,15 +236,23 @@ protected void onCreate(Bundle icicle) {
 
         mButtonDataEnabled = (CheckBoxPreference) prefSet.findPreference(BUTTON_DATA_ENABLED_KEY);
         mButtonDataRoam = (CheckBoxPreference) prefSet.findPreference(BUTTON_ROAMING_KEY);
+        mButtonPreferredCdmaNetworkMode = (ListPreference) prefSet.findPreference(
+                BUTTON_PREFERED_CDMA_NETWORK_MODE);
+        mButtonPreferredUmtsNetworkMode = (ListPreference) prefSet.findPreference(
+                BUTTON_PREFERED_UMTS_NETWORK_MODE);
+        mButtonNationalDataRoam = (CheckBoxPreference) prefSet.findPreference(BUTTON_NATIONAL_ROAMING_KEY);
         mButtonPreferredNetworkMode = (ListPreference) prefSet.findPreference(
                 BUTTON_PREFERED_NETWORK_MODE);
         mButtonDataUsage = prefSet.findPreference(BUTTON_DATA_USAGE_KEY);
         mLteDataServicePref = prefSet.findPreference(BUTTON_CDMA_LTE_DATA_SERVICE_KEY);
 
         boolean isLteOnCdma = mPhone.getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE;
+        boolean isLteOnGsm = mPhone.getLteOnGsmMode() != 0;
         if (getResources().getBoolean(R.bool.world_phone) == true) {
             // set the listener for the mButtonPreferredNetworkMode list preference so we can issue
             // change Preferred Network Mode.
+            prefSet.removePreference(mButtonPreferredUmtsNetworkMode);
+            prefSet.removePreference(mButtonPreferredCdmaNetworkMode);
             mButtonPreferredNetworkMode.setOnPreferenceChangeListener(this);
 
             //Get the networkMode from Settings.System and displays it
@@ -237,32 +262,65 @@ protected void onCreate(Bundle icicle) {
             mButtonPreferredNetworkMode.setValue(Integer.toString(settingsNetworkMode));
             mCdmaOptions = new CdmaOptions(this, prefSet, mPhone);
             mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet);
+
+            if (getResources().getBoolean(R.bool.config_preferred_mode_disable) == true) {
+                prefSet.removePreference(mButtonPreferredNetworkMode);
+            }
+
         } else {
-            if (!isLteOnCdma) {
+            if (!isLteOnCdma && !isLteOnGsm) {
                 prefSet.removePreference(mButtonPreferredNetworkMode);
             }
+            //Get the networkMode from Settings.System and displays it
             int phoneType = mPhone.getPhoneType();
+            prefSet.removePreference(mButtonPreferredNetworkMode);
+            int settingsNetworkMode = android.provider.Settings.Secure.getInt(
+                    mPhone.getContext().getContentResolver(),
+                    android.provider.Settings.Secure.PREFERRED_NETWORK_MODE,
+                    preferredNetworkMode);
+
             if (phoneType == Phone.PHONE_TYPE_CDMA) {
                 mCdmaOptions = new CdmaOptions(this, prefSet, mPhone);
+                prefSet.removePreference(mButtonPreferredUmtsNetworkMode);
+                mButtonPreferredCdmaNetworkMode.setOnPreferenceChangeListener(this);
+                mButtonPreferredCdmaNetworkMode.setValue(
+                        Integer.toString(settingsNetworkMode));
                 if (isLteOnCdma) {
                     mButtonPreferredNetworkMode.setOnPreferenceChangeListener(this);
                     mButtonPreferredNetworkMode.setEntries(
                             R.array.preferred_network_mode_choices_lte);
                     mButtonPreferredNetworkMode.setEntryValues(
                             R.array.preferred_network_mode_values_lte);
-                    int settingsNetworkMode = android.provider.Settings.Secure.getInt(
-                            mPhone.getContext().getContentResolver(),
-                            android.provider.Settings.Secure.PREFERRED_NETWORK_MODE,
-                            preferredNetworkMode);
                     mButtonPreferredNetworkMode.setValue(
                             Integer.toString(settingsNetworkMode));
                 }
 
             } else if (phoneType == Phone.PHONE_TYPE_GSM) {
                 mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet);
+
+                prefSet.removePreference(mButtonPreferredCdmaNetworkMode);
+                mButtonPreferredUmtsNetworkMode.setOnPreferenceChangeListener(this);
+                mButtonPreferredUmtsNetworkMode.setValue(
+                        Integer.toString(settingsNetworkMode));
+
+                if (isLteOnGsm) {
+                    mButtonPreferredNetworkMode.setOnPreferenceChangeListener(this);
+                    mButtonPreferredNetworkMode.setEntries(
+                            R.array.preferred_network_mode_choices_lte_gsm);
+                    mButtonPreferredNetworkMode.setEntryValues(
+                            R.array.preferred_network_mode_values_lte_gsm);
+                    mButtonPreferredNetworkMode.setValue(
+                            Integer.toString(settingsNetworkMode));
+                }
             } else {
                 throw new IllegalStateException("Unexpected phone type: " + phoneType);
             }
+
+            if (getResources().getBoolean(R.bool.config_preferred_mode_disable) == true) {
+                prefSet.removePreference(mButtonPreferredCdmaNetworkMode);
+                prefSet.removePreference(mButtonPreferredUmtsNetworkMode);
+            }
+
         }
 
         final boolean missingDataServiceUrl = TextUtils.isEmpty(
@@ -301,6 +359,9 @@ protected void onResume() {
         // and the UI state would be inconsistent with actual state
         mButtonDataRoam.setChecked(mPhone.getDataRoamingEnabled());
 
+        mButtonNationalDataRoam.setChecked(android.provider.Settings.System.getInt(
+             mPhone.getContext().getContentResolver(), android.provider.Settings.System.MVNO_ROAMING, 0) == 1);
+
         if (getPreferenceScreen().findPreference(BUTTON_PREFERED_NETWORK_MODE) != null)  {
             mPhone.getPreferredNetworkType(mHandler.obtainMessage(
                     MyHandler.MESSAGE_GET_PREFERRED_NETWORK_TYPE));
@@ -323,9 +384,13 @@ protected void onPause() {
      * display value.
      */
     public boolean onPreferenceChange(Preference preference, Object objValue) {
-        if (preference == mButtonPreferredNetworkMode) {
+        if (preference == mButtonPreferredNetworkMode ||
+                preference == mButtonPreferredUmtsNetworkMode ||
+                preference == mButtonPreferredCdmaNetworkMode) {
             //NOTE onPreferenceChange seems to be called even if there is no change
             //Check if the button value is changed from the System.Setting
+            mButtonPreferredUmtsNetworkMode.setValue((String) objValue);
+            mButtonPreferredCdmaNetworkMode.setValue((String) objValue);
             mButtonPreferredNetworkMode.setValue((String) objValue);
             int buttonNetworkMode;
             buttonNetworkMode = Integer.valueOf((String) objValue).intValue();
@@ -347,6 +412,12 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
                     case Phone.NT_MODE_CDMA:
                         modemNetworkMode = Phone.NT_MODE_CDMA;
                         break;
+                    case Phone.NT_MODE_LTE_CDMA_EVDO:
+                        modemNetworkMode = Phone.NT_MODE_LTE_CDMA_EVDO;
+                        break;
+                    case Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA:
+                        modemNetworkMode = Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA;
+                        break;
                     case Phone.NT_MODE_GSM_UMTS:
                         modemNetworkMode = Phone.NT_MODE_GSM_UMTS;
                         break;
@@ -359,6 +430,9 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
                     case Phone.NT_MODE_WCDMA_PREF:
                         modemNetworkMode = Phone.NT_MODE_WCDMA_PREF;
                         break;
+                    case Phone.NT_MODE_LTE_GSM_WCDMA:
+                        modemNetworkMode = Phone.NT_MODE_LTE_GSM_WCDMA;
+                        break;
                     default:
                         modemNetworkMode = Phone.PREFERRED_NT_MODE;
                 }
@@ -379,6 +453,10 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
                 //Set the modem network mode
                 mPhone.setPreferredNetworkType(modemNetworkMode, mHandler
                         .obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE));
+
+                Intent intent = new Intent(PhoneToggler.NETWORK_MODE_CHANGED);
+                intent.putExtra(PhoneToggler.NETWORK_MODE, buttonNetworkMode);
+                mPhone.getContext().sendBroadcast(intent, PhoneToggler.CHANGE_NETWORK_MODE_PERM);
             }
         }
 
@@ -388,8 +466,8 @@ public boolean onPreferenceChange(Preference preference, Object objValue) {
 
     private class MyHandler extends Handler {
 
-        private static final int MESSAGE_GET_PREFERRED_NETWORK_TYPE = 0;
-        private static final int MESSAGE_SET_PREFERRED_NETWORK_TYPE = 1;
+        static final int MESSAGE_GET_PREFERRED_NETWORK_TYPE = 0;
+        static final int MESSAGE_SET_PREFERRED_NETWORK_TYPE = 1;
 
         @Override
         public void handleMessage(Message msg) {
@@ -425,6 +503,7 @@ private void handleGetPreferredNetworkTypeResponse(Message msg) {
                             settingsNetworkMode);
                 }
 
+                boolean isLteOnCdma = mPhone.getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE;
                 //check that modemNetworkMode is from an accepted value
                 if (modemNetworkMode == Phone.NT_MODE_WCDMA_PREF ||
                         modemNetworkMode == Phone.NT_MODE_GSM_ONLY ||
@@ -433,7 +512,13 @@ private void handleGetPreferredNetworkTypeResponse(Message msg) {
                         modemNetworkMode == Phone.NT_MODE_CDMA ||
                         modemNetworkMode == Phone.NT_MODE_CDMA_NO_EVDO ||
                         modemNetworkMode == Phone.NT_MODE_EVDO_NO_CDMA ||
-                        modemNetworkMode == Phone.NT_MODE_GLOBAL ) {
+                        modemNetworkMode == Phone.NT_MODE_LTE_CDMA_EVDO ||
+                        modemNetworkMode == Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA ||
+                        modemNetworkMode == Phone.NT_MODE_LTE_GSM_WCDMA ||
+                        //A modem might report world phone sometimes
+                        //but it's not true. Double check here
+                        ((getResources().getBoolean(R.bool.world_phone) == true || isLteOnCdma) &&
+                            modemNetworkMode == Phone.NT_MODE_GLOBAL) ) {
                     if (DBG) {
                         log("handleGetPreferredNetworkTypeResponse: if 1: modemNetworkMode = " +
                                 modemNetworkMode);
@@ -457,11 +542,16 @@ private void handleGetPreferredNetworkTypeResponse(Message msg) {
                                 mPhone.getContext().getContentResolver(),
                                 android.provider.Settings.Secure.PREFERRED_NETWORK_MODE,
                                 settingsNetworkMode );
-                    }
-
+                    };
                     UpdatePreferredNetworkModeSummary(modemNetworkMode);
                     // changes the mButtonPreferredNetworkMode accordingly to modemNetworkMode
+                    mButtonPreferredCdmaNetworkMode.setValue(Integer.toString(modemNetworkMode));
+                    mButtonPreferredUmtsNetworkMode.setValue(Integer.toString(modemNetworkMode));
                     mButtonPreferredNetworkMode.setValue(Integer.toString(modemNetworkMode));
+
+                    Intent intent = new Intent(PhoneToggler.NETWORK_MODE_CHANGED);
+                    intent.putExtra(PhoneToggler.NETWORK_MODE, modemNetworkMode);
+                    mPhone.getContext().sendBroadcast(intent, PhoneToggler.CHANGE_NETWORK_MODE_PERM);
                 } else if (modemNetworkMode == Phone.NT_MODE_LTE_ONLY) {
                     // LTE Only mode not yet supported on UI, but could be used for testing
                     if (DBG) log("handleGetPreferredNetworkTypeResponse: lte only: no action");
@@ -474,13 +564,27 @@ private void handleGetPreferredNetworkTypeResponse(Message msg) {
 
         private void handleSetPreferredNetworkTypeResponse(Message msg) {
             AsyncResult ar = (AsyncResult) msg.obj;
+            int phoneType = mPhone.getPhoneType();
+            int networkMode;
 
             if (ar.exception == null) {
-                int networkMode = Integer.valueOf(
+                if (phoneType == Phone.PHONE_TYPE_GSM) {
+                    networkMode = Integer.valueOf(
+                        mButtonPreferredUmtsNetworkMode.getValue()).intValue();
+                } else if (phoneType == Phone.PHONE_TYPE_CDMA) {
+                    networkMode = Integer.valueOf(
+                        mButtonPreferredCdmaNetworkMode.getValue()).intValue();
+                } else {
+                    networkMode = Integer.valueOf(
                         mButtonPreferredNetworkMode.getValue()).intValue();
+                }
                 android.provider.Settings.Secure.putInt(mPhone.getContext().getContentResolver(),
                         android.provider.Settings.Secure.PREFERRED_NETWORK_MODE,
                         networkMode );
+
+                Intent intent = new Intent(PhoneToggler.NETWORK_MODE_CHANGED);
+                intent.putExtra(PhoneToggler.NETWORK_MODE, networkMode);
+                mPhone.getContext().sendBroadcast(intent, PhoneToggler.CHANGE_NETWORK_MODE_PERM);
             } else {
                 mPhone.getPreferredNetworkType(obtainMessage(MESSAGE_GET_PREFERRED_NETWORK_TYPE));
             }
@@ -488,6 +592,8 @@ private void handleSetPreferredNetworkTypeResponse(Message msg) {
 
         private void resetNetworkModeToDefault() {
             //set the mButtonPreferredNetworkMode
+            mButtonPreferredCdmaNetworkMode.setValue(Integer.toString(preferredNetworkMode));
+            mButtonPreferredUmtsNetworkMode.setValue(Integer.toString(preferredNetworkMode));
             mButtonPreferredNetworkMode.setValue(Integer.toString(preferredNetworkMode));
             //set the Settings.System
             android.provider.Settings.Secure.putInt(mPhone.getContext().getContentResolver(),
@@ -518,17 +624,18 @@ private void UpdatePreferredNetworkModeSummary(int NetworkMode) {
                         R.string.preferred_network_mode_gsm_wcdma_summary);
                 break;
             case Phone.NT_MODE_CDMA:
-                switch (mPhone.getLteOnCdmaMode()) {
+                // Show the same label whether a CDMA or CDMA/LTE phone.
+                /*switch (mPhone.getLteOnCdmaMode()) {
                     case Phone.LTE_ON_CDMA_TRUE:
                         mButtonPreferredNetworkMode.setSummary(
                             R.string.preferred_network_mode_cdma_summary);
                     break;
                     case Phone.LTE_ON_CDMA_FALSE:
-                    default:
+                    default:*/
                         mButtonPreferredNetworkMode.setSummary(
                             R.string.preferred_network_mode_cdma_evdo_summary);
-                        break;
-                }
+                        /*break;
+                }*/
                 break;
             case Phone.NT_MODE_CDMA_NO_EVDO:
                 mButtonPreferredNetworkMode.setSummary(
@@ -538,6 +645,18 @@ private void UpdatePreferredNetworkModeSummary(int NetworkMode) {
                 mButtonPreferredNetworkMode.setSummary(
                         R.string.preferred_network_mode_evdo_only_summary);
                 break;
+            case Phone.NT_MODE_LTE_GSM_WCDMA:
+                mButtonPreferredNetworkMode.setSummary(
+                        R.string.preferred_network_mode_lte_gsm_summary);
+                break;
+            case Phone.NT_MODE_LTE_CDMA_EVDO:
+                mButtonPreferredNetworkMode.setSummary(
+                        R.string.preferred_network_mode_lte_cdma_evdo_summary);
+                break;
+            case Phone.NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA:
+                mButtonPreferredNetworkMode.setSummary(
+                        R.string.preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary);
+                break;
             case Phone.NT_MODE_GLOBAL:
             default:
                 mButtonPreferredNetworkMode.setSummary(
diff --git a/src/com/android/phone/MyPhoneNumber.java b/src/com/android/phone/MyPhoneNumber.java
new file mode 100644
index 000000000..f8b72a56a
--- /dev/null
+++ b/src/com/android/phone/MyPhoneNumber.java
@@ -0,0 +1,59 @@
+package com.android.phone;
+
+import com.android.internal.telephony.IccCard;
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneFactory;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+
+public class MyPhoneNumber extends BroadcastReceiver {
+    private final String LOG_TAG = "MyPhoneNumber";
+    private final boolean DBG = false;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        TelephonyManager mTelephonyMgr = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        SharedPreferences prefs = context.getSharedPreferences(MyPhoneNumber.class.getPackage().getName() + "_preferences", Context.MODE_PRIVATE);
+
+        String phoneNum = mTelephonyMgr.getLine1Number();
+        String savedNum = prefs.getString(MSISDNEditPreference.PHONE_NUMBER, null);
+        String simState = intent.getStringExtra(IccCard.INTENT_KEY_ICC_STATE);
+
+        if (!IccCard.INTENT_VALUE_ICC_LOADED.equals(simState)) {
+            /* Don't set line 1 number unless SIM_STATE is LOADED
+             * (We're not using READY because the MSISDN record is not yet loaded on READY)
+             */
+            if (DBG)
+                Log.d(LOG_TAG, "simState not correct. No modification to phone number. simState: " + simState);
+        } else if (TextUtils.isEmpty(phoneNum)) {
+            if (DBG)
+                Log.d(LOG_TAG, "Trying to read the phone number from file");
+
+            if (savedNum != null) {
+                Phone mPhone = PhoneFactory.getDefaultPhone();
+                String alphaTag = mPhone.getLine1AlphaTag();
+
+                if (TextUtils.isEmpty(alphaTag)) {
+                    // No tag, set it.
+                    alphaTag = "Voice Line 1";
+                }
+
+                mPhone.setLine1Number(alphaTag, savedNum, null);
+
+                if (DBG)
+                    Log.d(LOG_TAG, "Phone number set to: " + savedNum);
+            } else if (DBG) {
+                    Log.d(LOG_TAG, "No phone number set yet");
+            }
+        } else if (DBG) {
+            Log.d(LOG_TAG, "Phone number exists. No need to read it from file.");
+        }
+    }
+}
diff --git a/src/com/android/phone/NetworkSetting.java b/src/com/android/phone/NetworkSetting.java
index 9365c4845..fff92fade 100644
--- a/src/com/android/phone/NetworkSetting.java
+++ b/src/com/android/phone/NetworkSetting.java
@@ -33,6 +33,7 @@
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.android.internal.telephony.CommandException;
@@ -41,6 +42,7 @@
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.ArrayList;
 
 /**
  * "Networks" settings UI for the Phone app.
@@ -386,8 +388,10 @@ private void networksListLoaded(List<OperatorInfo> result, int status) {
         // update the state of the preferences.
         if (DBG) log("hideProgressPanel");
 
-        if (mIsForeground) {
+        try {
             dismissDialog(DIALOG_NETWORK_LIST_LOAD);
+        } catch (IllegalArgumentException e){
+            if (DBG) log(" DIALOG_NETWORK_LIST_LOAD dismissed already");
         }
 
         getPreferenceScreen().setEnabled(true);
@@ -404,14 +408,21 @@ private void networksListLoaded(List<OperatorInfo> result, int status) {
                 // create a preference for each item in the list.
                 // just use the operator name instead of the mildly
                 // confusing mcc/mnc.
+                ArrayList <String> operatorNumerics = new ArrayList<String>();
                 for (OperatorInfo ni : result) {
-                    Preference carrier = new Preference(this, null);
-                    carrier.setTitle(ni.getOperatorAlphaLong());
-                    carrier.setPersistent(false);
-                    mNetworkList.addPreference(carrier);
-                    mNetworkMap.put(carrier, ni);
-
-                    if (DBG) log("  " + ni);
+                    String operatorNumeric = ni.getOperatorNumeric();
+                    if (!operatorNumerics.contains(operatorNumeric)) {
+                        operatorNumerics.add(operatorNumeric);
+                        Preference carrier = new Preference(this, null);
+                        carrier.setTitle(getNetworkTitle(ni));
+                        carrier.setPersistent(false);
+                        mNetworkList.addPreference(carrier);
+                        mNetworkMap.put(carrier, ni);
+
+                        if (DBG) log("  adding:   " + ni);
+                    } else {
+                        if (DBG) log("  skipping: " + ni);
+                    }
                 }
 
             } else {
@@ -420,6 +431,25 @@ private void networksListLoaded(List<OperatorInfo> result, int status) {
         }
     }
 
+    /**
+     * Returns the title of the network obtained in the manual search.
+     *
+     * @param OperatorInfo contains the information of the network.
+     *
+     * @return Long Name if not null/empty, otherwise Short Name if not null/empty,
+     * else MCCMNC string.
+     */
+
+    private String getNetworkTitle(OperatorInfo ni) {
+        if (!TextUtils.isEmpty(ni.getOperatorAlphaLong())) {
+            return ni.getOperatorAlphaLong();
+        } else if (!TextUtils.isEmpty(ni.getOperatorAlphaShort())) {
+            return ni.getOperatorAlphaShort();
+        } else {
+            return ni.getOperatorNumeric();
+        }
+    }
+
     private void clearList() {
         for (Preference p : mNetworkMap.keySet()) {
             mNetworkList.removePreference(p);
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 0009253a2..f8874744e 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -23,32 +23,39 @@
 import android.content.AsyncQueryHandler;
 import android.content.ComponentName;
 import android.content.ContentResolver;
+import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
 import android.net.Uri;
 import android.os.PowerManager;
-import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.preference.PreferenceManager;
+import android.provider.Settings;
 import android.provider.CallLog.Calls;
+import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.PhoneLookup;
+import android.provider.Settings;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.ServiceState;
 import android.text.TextUtils;
 import android.util.Log;
-import android.widget.RemoteViews;
+import android.widget.ImageView;
 import android.widget.Toast;
 
 import com.android.internal.telephony.Call;
+import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.CallerInfo;
 import com.android.internal.telephony.CallerInfoAsyncQuery;
 import com.android.internal.telephony.Connection;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneBase;
-import com.android.internal.telephony.CallManager;
+import com.android.internal.telephony.TelephonyCapabilities;
 
 /**
  * NotificationManager-related utility code for the Phone app.
@@ -63,6 +70,8 @@ public class NotificationMgr implements CallerInfoAsyncQuery.OnQueryCompleteList
     private static final String LOG_TAG = "NotificationMgr";
     private static final boolean DBG =
             (PhoneApp.DBG_LEVEL >= 1) && (SystemProperties.getInt("ro.debuggable", 0) == 1);
+    // Do not check in with VDBG = true, since that may write PII to the system log.
+    private static final boolean VDBG = false;
 
     private static final String[] CALL_LOG_PROJECTION = new String[] {
         Calls._ID,
@@ -82,6 +91,23 @@ public class NotificationMgr implements CallerInfoAsyncQuery.OnQueryCompleteList
     static final int DATA_DISCONNECTED_ROAMING_NOTIFICATION = 7;
     static final int SELECTED_OPERATOR_FAIL_NOTIFICATION = 8;
 
+    // notification light Settings.System keys
+    private static final String NOTIFICATION_LIGHT_PULSE = "notification_light_pulse";
+    private static final String NOTIFICATION_LIGHT_PULSE_DEFAULT_COLOR = "notification_light_pulse_default_color";
+    private static final String NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_ON = "notification_light_pulse_default_led_on";
+    private static final String NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_OFF = "notification_light_pulse_default_led_off";
+    private static final String NOTIFICATION_LIGHT_PULSE_CUSTOM_ENABLE = "notification_light_pulse_custom_enable";
+    private static final String NOTIFICATION_LIGHT_PULSE_CALL_COLOR = "notification_light_pulse_call_color";
+    private static final String NOTIFICATION_LIGHT_PULSE_CALL_LED_ON = "notification_light_pulse_call_led_on";
+    private static final String NOTIFICATION_LIGHT_PULSE_CALL_LED_OFF = "notification_light_pulse_call_led_off";
+    private static final String NOTIFICATION_LIGHT_PULSE_VMAIL_COLOR = "notification_light_pulse_vmail_color";
+    private static final String NOTIFICATION_LIGHT_PULSE_VMAIL_LED_ON = "notification_light_pulse_vmail_led_on";
+    private static final String NOTIFICATION_LIGHT_PULSE_VMAIL_LED_OFF = "notification_light_pulse_vmail_led_off";
+
+    // notification light default constants
+    public static final int DEFAULT_COLOR = 0xFFFFFF; //White
+    public static final int DEFAULT_TIME = 1000; // 1 second
+
     /** The singleton NotificationMgr instance. */
     private static NotificationMgr sInstance;
 
@@ -284,14 +310,19 @@ private void updateNotificationsAtStartup() {
     /** The projection to use when querying the phones table */
     static final String[] PHONES_PROJECTION = new String[] {
         PhoneLookup.NUMBER,
-        PhoneLookup.DISPLAY_NAME
+        PhoneLookup.DISPLAY_NAME,
+        PhoneLookup._ID
     };
 
     /**
-     * Class used to run asynchronous queries to re-populate
-     * the notifications we care about.
+     * Class used to run asynchronous queries to re-populate the notifications we care about.
+     * There are really 3 steps to this:
+     *  1. Find the list of missed calls
+     *  2. For each call, run a query to retrieve the caller's name.
+     *  3. For each caller, try obtaining photo.
      */
-    private class QueryHandler extends AsyncQueryHandler {
+    private class QueryHandler extends AsyncQueryHandler
+            implements ContactsAsyncHelper.OnImageLoadCompleteListener {
 
         /**
          * Used to store relevant fields for the Missed Call
@@ -300,7 +331,12 @@ private class QueryHandler extends AsyncQueryHandler {
         private class NotificationInfo {
             public String name;
             public String number;
-            public String label;
+            /**
+             * Type of the call. {@link android.provider.CallLog.Calls#INCOMING_TYPE}
+             * {@link android.provider.CallLog.Calls#OUTGOING_TYPE}, or
+             * {@link android.provider.CallLog.Calls#MISSED_TYPE}.
+             */
+            public String type;
             public long date;
         }
 
@@ -309,10 +345,7 @@ public QueryHandler(ContentResolver cr) {
         }
 
         /**
-         * Handles the query results.  There are really 2 steps to this,
-         * similar to what happens in CallLogActivity.
-         *  1. Find the list of missed calls
-         *  2. For each call, run a query to retrieve the caller's name.
+         * Handles the query results.
          */
         @Override
         protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
@@ -359,16 +392,38 @@ protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
                     if ((cursor != null) && (cookie != null)){
                         NotificationInfo n = (NotificationInfo) cookie;
 
+                        Uri personUri = null;
                         if (cursor.moveToFirst()) {
-                            // we have contacts data, get the name.
-                            if (DBG) log("contact :" + n.name + " found for phone: " + n.number);
                             n.name = cursor.getString(
                                     cursor.getColumnIndexOrThrow(PhoneLookup.DISPLAY_NAME));
+                            long person_id = cursor.getLong(
+                                    cursor.getColumnIndexOrThrow(PhoneLookup._ID));
+                            if (DBG) {
+                                log("contact :" + n.name + " found for phone: " + n.number
+                                        + ". id : " + person_id);
+                            }
+                            personUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, person_id);
                         }
 
-                        // send the notification
-                        if (DBG) log("sending notification.");
-                        notifyMissedCall(n.name, n.number, n.label, n.date);
+                        if (personUri != null) {
+                            if (DBG) {
+                                log("Start obtaining picture for the missed call. Uri: "
+                                        + personUri);
+                            }
+                            // Now try to obtain a photo for this person.
+                            // ContactsAsyncHelper will do that and call onImageLoadComplete()
+                            // after that.
+                            ContactsAsyncHelper.startObtainPhotoAsync(
+                                    0, mContext, personUri, this, n);
+                        } else {
+                            if (DBG) {
+                                log("Failed to find Uri for obtaining photo."
+                                        + " Just send notification without it.");
+                            }
+                            // We couldn't find person Uri, so we're sure we cannot obtain a photo.
+                            // Call notifyMissedCall() right now.
+                            notifyMissedCall(n.name, n.number, n.type, null, null, n.date);
+                        }
 
                         if (DBG) log("closing contact cursor.");
                         cursor.close();
@@ -378,6 +433,14 @@ protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
             }
         }
 
+        @Override
+        public void onImageLoadComplete(
+                int token, Drawable photo, Bitmap photoIcon, Object cookie) {
+            if (DBG) log("Finished loading image: " + photo);
+            NotificationInfo n = (NotificationInfo) cookie;
+            notifyMissedCall(n.name, n.number, n.type, photo, photoIcon, n.date);
+        }
+
         /**
          * Factory method to generate a NotificationInfo object given a
          * cursor from the call log table.
@@ -386,7 +449,7 @@ private final NotificationInfo getNotificationInfo(Cursor cursor) {
             NotificationInfo n = new NotificationInfo();
             n.name = null;
             n.number = cursor.getString(cursor.getColumnIndexOrThrow(Calls.NUMBER));
-            n.label = cursor.getString(cursor.getColumnIndexOrThrow(Calls.TYPE));
+            n.type = cursor.getString(cursor.getColumnIndexOrThrow(Calls.TYPE));
             n.date = cursor.getLong(cursor.getColumnIndexOrThrow(Calls.DATE));
 
             // make sure we update the number depending upon saved values in
@@ -406,21 +469,65 @@ private final NotificationInfo getNotificationInfo(Cursor cursor) {
     }
 
     /**
-     * Configures a Notification to emit the blinky green message-waiting/
+     * Configures a Notification to emit the blinky message-waiting/
      * missed-call signal.
+     * @param notificationType
      */
-    private static void configureLedNotification(Notification note) {
-        note.flags |= Notification.FLAG_SHOW_LIGHTS;
-        note.defaults |= Notification.DEFAULT_LIGHTS;
+    private static void configureLedNotification(Context context, int notificationType, Notification note) {
+
+        // get the default Notification light settings
+        ContentResolver resolver = context.getContentResolver();
+        boolean lightEnabled = Settings.System.getInt(resolver, NOTIFICATION_LIGHT_PULSE, 0) == 1;
+        int color = Settings.System.getInt(resolver, NOTIFICATION_LIGHT_PULSE_DEFAULT_COLOR, DEFAULT_COLOR);
+        int timeOn = Settings.System.getInt(resolver, NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_ON, DEFAULT_TIME);
+        int timeOff = Settings.System.getInt(resolver, NOTIFICATION_LIGHT_PULSE_DEFAULT_LED_OFF, DEFAULT_TIME);
+
+        // Get Missed call and Voice mail values if they are to be used
+        boolean customEnabled = Settings.System.getInt(resolver, NOTIFICATION_LIGHT_PULSE_CUSTOM_ENABLE, 0) == 1;
+        if (customEnabled) {
+            if (notificationType == MISSED_CALL_NOTIFICATION) {
+                color = Settings.System.getInt(resolver, NOTIFICATION_LIGHT_PULSE_CALL_COLOR, DEFAULT_COLOR);
+                timeOn = Settings.System.getInt(resolver, NOTIFICATION_LIGHT_PULSE_CALL_LED_ON, DEFAULT_TIME);
+                timeOff = Settings.System.getInt(resolver, NOTIFICATION_LIGHT_PULSE_CALL_LED_OFF, DEFAULT_TIME);
+            } else if (notificationType == VOICEMAIL_NOTIFICATION) {
+                color = Settings.System.getInt(resolver, NOTIFICATION_LIGHT_PULSE_VMAIL_COLOR, DEFAULT_COLOR);
+                timeOn = Settings.System.getInt(resolver, NOTIFICATION_LIGHT_PULSE_VMAIL_LED_ON, DEFAULT_TIME);
+                timeOff = Settings.System.getInt(resolver, NOTIFICATION_LIGHT_PULSE_VMAIL_LED_OFF, DEFAULT_TIME);
+            }
+        }
+
+        // Set the LED flags if notification light is enabled
+        if (lightEnabled) {
+            note.ledARGB = color;
+            note.ledOnMS = timeOn;
+            note.ledOffMS = timeOff;
+            note.flags |= Notification.FLAG_SHOW_LIGHTS;
+            note.flags |= Notification.FLAG_FORCE_LED_SCREEN_OFF;
+        }
     }
 
     /**
      * Displays a notification about a missed call.
      *
-     * @param nameOrNumber either the contact name, or the phone number if no contact
-     * @param label the label of the number if nameOrNumber is a name, null if it is a number
+     * @param name the contact name.
+     * @param number the phone number. Note that this may be a non-callable String like "Unknown",
+     * or "Private Number", which possibly come from methods like
+     * {@link PhoneUtils#modifyForSpecialCnapCases(Context, CallerInfo, String, int)}.
+     * @param type the type of the call. {@link android.provider.CallLog.Calls#INCOMING_TYPE}
+     * {@link android.provider.CallLog.Calls#OUTGOING_TYPE}, or
+     * {@link android.provider.CallLog.Calls#MISSED_TYPE}
+     * @param photo picture which may be used for the notification (when photoIcon is null).
+     * This also can be null when the picture itself isn't available. If photoIcon is available
+     * it should be prioritized (because this may be too huge for notification).
+     * See also {@link ContactsAsyncHelper}.
+     * @param photoIcon picture which should be used for the notification. Can be null. This is
+     * the most suitable for {@link android.app.Notification.Builder#setLargeIcon(Bitmap)}, this
+     * should be used when non-null.
+     * @param date the time when the missed call happened
      */
-    void notifyMissedCall(String name, String number, String label, long date) {
+    /* package */ void notifyMissedCall(
+            String name, String number, String type, Drawable photo, Bitmap photoIcon, long date) {
+
         // When the user clicks this notification, we go to the call log.
         final Intent callLogIntent = PhoneApp.createCallLogIntent();
 
@@ -432,6 +539,12 @@ void notifyMissedCall(String name, String number, String label, long date) {
             return;
         }
 
+        if (VDBG) {
+            log("notifyMissedCall(). name: " + name + ", number: " + number
+                + ", label: " + type + ", photo: " + photo + ", photoIcon: " + photoIcon
+                + ", date: " + date);
+        }
+
         // title resource id
         int titleResId;
         // the text in the notification's line 1 and 2.
@@ -463,21 +576,48 @@ void notifyMissedCall(String name, String number, String label, long date) {
                     mNumberMissedCalls);
         }
 
-        // make the notification
-        Notification note = new Notification(
-                android.R.drawable.stat_notify_missed_call, // icon
-                mContext.getString(R.string.notification_missedCallTicker, callName), // tickerText
-                date // when
-                );
-        note.setLatestEventInfo(mContext, mContext.getText(titleResId), expandedText,
-                PendingIntent.getActivity(mContext, 0, callLogIntent, 0));
-        note.flags |= Notification.FLAG_AUTO_CANCEL;
-        // This intent will be called when the notification is dismissed.
-        // It will take care of clearing the list of missed calls.
-        note.deleteIntent = createClearMissedCallsIntent();
-
-        configureLedNotification(note);
-        mNotificationManager.notify(MISSED_CALL_NOTIFICATION, note);
+        Notification.Builder builder = new Notification.Builder(mContext);
+        builder.setSmallIcon(android.R.drawable.stat_notify_missed_call)
+                .setTicker(mContext.getString(R.string.notification_missedCallTicker, callName))
+                .setWhen(date)
+                .setContentTitle(mContext.getText(titleResId))
+                .setContentText(expandedText)
+                .setContentIntent(PendingIntent.getActivity(mContext, 0, callLogIntent, 0))
+                .setAutoCancel(true)
+                .setDeleteIntent(createClearMissedCallsIntent());
+
+        // Simple workaround for issue 6476275; refrain having actions when the given number seems
+        // not a real one but a non-number which was embedded by methods outside (like
+        // PhoneUtils#modifyForSpecialCnapCases()).
+        // TODO: consider removing equals() checks here, and modify callers of this method instead.
+        if (mNumberMissedCalls == 1
+                && !TextUtils.isEmpty(number)
+                && !TextUtils.equals(number, mContext.getString(R.string.private_num))
+                && !TextUtils.equals(number, mContext.getString(R.string.unknown))){
+            if (DBG) log("Add actions with the number " + number);
+
+            builder.addAction(R.drawable.stat_sys_phone_call,
+                    mContext.getString(R.string.notification_missedCall_call_back),
+                    PhoneApp.getCallBackPendingIntent(mContext, number));
+
+            builder.addAction(R.drawable.ic_text_holo_dark,
+                    mContext.getString(R.string.notification_missedCall_message),
+                    PhoneApp.getSendSmsFromNotificationPendingIntent(mContext, number));
+
+            if (photoIcon != null) {
+                builder.setLargeIcon(photoIcon);
+            } else if (photo instanceof BitmapDrawable) {
+                builder.setLargeIcon(((BitmapDrawable) photo).getBitmap());
+            }
+        } else {
+            if (DBG) {
+                log("Suppress actions. number: " + number + ", missedCalls: " + mNumberMissedCalls);
+            }
+        }
+
+        Notification notification = builder.getNotification();
+        configureLedNotification(mContext, MISSED_CALL_NOTIFICATION, notification);
+        mNotificationManager.notify(MISSED_CALL_NOTIFICATION, notification);
     }
 
     /** Returns an intent to be invoked when the missed call notification is cleared. */
@@ -519,12 +659,12 @@ private void cancelSpeakerphone() {
      *
      * If you already know the current speaker state (e.g. if you just
      * called AudioManager.setSpeakerphoneOn() yourself) then you should
-     * directly call {@link updateSpeakerNotification(boolean)} instead.
+     * directly call {@link #updateSpeakerNotification(boolean)} instead.
      *
      * (But note that the status bar icon is *never* shown while the in-call UI
      * is active; it only appears if you bail out to some other activity.)
      */
-    public void updateSpeakerNotification() {
+    private void updateSpeakerNotification() {
         AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
         boolean showNotification =
                 (mPhone.getState() == Phone.State.OFFHOOK) && audioManager.isSpeakerphoneOn();
@@ -652,7 +792,7 @@ public void updateInCallNotification() {
      * update or cancel the in-call notification based on the current
      * phone state.
      *
-     * @see updateInCallNotification()
+     * @see #updateInCallNotification(boolean)
      */
     public void updateNotificationAndLaunchIncomingCallUi() {
         // Set allowFullScreenIntent=true to indicate that we *should*
@@ -666,7 +806,7 @@ public void updateNotificationAndLaunchIncomingCallUi() {
      * status bar notification based on the current telephony state, or
      * cancels the notification if the phone is totally idle.
      *
-     * @param allowLaunchInCallScreen If true, *and* an incoming call is
+     * @param allowFullScreenIntent If true, *and* an incoming call is
      *   ringing, the notification will include a "fullScreenIntent"
      *   pointing at the InCallScreen (which will cause the InCallScreen
      *   to be launched.)
@@ -712,15 +852,6 @@ private void updateInCallNotification(boolean allowFullScreenIntent) {
         boolean suppressNotification = mApp.isShowingCallScreen();
         // if (DBG) log("- suppressNotification: initial value: " + suppressNotification);
 
-        // Additionally, suppress the notification if the screen is off.
-        // (Of course no UI is visible at this point(!) -- we're doing
-        // this purely to avoid a brief flicker of the icon in the status
-        // bar when the screen turns back on (due to the prox sensor, for
-        // example) while still on the InCallScreen.)
-        boolean isScreenOn = mPowerManager.isScreenOn();
-        // if (DBG) log("  - suppressNotification: isScreenOn = " + isScreenOn);
-        if (!isScreenOn) suppressNotification = true;
-
         // ...except for a couple of cases where we *never* suppress the
         // notification:
         //
@@ -753,7 +884,7 @@ private void updateInCallNotification(boolean allowFullScreenIntent) {
 
         if (hasRingingCall) {
             // There's an incoming ringing call.
-            resId = R.drawable.stat_sys_phone_call_ringing;
+            resId = R.drawable.stat_sys_phone_call;
         } else if (!hasActiveCall && hasHoldingCall) {
             // There's only one call, and it's on hold.
             if (enhancedVoicePrivacy) {
@@ -761,13 +892,6 @@ private void updateInCallNotification(boolean allowFullScreenIntent) {
             } else {
                 resId = R.drawable.stat_sys_phone_call_on_hold;
             }
-        } else if (mApp.showBluetoothIndication()) {
-            // Bluetooth is active.
-            if (enhancedVoicePrivacy) {
-                resId = R.drawable.stat_sys_vp_phone_call_bluetooth;
-            } else {
-                resId = R.drawable.stat_sys_phone_call_bluetooth;
-            }
         } else {
             if (enhancedVoicePrivacy) {
                 resId = R.drawable.stat_sys_vp_phone_call;
@@ -785,9 +909,6 @@ private void updateInCallNotification(boolean allowFullScreenIntent) {
         if (DBG) log("- Updating status bar icon: resId = " + resId);
         mInCallResId = resId;
 
-        // The icon in the expanded view is the same as in the status bar.
-        int expandedViewIcon = mInCallResId;
-
         // Even if both lines are in use, we only show a single item in
         // the expanded Notifications UI.  It's labeled "Ongoing call"
         // (or "On hold" if there's only one call, and it's on hold.)
@@ -806,9 +927,8 @@ private void updateInCallNotification(boolean allowFullScreenIntent) {
         }
         Connection currentConn = currentCall.getEarliestConnection();
 
-        Notification notification = new Notification();
-        notification.icon = mInCallResId;
-        notification.flags |= Notification.FLAG_ONGOING_EVENT;
+        final Notification.Builder builder = new Notification.Builder(mContext);
+        builder.setSmallIcon(mInCallResId).setOngoing(true);
 
         // PendingIntent that can be used to launch the InCallScreen.  The
         // system fires off this intent if the user pulls down the windowshade
@@ -818,63 +938,104 @@ private void updateInCallNotification(boolean allowFullScreenIntent) {
         PendingIntent inCallPendingIntent =
                 PendingIntent.getActivity(mContext, 0,
                                           PhoneApp.createInCallIntent(), 0);
-        notification.contentIntent = inCallPendingIntent;
-
-        // When expanded, the "Ongoing call" notification is (visually)
-        // different from most other Notifications, so we need to use a
-        // custom view hierarchy.
-        // Our custom view, which includes an icon (either "ongoing call" or
-        // "on hold") and 2 lines of text: (1) the label (either "ongoing
-        // call" with time counter, or "on hold), and (2) the compact name of
-        // the current Connection.
-        RemoteViews contentView = new RemoteViews(mContext.getPackageName(),
-                                                   R.layout.ongoing_call_notification);
-        contentView.setImageViewResource(R.id.icon, expandedViewIcon);
-
-        // if the connection is valid, then build what we need for the
-        // first line of notification information, and start the chronometer.
-        // Otherwise, don't bother and just stick with line 2.
+        builder.setContentIntent(inCallPendingIntent);
+
+        // Update icon on the left of the notification.
+        // - If it is directly available from CallerInfo, we'll just use that.
+        // - If it is not, use the same icon as in the status bar.
+        CallerInfo callerInfo = null;
         if (currentConn != null) {
-            // Determine the "start time" of the current connection, in terms
-            // of the SystemClock.elapsedRealtime() timebase (which is what
-            // the Chronometer widget needs.)
-            //   We can't use currentConn.getConnectTime(), because (1) that's
-            // in the currentTimeMillis() time base, and (2) it's zero when
-            // the phone first goes off hook, since the getConnectTime counter
-            // doesn't start until the DIALING -> ACTIVE transition.
-            //   Instead we start with the current connection's duration,
-            // and translate that into the elapsedRealtime() timebase.
-            long callDurationMsec = currentConn.getDurationMillis();
-            long chronometerBaseTime = SystemClock.elapsedRealtime() - callDurationMsec;
-
-            // Line 1 of the expanded view (in bold text):
-            String expandedViewLine1;
+            Object o = currentConn.getUserData();
+            if (o instanceof CallerInfo) {
+                callerInfo = (CallerInfo) o;
+            } else if (o instanceof PhoneUtils.CallerInfoToken) {
+                callerInfo = ((PhoneUtils.CallerInfoToken) o).currentInfo;
+            } else {
+                Log.w(LOG_TAG, "CallerInfo isn't available while Call object is available.");
+            }
+        }
+        boolean largeIconWasSet = false;
+        if (callerInfo != null) {
+            // In most cases, the user will see the notification after CallerInfo is already
+            // available, so photo will be available from this block.
+            if (callerInfo.isCachedPhotoCurrent) {
+                // .. and in that case CallerInfo's cachedPhotoIcon should also be available.
+                // If it happens not, then try using cachedPhoto, assuming Drawable coming from
+                // ContactProvider will be BitmapDrawable.
+                if (callerInfo.cachedPhotoIcon != null) {
+                    builder.setLargeIcon(callerInfo.cachedPhotoIcon);
+                    largeIconWasSet = true;
+                } else if (callerInfo.cachedPhoto instanceof BitmapDrawable) {
+                    if (DBG) log("- BitmapDrawable found for large icon");
+                    Bitmap bitmap = ((BitmapDrawable) callerInfo.cachedPhoto).getBitmap();
+                    builder.setLargeIcon(bitmap);
+                    largeIconWasSet = true;
+                } else {
+                    if (DBG) {
+                        log("- Failed to fetch icon from CallerInfo's cached photo."
+                                + " (cachedPhotoIcon: " + callerInfo.cachedPhotoIcon
+                                + ", cachedPhoto: " + callerInfo.cachedPhoto + ")."
+                                + " Ignore it.");
+                    }
+                }
+            }
+
+            if (!largeIconWasSet && callerInfo.photoResource > 0) {
+                if (DBG) {
+                    log("- BitmapDrawable nor person Id not found for large icon."
+                            + " Use photoResource: " + callerInfo.photoResource);
+                }
+                Drawable drawable =
+                        mContext.getResources().getDrawable(callerInfo.photoResource);
+                if (drawable instanceof BitmapDrawable) {
+                    Bitmap bitmap = ((BitmapDrawable) drawable).getBitmap();
+                    builder.setLargeIcon(bitmap);
+                    largeIconWasSet = true;
+                } else {
+                    if (DBG) {
+                        log("- PhotoResource was found but it didn't return BitmapDrawable."
+                                + " Ignore it");
+                    }
+                }
+            }
+        } else {
+            if (DBG) log("- CallerInfo not found. Use the same icon as in the status bar.");
+        }
+
+        // Failed to fetch Bitmap.
+        if (!largeIconWasSet && DBG) {
+            log("- No useful Bitmap was found for the photo."
+                    + " Use the same icon as in the status bar.");
+        }
+
+        // If the connection is valid, then build what we need for the
+        // content text of notification, and start the chronometer.
+        // Otherwise, don't bother and just stick with content title.
+        if (currentConn != null) {
+            if (DBG) log("- Updating context text and chronometer.");
             if (hasRingingCall) {
                 // Incoming call is ringing.
-                // Note this isn't a format string!  (We want "Incoming call"
-                // here, not "Incoming call (1:23)".)  But that's OK; if you
-                // call String.format() with more arguments than format
-                // specifiers, the extra arguments are ignored.
-                expandedViewLine1 = mContext.getString(R.string.notification_incoming_call);
+                builder.setContentText(mContext.getString(R.string.notification_incoming_call));
+                builder.setUsesChronometer(false);
             } else if (hasHoldingCall && !hasActiveCall) {
                 // Only one call, and it's on hold.
-                // Note this isn't a format string either (see comment above.)
-                expandedViewLine1 = mContext.getString(R.string.notification_on_hold);
+                builder.setContentText(mContext.getString(R.string.notification_on_hold));
+                builder.setUsesChronometer(false);
             } else {
-                // Normal ongoing call.
-                // Format string with a "%s" where the current call time should go.
-                expandedViewLine1 = mContext.getString(R.string.notification_ongoing_call_format);
+                // We show the elapsed time of the current call using Chronometer.
+                builder.setUsesChronometer(true);
+
+                // Determine the "start time" of the current connection.
+                //   We can't use currentConn.getConnectTime(), because (1) that's
+                // in the currentTimeMillis() time base, and (2) it's zero when
+                // the phone first goes off hook, since the getConnectTime counter
+                // doesn't start until the DIALING -> ACTIVE transition.
+                //   Instead we start with the current connection's duration,
+                // and translate that into the elapsedRealtime() timebase.
+                long callDurationMsec = currentConn.getDurationMillis();
+                builder.setWhen(System.currentTimeMillis() - callDurationMsec);
+                builder.setContentText(mContext.getString(R.string.notification_ongoing_call));
             }
-
-            if (DBG) log("- Updating expanded view: line 1 '" + /*expandedViewLine1*/ "xxxxxxx" + "'");
-
-            // Text line #1 is actually a Chronometer, not a plain TextView.
-            // We format the elapsed time of the current call into a line like
-            // "Ongoing call (01:23)".
-            contentView.setChronometer(R.id.text1,
-                                       chronometerBaseTime,
-                                       expandedViewLine1,
-                                       true);
         } else if (DBG) {
             Log.w(LOG_TAG, "updateInCallNotification: null connection, can't set exp view line 1.");
         }
@@ -905,8 +1066,7 @@ private void updateInCallNotification(boolean allowFullScreenIntent) {
         }
 
         if (DBG) log("- Updating expanded view: line 2 '" + /*expandedViewLine2*/ "xxxxxxx" + "'");
-        contentView.setTextViewText(R.id.title, expandedViewLine2);
-        notification.contentView = contentView;
+        builder.setContentTitle(expandedViewLine2);
 
         // TODO: We also need to *update* this notification in some cases,
         // like when a call ends on one line but the other is still in use
@@ -921,7 +1081,7 @@ private void updateInCallNotification(boolean allowFullScreenIntent) {
 
             // This is a high-priority event that should be shown even if the
             // status bar is hidden or if an immersive activity is running.
-            notification.flags |= Notification.FLAG_HIGH_PRIORITY;
+            builder.setPriority(Notification.PRIORITY_HIGH);
 
             // If an immersive activity is running, we have room for a single
             // line of text in the small notification popup window.
@@ -929,7 +1089,7 @@ private void updateInCallNotification(boolean allowFullScreenIntent) {
             // the incoming caller), since that's more relevant than
             // expandedViewLine1 (which is something generic like "Incoming
             // call".)
-            notification.tickerText = expandedViewLine2;
+            builder.setTicker(expandedViewLine2);
 
             if (allowFullScreenIntent) {
                 // Ok, we actually want to launch the incoming call
@@ -938,7 +1098,7 @@ private void updateInCallNotification(boolean allowFullScreenIntent) {
                 // the InCallScreen to be launched immediately *unless* the
                 // current foreground activity is marked as "immersive".
                 if (DBG) log("- Setting fullScreenIntent: " + inCallPendingIntent);
-                notification.fullScreenIntent = inCallPendingIntent;
+                builder.setFullScreenIntent(inCallPendingIntent, true);
 
                 // Ugly hack alert:
                 //
@@ -969,11 +1129,21 @@ private void updateInCallNotification(boolean allowFullScreenIntent) {
                     mNotificationManager.cancel(IN_CALL_NOTIFICATION);
                 }
             }
+        } else { // not ringing call
+            // Make the notification prioritized over the other normal notifications.
+            builder.setPriority(Notification.PRIORITY_HIGH);
+
+            // TODO: use "if (DBG)" for this comment.
+            log("Will show \"hang-up\" action in the ongoing active call Notification");
+            // TODO: use better asset.
+            builder.addAction(R.drawable.stat_sys_phone_call_end,
+                    mContext.getText(R.string.notification_action_end_call),
+                    PhoneApp.createHangUpOngoingCallPendingIntent(mContext));
         }
 
+        Notification notification = builder.getNotification();
         if (DBG) log("Notifying IN_CALL_NOTIFICATION: " + notification);
-        mNotificationManager.notify(IN_CALL_NOTIFICATION,
-                                notification);
+        mNotificationManager.notify(IN_CALL_NOTIFICATION, notification);
 
         // Finally, refresh the mute and speakerphone notifications (since
         // some phone state changes can indirectly affect the mute and/or
@@ -986,6 +1156,7 @@ private void updateInCallNotification(boolean allowFullScreenIntent) {
      * Implemented for CallerInfoAsyncQuery.OnQueryCompleteListener interface.
      * refreshes the contentView when called.
      */
+    @Override
     public void onQueryComplete(int token, Object cookie, CallerInfo ci){
         if (DBG) log("CallerInfo query complete (for NotificationMgr), "
                      + "updating in-call notification..");
@@ -1044,6 +1215,7 @@ private void cancelInCall() {
      */
     /* package */ void updateMwi(boolean visible) {
         if (DBG) log("updateMwi(): " + visible);
+
         if (visible) {
             int resId = android.R.drawable.stat_notify_voicemail;
 
@@ -1122,22 +1294,25 @@ private void cancelInCall() {
                     Uri.fromParts(Constants.SCHEME_VOICEMAIL, "", null));
             PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, 0);
 
-            Notification notification = new Notification(
-                    resId,  // icon
-                    null, // tickerText
-                    System.currentTimeMillis()  // Show the time the MWI notification came in,
-                                                // since we don't know the actual time of the
-                                                // most recent voicemail message
-                    );
-            notification.setLatestEventInfo(
-                    mContext,  // context
-                    notificationTitle,  // contentTitle
-                    notificationText,  // contentText
-                    pendingIntent  // contentIntent
-                    );
-            notification.defaults |= Notification.DEFAULT_SOUND;
-
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
+            Uri ringtoneUri;
+            String uriString = prefs.getString(
+                    CallFeaturesSetting.BUTTON_VOICEMAIL_NOTIFICATION_RINGTONE_KEY, null);
+            if (!TextUtils.isEmpty(uriString)) {
+                ringtoneUri = Uri.parse(uriString);
+            } else {
+                ringtoneUri = Settings.System.DEFAULT_NOTIFICATION_URI;
+            }
+
+            Notification.Builder builder = new Notification.Builder(mContext);
+            builder.setSmallIcon(resId)
+                    .setWhen(System.currentTimeMillis())
+                    .setContentTitle(notificationTitle)
+                    .setContentText(notificationText)
+                    .setContentIntent(pendingIntent)
+                    .setSound(ringtoneUri);
+            Notification notification = builder.getNotification();
+
             String vibrateWhen = prefs.getString(
                     CallFeaturesSetting.BUTTON_VOICEMAIL_NOTIFICATION_VIBRATE_WHEN_KEY, "never");
             boolean vibrateAlways = vibrateWhen.equals("always");
@@ -1150,7 +1325,7 @@ private void cancelInCall() {
             }
 
             notification.flags |= Notification.FLAG_NO_CLEAR;
-            configureLedNotification(notification);
+            configureLedNotification(mContext, VOICEMAIL_NOTIFICATION, notification);
             mNotificationManager.notify(VOICEMAIL_NOTIFICATION, notification);
         } else {
             mNotificationManager.cancel(VOICEMAIL_NOTIFICATION);
@@ -1220,8 +1395,9 @@ private void cancelInCall() {
     /* package */ void showDataDisconnectedRoaming() {
         if (DBG) log("showDataDisconnectedRoaming()...");
 
+        // "Mobile network settings" screen / dialog
         Intent intent = new Intent(mContext,
-                com.android.phone.Settings.class);  // "Mobile network settings" screen / dialog
+                com.android.phone.MobileNetworkSettings.class);
 
         Notification notification = new Notification(
                 android.R.drawable.stat_sys_warning, // icon
diff --git a/src/com/android/phone/OtaStartupReceiver.java b/src/com/android/phone/OtaStartupReceiver.java
index 04d012ad3..180041f93 100644
--- a/src/com/android/phone/OtaStartupReceiver.java
+++ b/src/com/android/phone/OtaStartupReceiver.java
@@ -31,6 +31,7 @@
 import android.telephony.TelephonyManager;
 
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.TelephonyCapabilities;
 
 import android.util.Log;
 
@@ -41,7 +42,7 @@
  */
 public class OtaStartupReceiver extends BroadcastReceiver {
     private static final String TAG = "OtaStartupReceiver";
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
     private static final int MIN_READY = 10;
     private static final int SERVICE_STATE_CHANGED = 11;
     private Context mContext;
@@ -139,30 +140,30 @@ public void onReceive(Context context, Intent intent) {
         if (DBG) Log.d(TAG, "call OtaUtils.maybeDoOtaCall");
         OtaUtils.maybeDoOtaCall(mContext, mHandler, MIN_READY);
     }
-    
+
     /**
-     * On devices that provide a phone initialization wizard (such as Google Setup Wizard), we 
+     * On devices that provide a phone initialization wizard (such as Google Setup Wizard), we
      * allow delaying CDMA OTA setup so it can be done in a single wizard. The wizard is responsible
-     * for (1) disabling itself once it has been run and/or (2) setting the 'device_provisioned' 
+     * for (1) disabling itself once it has been run and/or (2) setting the 'device_provisioned'
      * flag to something non-zero and (3) calling the OTA Setup with the action below.
-     * 
+     *
      * NB: Typical phone initialization wizards will install themselves as the homescreen
-     * (category "android.intent.category.HOME") with a priority higher than the default.  
+     * (category "android.intent.category.HOME") with a priority higher than the default.
      * The wizard should set 'device_provisioned' when it completes, disable itself with the
      * PackageManager.setComponentEnabledSetting() and then start home screen.
-     * 
+     *
      * @return true if setup will be handled by wizard, false if it should be done now.
      */
     private boolean shouldPostpone(Context context) {
         Intent intent = new Intent("android.intent.action.DEVICE_INITIALIZATION_WIZARD");
-        ResolveInfo resolveInfo = context.getPackageManager().resolveActivity(intent, 
+        ResolveInfo resolveInfo = context.getPackageManager().resolveActivity(intent,
                 PackageManager.MATCH_DEFAULT_ONLY);
         boolean provisioned = Settings.Secure.getInt(context.getContentResolver(),
                 Settings.Secure.DEVICE_PROVISIONED, 0) != 0;
         String mode = SystemProperties.get("ro.setupwizard.mode", "REQUIRED");
         boolean runningSetupWizard = "REQUIRED".equals(mode) || "OPTIONAL".equals(mode);
         if (DBG) {
-            Log.v(TAG, "resolvInfo = " + resolveInfo + ", provisioned = " + provisioned 
+            Log.v(TAG, "resolvInfo = " + resolveInfo + ", provisioned = " + provisioned
                     + ", runningSetupWizard = " + runningSetupWizard);
         }
         return resolveInfo != null && !provisioned && runningSetupWizard;
diff --git a/src/com/android/phone/OtaUtils.java b/src/com/android/phone/OtaUtils.java
index 596ae1f6d..a93e0e703 100644
--- a/src/com/android/phone/OtaUtils.java
+++ b/src/com/android/phone/OtaUtils.java
@@ -17,6 +17,7 @@
 package com.android.phone;
 
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.TelephonyCapabilities;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.phone.OtaUtils.CdmaOtaInCallScreenUiState.State;
 
@@ -60,7 +61,7 @@
  */
 public class OtaUtils {
     private static final String LOG_TAG = "OtaUtils";
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
 
     public static final int OTA_SHOW_ACTIVATION_SCREEN_OFF = 0;
     public static final int OTA_SHOW_ACTIVATION_SCREEN_ON = 1;
@@ -141,7 +142,6 @@ public class OtaUtils {
     private Context mContext;
     private PhoneApp mApplication;
     private OtaWidgetData mOtaWidgetData;
-    private ViewGroup mInCallPanel;  // Container for the CallCard
     private ViewGroup mInCallTouchUi;  // UI controls for regular calls
     private CallCard mCallCard;
 
@@ -230,9 +230,7 @@ public OtaUtils(Context context, boolean interactive) {
      * InCallScreen.onResume().)
      */
     public void updateUiWidgets(InCallScreen inCallScreen,
-                                ViewGroup inCallPanel,
-                                ViewGroup inCallTouchUi,
-                                CallCard callCard) {
+            ViewGroup inCallTouchUi, CallCard callCard) {
         if (DBG) log("updateUiWidgets()...  mInCallScreen = " + mInCallScreen);
 
         if (!mInteractive) {
@@ -245,7 +243,6 @@ public void updateUiWidgets(InCallScreen inCallScreen,
         }
 
         mInCallScreen = inCallScreen;
-        mInCallPanel = inCallPanel;
         mInCallTouchUi = inCallTouchUi;
         mCallCard = callCard;
         mOtaWidgetData = new OtaWidgetData();
@@ -269,7 +266,6 @@ public void updateUiWidgets(InCallScreen inCallScreen,
      */
     public void clearUiWidgets() {
         mInCallScreen = null;
-        mInCallPanel = null;
         mInCallTouchUi = null;
         mCallCard = null;
         mOtaWidgetData = null;
@@ -519,7 +515,7 @@ public static boolean isOtaspCallIntent(Intent intent) {
         // the magic OTASP numbers.
         String number;
         try {
-            number = CallController.getInitialNumber(intent);
+            number = PhoneUtils.getInitialNumber(intent);
         } catch (PhoneUtils.VoiceMailNumberMissingException ex) {
             // This was presumably a "voicemail:" intent, so it's
             // obviously not an OTASP number.
@@ -884,12 +880,6 @@ private void sendOtaspResult(int resultCode) {
         if (mApplication.cdmaOtaScreenState.otaspResultCodePendingIntent == null) {
             Log.w(LOG_TAG, "updateNonInteractiveOtaSuccessFailure: "
                   + "null otaspResultCodePendingIntent!");
-            // This *should* never happen, since SetupWizard always passes this
-            // PendingIntent along with the ACTION_PERFORM_CDMA_PROVISIONING
-            // intent.
-            // (But if this happens it's not a fatal error, it just means that
-            // our original caller has no way of finding out whether the OTASP
-            // call ultimately failed or succeeded...)
             return;
         }
 
@@ -1122,9 +1112,12 @@ private void otaScreenInitialize() {
             return;
         }
 
-        if (mInCallPanel != null) mInCallPanel.setVisibility(View.GONE);
         if (mInCallTouchUi != null) mInCallTouchUi.setVisibility(View.GONE);
-        if (mCallCard != null) mCallCard.hideCallCardElements();
+        if (mCallCard != null) {
+            mCallCard.setVisibility(View.GONE);
+            // TODO: try removing this.
+            mCallCard.hideCallCardElements();
+        }
 
         mOtaWidgetData.otaTitle.setText(R.string.ota_title_activate);
         mOtaWidgetData.otaTextActivate.setVisibility(View.GONE);
@@ -1178,12 +1171,12 @@ public void otaShowProperScreen() {
         if ((mInCallScreen != null) && mInCallScreen.isForegroundActivity()) {
             if (DBG) log("otaShowProperScreen(): InCallScreen in foreground, currentstate = "
                     + mApplication.cdmaOtaScreenState.otaScreenState);
-            if (mInCallPanel != null) {
-                mInCallPanel.setVisibility(View.GONE);
-            }
             if (mInCallTouchUi != null) {
                 mInCallTouchUi.setVisibility(View.GONE);
             }
+            if (mCallCard != null) {
+                mCallCard.setVisibility(View.GONE);
+            }
             if (mApplication.cdmaOtaScreenState.otaScreenState
                     == CdmaOtaScreenState.OtaScreenState.OTA_STATUS_ACTIVATION) {
                 otaShowActivateScreen();
@@ -1458,9 +1451,11 @@ public void cleanOtaScreen(boolean disableSpeaker) {
         mApplication.cdmaOtaInCallScreenUiState.state = State.UNDEFINED;
 
         if (mInteractive && (mOtaWidgetData != null)) {
-            if (mInCallPanel != null) mInCallPanel.setVisibility(View.VISIBLE);
             if (mInCallTouchUi != null) mInCallTouchUi.setVisibility(View.VISIBLE);
-            if (mCallCard != null) mCallCard.hideCallCardElements();
+            if (mCallCard != null) {
+                mCallCard.setVisibility(View.VISIBLE);
+                mCallCard.hideCallCardElements();
+            }
 
             // Free resources from the DTMFTwelveKeyDialer instance we created
             // in initOtaInCallScreen().
@@ -1572,16 +1567,18 @@ public CdmaOtaScreenState() {
             otaScreenState = OtaScreenState.OTA_STATUS_UNDEFINED;
         }
 
-        // PendingIntent used to report an OTASP result status code back
-        // to our caller.
-        //
-        // Our caller (presumably SetupWizard) creates this PendingIntent,
-        // pointing back at itself, and passes it along as an extra with the
-        // ACTION_PERFORM_CDMA_PROVISIONING intent.  Then, when there's an
-        // OTASP result to report, we send that PendingIntent back, adding an
-        // extra called EXTRA_OTASP_RESULT_CODE to indicate the result.
-        //
-        // Possible result values are the OTASP_RESULT_* constants.
+        /**
+         * {@link PendingIntent} used to report an OTASP result status code
+         * back to our caller. Can be null.
+         *
+         * Our caller (presumably SetupWizard) may create this PendingIntent,
+         * pointing back at itself, and passes it along as an extra with the
+         * ACTION_PERFORM_CDMA_PROVISIONING intent.  Then, when there's an
+         * OTASP result to report, we send that PendingIntent back, adding an
+         * extra called EXTRA_OTASP_RESULT_CODE to indicate the result.
+         *
+         * Possible result values are the OTASP_RESULT_* constants.
+         */
         public PendingIntent otaspResultCodePendingIntent;
     }
 
diff --git a/src/com/android/phone/OutgoingCallBroadcaster.java b/src/com/android/phone/OutgoingCallBroadcaster.java
index 0d7d1e67f..fcf502a3d 100644
--- a/src/com/android/phone/OutgoingCallBroadcaster.java
+++ b/src/com/android/phone/OutgoingCallBroadcaster.java
@@ -26,13 +26,17 @@
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.os.SystemProperties;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.View;
+import android.widget.ProgressBar;
 
 import com.android.internal.telephony.Phone;
-
+import com.android.internal.telephony.TelephonyCapabilities;
 
 /**
  * OutgoingCallBroadcaster receives CALL and CALL_PRIVILEGED Intents, and
@@ -77,11 +81,32 @@ public class OutgoingCallBroadcaster extends Activity
      * TODO: Keep in sync with the string defined in TwelveKeyDialer.java in Contacts app
      * until this is replaced with the ITelephony API.
      */
-    public static final String EXTRA_SEND_EMPTY_FLASH = "com.android.phone.extra.SEND_EMPTY_FLASH";
+    public static final String EXTRA_SEND_EMPTY_FLASH =
+            "com.android.phone.extra.SEND_EMPTY_FLASH";
 
     // Dialog IDs
     private static final int DIALOG_NOT_VOICE_CAPABLE = 1;
 
+    /** Note message codes < 100 are reserved for the PhoneApp. */
+    private static final int EVENT_OUTGOING_CALL_TIMEOUT = 101;
+    private static final int OUTGOING_CALL_TIMEOUT_THRESHOLD = 2000; // msec
+    /**
+     * ProgressBar object with "spinner" style, which will be shown if we take more than
+     * {@link #EVENT_OUTGOING_CALL_TIMEOUT} msec to handle the incoming Intent.
+     */
+    private ProgressBar mWaitingSpinner;
+    private final Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            if (msg.what == EVENT_OUTGOING_CALL_TIMEOUT) {
+                Log.i(TAG, "Outgoing call takes too long. Showing the spinner.");
+                mWaitingSpinner.setVisibility(View.VISIBLE);
+            } else {
+                Log.wtf(TAG, "Unknown message id: " + msg.what);
+            }
+        }
+    };
+
     /**
      * OutgoingCallReceiver finishes NEW_OUTGOING_CALL broadcasts, starting
      * the InCallScreen if the broadcast has not been canceled, possibly with
@@ -90,8 +115,11 @@ public class OutgoingCallBroadcaster extends Activity
     public class OutgoingCallReceiver extends BroadcastReceiver {
         private static final String TAG = "OutgoingCallReceiver";
 
+        @Override
         public void onReceive(Context context, Intent intent) {
+            mHandler.removeMessages(EVENT_OUTGOING_CALL_TIMEOUT);
             doReceive(context, intent);
+            if (DBG) Log.v(TAG, "OutgoingCallReceiver is going to finish the Activity itself.");
             finish();
         }
 
@@ -258,54 +286,33 @@ private void startSipCallOptionHandler(Context context, Intent intent,
         selectPhoneIntent.setClass(context, SipCallOptionHandler.class);
         selectPhoneIntent.putExtra(EXTRA_NEW_CALL_INTENT, newIntent);
         selectPhoneIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        if (DBG) Log.v(TAG, "startSipCallOptionHandler(): " +
-                "calling startActivity: " + selectPhoneIntent);
+        if (DBG) {
+            Log.v(TAG, "startSipCallOptionHandler(): " +
+                    "calling startActivity: " + selectPhoneIntent);
+        }
         context.startActivity(selectPhoneIntent);
         // ...and see SipCallOptionHandler.onCreate() for the next step of the sequence.
     }
 
+    /**
+     * This method is the single point of entry for the CALL intent, which is used (by built-in
+     * apps like Contacts / Dialer, as well as 3rd-party apps) to initiate an outgoing voice call.
+     *
+     *
+     */
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
-
-        // This method is the single point of entry for the CALL intent,
-        // which is used (by built-in apps like Contacts / Dialer, as well
-        // as 3rd-party apps) to initiate an outgoing voice call.
-        //
-        // We also handle two related intents which are only used internally:
-        // CALL_PRIVILEGED (which can come from built-in apps like contacts /
-        // voice dialer / bluetooth), and CALL_EMERGENCY (from the
-        // EmergencyDialer that's reachable from the lockscreen.)
-        //
-        // The exact behavior depends on the intent's data:
-        //
-        // - The most typical is a tel: URI, which we handle by starting the
-        //   NEW_OUTGOING_CALL broadcast.  That broadcast eventually triggeres
-        //   the sequence OutgoingCallReceiver -> SipCallOptionHandler ->
-        //   InCallScreen.
-        //
-        // - Or, with a sip: URI we skip the NEW_OUTGOING_CALL broadcast and
-        //   go directly to SipCallOptionHandler, which then leads to the
-        //   InCallScreen.
-        //
-        // - voicemail: URIs take the same path as regular tel: URIs.
-        //
-        // Other special cases:
-        //
-        // - Outgoing calls are totally disallowed on non-voice-capable
-        //   devices (see handleNonVoiceCapable()).
-        //
-        // - A CALL intent with the EXTRA_SEND_EMPTY_FLASH extra (and
-        //   presumably no data at all) means "send an empty flash" (which
-        //   is only meaningful on CDMA devices while a call is already
-        //   active.)
+        setContentView(R.layout.outgoing_call_broadcaster);
+        mWaitingSpinner = (ProgressBar) findViewById(R.id.spinner);
 
         Intent intent = getIntent();
-        final Configuration configuration = getResources().getConfiguration();
-
-        if (DBG) Log.v(TAG, "onCreate: this = " + this + ", icicle = " + icicle);
-        if (DBG) Log.v(TAG, " - getIntent() = " + intent);
-        if (DBG) Log.v(TAG, " - configuration = " + configuration);
+        if (DBG) {
+            final Configuration configuration = getResources().getConfiguration();
+            Log.v(TAG, "onCreate: this = " + this + ", icicle = " + icicle);
+            Log.v(TAG, " - getIntent() = " + intent);
+            Log.v(TAG, " - configuration = " + configuration);
+        }
 
         if (icicle != null) {
             // A non-null icicle means that this activity is being
@@ -334,11 +341,57 @@ protected void onCreate(Bundle icicle) {
             return;
         }
 
+        processIntent(intent);
+
+        // isFinishing() return false when 1. broadcast is still ongoing, or 2. dialog is being
+        // shown. Otherwise finish() is called inside processIntent(), is isFinishing() here will
+        // return true.
+        if (DBG) Log.v(TAG, "At the end of onCreate(). isFinishing(): " + isFinishing());
+    }
+
+    /**
+     * Interprets a given Intent and starts something relevant to the Intent.
+     *
+     * This method will handle three kinds of actions:
+     *
+     * - CALL (action for usual outgoing voice calls)
+     * - CALL_PRIVILEGED (can come from built-in apps like contacts / voice dialer / bluetooth)
+     * - CALL_EMERGENCY (from the EmergencyDialer that's reachable from the lockscreen.)
+     *
+     * The exact behavior depends on the intent's data:
+     *
+     * - The most typical is a tel: URI, which we handle by starting the
+     *   NEW_OUTGOING_CALL broadcast.  That broadcast eventually triggers
+     *   the sequence OutgoingCallReceiver -> SipCallOptionHandler ->
+     *   InCallScreen.
+     *
+     * - Or, with a sip: URI we skip the NEW_OUTGOING_CALL broadcast and
+     *   go directly to SipCallOptionHandler, which then leads to the
+     *   InCallScreen.
+     *
+     * - voicemail: URIs take the same path as regular tel: URIs.
+     *
+     * Other special cases:
+     *
+     * - Outgoing calls are totally disallowed on non-voice-capable
+     *   devices (see handleNonVoiceCapable()).
+     *
+     * - A CALL intent with the EXTRA_SEND_EMPTY_FLASH extra (and
+     *   presumably no data at all) means "send an empty flash" (which
+     *   is only meaningful on CDMA devices while a call is already
+     *   active.)
+     *
+     */
+    private void processIntent(Intent intent) {
+        if (DBG) {
+            Log.v(TAG, "processIntent() = " + intent + ", thread: " + Thread.currentThread());
+        }
+        final Configuration configuration = getResources().getConfiguration();
+
         // Outgoing phone calls are only allowed on "voice-capable" devices.
         if (!PhoneApp.sVoiceCapable) {
+            Log.i(TAG, "This device is detected as non-voice-capable device.");
             handleNonVoiceCapable(intent);
-            // No need to finish() here; handleNonVoiceCapable() will do
-            // that if necessary.
             return;
         }
 
@@ -351,6 +404,8 @@ protected void onCreate(Bundle icicle) {
                 number = PhoneNumberUtils.convertKeypadLettersToDigits(number);
                 number = PhoneNumberUtils.stripSeparators(number);
             }
+        } else {
+            Log.w(TAG, "The number obtained from Intent is null.");
         }
 
         // If true, this flag will indicate that the current call is a special kind
@@ -385,9 +440,9 @@ protected void onCreate(Bundle icicle) {
         final boolean isPotentialEmergencyNumber =
                 (number != null) && PhoneNumberUtils.isPotentialLocalEmergencyNumber(number, this);
         if (VDBG) {
-            Log.v(TAG, "- Checking restrictions for number '" + number + "':");
-            Log.v(TAG, "    isExactEmergencyNumber     = " + isExactEmergencyNumber);
-            Log.v(TAG, "    isPotentialEmergencyNumber = " + isPotentialEmergencyNumber);
+            Log.v(TAG, " - Checking restrictions for number '" + number + "':");
+            Log.v(TAG, "     isExactEmergencyNumber     = " + isExactEmergencyNumber);
+            Log.v(TAG, "     isPotentialEmergencyNumber = " + isPotentialEmergencyNumber);
         }
 
         /* Change CALL_PRIVILEGED into CALL or CALL_EMERGENCY as needed. */
@@ -398,10 +453,14 @@ protected void onCreate(Bundle icicle) {
             // that's *potentially* an emergency number can safely be promoted to
             // CALL_EMERGENCY (since we *should* allow you to dial "91112345" from
             // the dialer if you really want to.)
-            action = isPotentialEmergencyNumber
-                    ? Intent.ACTION_CALL_EMERGENCY
-                    : Intent.ACTION_CALL;
-            if (DBG) Log.v(TAG, "- updating action from CALL_PRIVILEGED to " + action);
+            if (isPotentialEmergencyNumber) {
+                Log.i(TAG, "ACTION_CALL_PRIVILEGED is used while the number is a potential"
+                        + " emergency number. Use ACTION_CALL_EMERGENCY as an action instead.");
+                action = Intent.ACTION_CALL_EMERGENCY;
+            } else {
+                action = Intent.ACTION_CALL;
+            }
+            if (DBG) Log.v(TAG, " - updating action from CALL_PRIVILEGED to " + action);
             intent.setAction(action);
         }
 
@@ -440,13 +499,14 @@ protected void onCreate(Bundle icicle) {
             // emergency number.
             if (!isPotentialEmergencyNumber) {
                 Log.w(TAG, "Cannot call non-potential-emergency number " + number
-                        + " with EMERGENCY_CALL Intent " + intent + ".");
+                        + " with EMERGENCY_CALL Intent " + intent + "."
+                        + " Finish the Activity immediately.");
                 finish();
                 return;
             }
             callNow = true;
         } else {
-            Log.e(TAG, "Unhandled Intent " + intent + ".");
+            Log.e(TAG, "Unhandled Intent " + intent + ". Finish the Activity immediately.");
             finish();
             return;
         }
@@ -462,10 +522,10 @@ protected void onCreate(Bundle icicle) {
         // as well.
         PhoneApp.getInstance().wakeUpScreen();
 
-        /* If number is null, we're probably trying to call a non-existent voicemail number,
-         * send an empty flash or something else is fishy.  Whatever the problem, there's no
-         * number, so there's no point in allowing apps to modify the number. */
-        if (number == null || TextUtils.isEmpty(number)) {
+        // If number is null, we're probably trying to call a non-existent voicemail number,
+        // send an empty flash or something else is fishy.  Whatever the problem, there's no
+        // number, so there's no point in allowing apps to modify the number.
+        if (TextUtils.isEmpty(number)) {
             if (intent.getBooleanExtra(EXTRA_SEND_EMPTY_FLASH, false)) {
                 Log.i(TAG, "onCreate: SEND_EMPTY_FLASH...");
                 PhoneUtils.sendEmptyFlash(PhoneApp.getPhone());
@@ -482,7 +542,7 @@ protected void onCreate(Bundle icicle) {
             // that 3rd parties aren't allowed to intercept or affect in any way.
             // So initiate the outgoing call immediately.
 
-            if (DBG) Log.v(TAG, "onCreate(): callNow case! Calling placeCall(): " + intent);
+            Log.i(TAG, "onCreate(): callNow case! Calling placeCall(): " + intent);
 
             // Initiate the outgoing call, and simultaneously launch the
             // InCallScreen to display the in-call UI:
@@ -496,6 +556,17 @@ protected void onCreate(Bundle icicle) {
             // EXTRA_ALREADY_CALLED extra.)
         }
 
+        // Remember the call origin so that users will be able to see an appropriate screen
+        // after the phone call. This should affect both phone calls and SIP calls.
+        final String callOrigin = intent.getStringExtra(PhoneApp.EXTRA_CALL_ORIGIN);
+        if (callOrigin != null) {
+            if (DBG) Log.v(TAG, " - Call origin is passed (" + callOrigin + ")");
+            PhoneApp.getInstance().setLatestActiveCallOrigin(callOrigin);
+        } else {
+            if (DBG) Log.v(TAG, " - Call origin is not passed. Reset current one.");
+            PhoneApp.getInstance().resetLatestActiveCallOrigin();
+        }
+
         // For now, SIP calls will be processed directly without a
         // NEW_OUTGOING_CALL broadcast.
         //
@@ -508,8 +579,8 @@ protected void onCreate(Bundle icicle) {
         // a plain address, whether it could be a tel: URI, etc.)
         Uri uri = intent.getData();
         String scheme = uri.getScheme();
-        if (Constants.SCHEME_SIP.equals(scheme)
-                || PhoneNumberUtils.isUriNumber(number)) {
+        if (Constants.SCHEME_SIP.equals(scheme) || PhoneNumberUtils.isUriNumber(number)) {
+            Log.i(TAG, "The requested number was detected as SIP call.");
             startSipCallOptionHandler(this, intent, uri, number);
             finish();
             return;
@@ -519,15 +590,6 @@ protected void onCreate(Bundle icicle) {
             // case here too (most likely by just doing nothing at all.)
         }
 
-        final String callOrigin = intent.getStringExtra(PhoneApp.EXTRA_CALL_ORIGIN);
-        if (callOrigin != null) {
-            if (DBG) Log.v(TAG, "Call origin is passed (" + callOrigin + ")");
-            PhoneApp.getInstance().setLatestActiveCallOrigin(callOrigin);
-        } else {
-            if (DBG) Log.v(TAG, "Call origin is not passed. Reset current one.");
-            PhoneApp.getInstance().setLatestActiveCallOrigin(null);
-        }
-
         Intent broadcastIntent = new Intent(Intent.ACTION_NEW_OUTGOING_CALL);
         if (number != null) {
             broadcastIntent.putExtra(Intent.EXTRA_PHONE_NUMBER, number);
@@ -535,12 +597,22 @@ protected void onCreate(Bundle icicle) {
         PhoneUtils.checkAndCopyPhoneProviderExtras(intent, broadcastIntent);
         broadcastIntent.putExtra(EXTRA_ALREADY_CALLED, callNow);
         broadcastIntent.putExtra(EXTRA_ORIGINAL_URI, uri.toString());
-        if (DBG) Log.v(TAG, "Broadcasting intent: " + broadcastIntent + ".");
+        // Need to raise foreground in-call UI as soon as possible while allowing 3rd party app
+        // to intercept the outgoing call.
+        broadcastIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        if (DBG) Log.v(TAG, " - Broadcasting intent: " + broadcastIntent + ".");
+
+        // Set a timer so that we can prepare for unexpected delay introduced by the broadcast.
+        // If it takes too much time, the timer will show "waiting" spinner.
+        // This message will be removed when OutgoingCallReceiver#onReceive() is called before the
+        // timeout.
+        mHandler.sendEmptyMessageDelayed(EVENT_OUTGOING_CALL_TIMEOUT,
+                OUTGOING_CALL_TIMEOUT_THRESHOLD);
         sendOrderedBroadcast(broadcastIntent, PERMISSION, new OutgoingCallReceiver(),
-                             null,  // scheduler
-                             Activity.RESULT_OK,  // initialCode
-                             number,  // initialData: initial value for the result data
-                             null);  // initialExtras
+                null,  // scheduler
+                Activity.RESULT_OK,  // initialCode
+                number,  // initialData: initial value for the result data
+                null);  // initialExtras
     }
 
     @Override
@@ -609,7 +681,7 @@ protected Dialog onCreateDialog(int id) {
             case DIALOG_NOT_VOICE_CAPABLE:
                 dialog = new AlertDialog.Builder(this)
                         .setTitle(R.string.not_voice_capable)
-                        .setIcon(android.R.drawable.ic_dialog_alert)
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
                         .setPositiveButton(android.R.string.ok, this)
                         .setOnCancelListener(this)
                         .create();
@@ -622,23 +694,27 @@ protected Dialog onCreateDialog(int id) {
         return dialog;
     }
 
-    // DialogInterface.OnClickListener implementation
+    /** DialogInterface.OnClickListener implementation */
+    @Override
     public void onClick(DialogInterface dialog, int id) {
         // DIALOG_NOT_VOICE_CAPABLE is the only dialog we ever use (so far
         // at least), and its only button is "OK".
         finish();
     }
 
-    // DialogInterface.OnCancelListener implementation
+    /** DialogInterface.OnCancelListener implementation */
+    @Override
     public void onCancel(DialogInterface dialog) {
         // DIALOG_NOT_VOICE_CAPABLE is the only dialog we ever use (so far
         // at least), and canceling it is just like hitting "OK".
         finish();
     }
 
-    // Implement onConfigurationChanged() purely for debugging purposes,
-    // to make sure that the android:configChanges element in our manifest
-    // is working properly.
+    /**
+     * Implement onConfigurationChanged() purely for debugging purposes,
+     * to make sure that the android:configChanges element in our manifest
+     * is working properly.
+     */
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
diff --git a/src/com/android/phone/PhoneApp.java b/src/com/android/phone/PhoneApp.java
index e5191023d..5727005aa 100644
--- a/src/com/android/phone/PhoneApp.java
+++ b/src/com/android/phone/PhoneApp.java
@@ -19,18 +19,21 @@
 import android.app.Activity;
 import android.app.Application;
 import android.app.KeyguardManager;
+import android.app.PendingIntent;
 import android.app.ProgressDialog;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothHeadset;
 import android.bluetooth.BluetoothProfile;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.media.AudioManager;
+import android.media.AudioSystem;
 import android.net.Uri;
 import android.os.AsyncResult;
 import android.os.Binder;
@@ -44,6 +47,7 @@
 import android.os.ServiceManager;
 import android.os.SystemClock;
 import android.os.SystemProperties;
+import android.os.UpdateLock;
 import android.preference.PreferenceManager;
 import android.provider.Settings.System;
 import android.telephony.ServiceState;
@@ -57,6 +61,7 @@
 import com.android.internal.telephony.MmiCode;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
+import com.android.internal.telephony.TelephonyCapabilities;
 import com.android.internal.telephony.TelephonyIntents;
 import com.android.internal.telephony.cdma.TtyIntent;
 import com.android.phone.OtaUtils.CdmaOtaScreenState;
@@ -111,6 +116,8 @@ public class PhoneApp extends Application implements AccelerometerListener.Orien
     // Don't use message codes larger than 99 here; those are reserved for
     // the individual Activities of the Phone UI.
 
+    private String mVoiceQualityParam;
+
     /**
      * Allowable values for the poke lock code (timeout between a user activity and the
      * going to sleep), please refer to {@link com.android.server.PowerManagerService}
@@ -137,6 +144,28 @@ public enum WakeState {
         FULL
     }
 
+    /**
+     * Intent Action used for hanging up the current call from Notification bar. This will
+     * choose first ringing call, first active call, or first background call (typically in
+     * HOLDING state).
+     */
+    public static final String ACTION_HANG_UP_ONGOING_CALL =
+            "com.android.phone.ACTION_HANG_UP_ONGOING_CALL";
+
+    /**
+     * Intent Action used for making a phone call from Notification bar.
+     * This is for missed call notifications.
+     */
+    public static final String ACTION_CALL_BACK_FROM_NOTIFICATION =
+            "com.android.phone.ACTION_CALL_BACK_FROM_NOTIFICATION";
+
+    /**
+     * Intent Action used for sending a SMS from notification bar.
+     * This is for missed call notifications.
+     */
+    public static final String ACTION_SEND_SMS_FROM_NOTIFICATION =
+            "com.android.phone.ACTION_SEND_SMS_FROM_NOTIFICATION";
+
     private static PhoneApp sMe;
 
     // A few important fields we expose to the rest of the package
@@ -144,6 +173,7 @@ public enum WakeState {
     Phone phone;
     CallController callController;
     InCallUiState inCallUiState;
+    CallerInfoCache callerInfoCache;
     CallNotifier notifier;
     NotificationMgr notificationMgr;
     Ringer ringer;
@@ -186,12 +216,26 @@ public enum WakeState {
     private boolean mBeginningCall;
 
     // Last phone state seen by updatePhoneState()
-    Phone.State mLastPhoneState = Phone.State.IDLE;
+    private Phone.State mLastPhoneState = Phone.State.IDLE;
 
     private WakeState mWakeState = WakeState.SLEEP;
+
+    /**
+     * Timeout setting used by PokeLock.
+     *
+     * This variable won't be effective when proximity sensor is available in the device.
+     *
+     * @see ScreenTimeoutDuration
+     */
     private ScreenTimeoutDuration mScreenTimeoutDuration = ScreenTimeoutDuration.DEFAULT;
+    /**
+     * Used to set/unset {@link LocalPowerManager#POKE_LOCK_IGNORE_TOUCH_EVENTS} toward PokeLock.
+     *
+     * This variable won't be effective when proximity sensor is available in the device.
+     */
     private boolean mIgnoreTouchUserActivity = false;
-    private IBinder mPokeLockToken = new Binder();
+    private final IBinder mPokeLockToken = new Binder();
+
     private IPowerManager mPowerManagerService;
     private PowerManager.WakeLock mWakeLock;
     private PowerManager.WakeLock mPartialWakeLock;
@@ -200,6 +244,8 @@ public enum WakeState {
     private AccelerometerListener mAccelerometerListener;
     private int mOrientation = AccelerometerListener.ORIENTATION_UNKNOWN;
 
+    private UpdateLock mUpdateLock;
+
     // Broadcast receiver for various intent broadcasts (see onCreate())
     private final BroadcastReceiver mReceiver = new PhoneAppBroadcastReceiver();
 
@@ -429,6 +475,10 @@ public void onCreate() {
             // Get the default phone
             phone = PhoneFactory.getDefaultPhone();
 
+            // Start TelephonyDebugService After the default phone is created.
+            Intent intent = new Intent(this, TelephonyDebugService.class);
+            startService(intent);
+
             mCM = CallManager.getInstance();
             mCM.registerPhone(phone);
 
@@ -463,7 +513,8 @@ public void onCreate() {
             // before registering for phone state changes
             PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
             mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK
-                    | PowerManager.ACQUIRE_CAUSES_WAKEUP,
+                    | PowerManager.ACQUIRE_CAUSES_WAKEUP
+                    | PowerManager.ON_AFTER_RELEASE,
                     LOG_TAG);
             // lock used to keep the processor awake, when we don't care for the display.
             mPartialWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK
@@ -488,6 +539,12 @@ public void onCreate() {
             mPowerManagerService = IPowerManager.Stub.asInterface(
                     ServiceManager.getService("power"));
 
+            // Get UpdateLock to suppress system-update related events (e.g. dialog show-up)
+            // during phone calls.
+            mUpdateLock = new UpdateLock("phone");
+
+            if (DBG) Log.d(LOG_TAG, "onCreate: mUpdateLock: " + mUpdateLock);
+
             // Create the CallController singleton, which is the interface
             // to the telephony layer for user-initiated telephony functionality
             // (like making outgoing calls.)
@@ -496,6 +553,12 @@ public void onCreate() {
             // keep track of some "persistent state" of the in-call UI.
             inCallUiState = InCallUiState.init(this);
 
+            // Create the CallerInfoCache singleton, which remembers custom ring tone and
+            // send-to-voicemail settings.
+            //
+            // The asynchronous caching will start just after this call.
+            callerInfoCache = CallerInfoCache.init(this);
+
             // Create the CallNotifer singleton, which handles
             // asynchronous events from the telephony layer (like
             // launching the incoming-call UI when an incoming call comes
@@ -518,6 +581,8 @@ public void onCreate() {
             // Read platform settings for TTY feature
             mTtyEnabled = getResources().getBoolean(R.bool.tty_enabled);
 
+            mVoiceQualityParam = getResources().getString(R.string.voice_quality_param);
+
             // Register for misc other intent broadcasts.
             IntentFilter intentFilter =
                     new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED);
@@ -526,11 +591,13 @@ public void onCreate() {
             intentFilter.addAction(TelephonyIntents.ACTION_ANY_DATA_CONNECTION_STATE_CHANGED);
             intentFilter.addAction(Intent.ACTION_HEADSET_PLUG);
             intentFilter.addAction(Intent.ACTION_DOCK_EVENT);
-            intentFilter.addAction(Intent.ACTION_BATTERY_LOW);
             intentFilter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
             intentFilter.addAction(TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
             intentFilter.addAction(TelephonyIntents.ACTION_SERVICE_STATE_CHANGED);
             intentFilter.addAction(TelephonyIntents.ACTION_EMERGENCY_CALLBACK_MODE_CHANGED);
+            intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
+            intentFilter.addAction(Intent.ACTION_SCREEN_ON);
+
             if (mTtyEnabled) {
                 intentFilter.addAction(TtyIntent.TTY_PREFERRED_MODE_CHANGE_ACTION);
             }
@@ -542,13 +609,18 @@ public void onCreate() {
             // we get these intents *before* the media player.)
             IntentFilter mediaButtonIntentFilter =
                     new IntentFilter(Intent.ACTION_MEDIA_BUTTON);
-            //
+            // TODO verify the independent priority doesn't need to be handled thanks to the
+            //  private intent handler registration
             // Make sure we're higher priority than the media player's
             // MediaButtonIntentReceiver (which currently has the default
             // priority of zero; see apps/Music/AndroidManifest.xml.)
             mediaButtonIntentFilter.setPriority(1);
             //
             registerReceiver(mMediaButtonReceiver, mediaButtonIntentFilter);
+            // register the component so it gets priority for calls
+            AudioManager am = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+            am.registerMediaButtonEventReceiverForCalls(new ComponentName(this.getPackageName(),
+                    MediaButtonBroadcastReceiver.class.getName()));
 
             //set the default values for the preferences in the phone.
             PreferenceManager.setDefaultValues(this, R.xml.network_setting, false);
@@ -675,10 +747,32 @@ BluetoothHandsfree getBluetoothHandsfree() {
         return intent;
     }
 
-    // TODO(InCallScreen redesign): This should be made private once
-    // we fix PhoneInterfaceManager.java to *not* manually launch
-    // the InCallScreen from its call() method.
-    static String getCallScreenClassName() {
+    /**
+     * Returns PendingIntent for hanging up ongoing phone call. This will typically be used from
+     * Notification context.
+     */
+    /* package */ static PendingIntent createHangUpOngoingCallPendingIntent(Context context) {
+        Intent intent = new Intent(PhoneApp.ACTION_HANG_UP_ONGOING_CALL, null,
+                context, NotificationBroadcastReceiver.class);
+        return PendingIntent.getBroadcast(context, 0, intent, 0);
+    }
+
+    /* package */ static PendingIntent getCallBackPendingIntent(Context context, String number) {
+        Intent intent = new Intent(ACTION_CALL_BACK_FROM_NOTIFICATION,
+                Uri.fromParts(Constants.SCHEME_TEL, number, null),
+                context, NotificationBroadcastReceiver.class);
+        return PendingIntent.getBroadcast(context, 0, intent, 0);
+    }
+
+    /* package */ static PendingIntent getSendSmsFromNotificationPendingIntent(
+            Context context, String number) {
+        Intent intent = new Intent(ACTION_SEND_SMS_FROM_NOTIFICATION,
+                Uri.fromParts(Constants.SCHEME_SMSTO, number, null),
+                context, NotificationBroadcastReceiver.class);
+        return PendingIntent.getBroadcast(context, 0, intent, 0);
+    }
+
+    private static String getCallScreenClassName() {
         return InCallScreen.class.getName();
     }
 
@@ -740,6 +834,30 @@ boolean isShowingCallScreen() {
         return mInCallScreen.isForegroundActivity();
     }
 
+    /**
+     * @return true if the in-call UI is running as the foreground activity, or,
+     * it went to background due to screen being turned off. This might be useful
+     * to determine if the in-call screen went to background because of other
+     * activities, or its proximity sensor state or manual power-button press.
+     *
+     * Here are some examples.
+     *
+     * - If you want to know if the activity is in foreground or screen is turned off
+     *   from the in-call UI (i.e. though it is not "foreground" anymore it will become
+     *   so after screen being turned on), check
+     *   {@link #isShowingCallScreenForProximity()} is true or not.
+     *   {@link #updateProximitySensorMode(com.android.internal.telephony.Phone.State)} is
+     *   doing this.
+     *
+     * - If you want to know if the activity is not in foreground just because screen
+     *   is turned off (not due to other activity's interference), check
+     *   {@link #isShowingCallScreen()} is false *and* {@link #isShowingCallScreenForProximity()}
+     *   is true. InCallScreen#onDisconnect() is doing this check.
+     *
+     * @see #isShowingCallScreen()
+     *
+     * TODO: come up with better naming..
+     */
     boolean isShowingCallScreenForProximity() {
         if (mInCallScreen == null) return false;
         return mInCallScreen.isForegroundActivityForProximity();
@@ -855,30 +973,29 @@ ProgressDialog getPUKEntryProgressDialog() {
     /**
      * Controls how quickly the screen times out.
      *
+     * This is no-op when the device supports proximity sensor.
+     *
      * The poke lock controls how long it takes before the screen powers
      * down, and therefore has no immediate effect when the current
      * WakeState (see {@link PhoneApp#requestWakeState}) is FULL.
      * If we're in a state where the screen *is* allowed to turn off,
      * though, the poke lock will determine the timeout interval (long or
      * short).
-     *
-     * @param shortPokeLock tells the device the timeout duration to use
-     * before going to sleep
-     * {@link com.android.server.PowerManagerService#SHORT_KEYLIGHT_DELAY}.
      */
     /* package */ void setScreenTimeout(ScreenTimeoutDuration duration) {
         if (VDBG) Log.d(LOG_TAG, "setScreenTimeout(" + duration + ")...");
 
+        // stick with default timeout if we are using the proximity sensor
+        if (proximitySensorModeEnabled()) {
+            return;
+        }
+
         // make sure we don't set the poke lock repeatedly so that we
         // avoid triggering the userActivity calls in
         // PowerManagerService.setPokeLock().
         if (duration == mScreenTimeoutDuration) {
             return;
         }
-        // stick with default timeout if we are using the proximity sensor
-        if (proximitySensorModeEnabled()) {
-            return;
-        }
         mScreenTimeoutDuration = duration;
         updatePokeLock();
     }
@@ -889,6 +1006,13 @@ ProgressDialog getPUKEntryProgressDialog() {
      * current "ignore user activity on touch" flag.
      */
     private void updatePokeLock() {
+        // Caller must take care of the check. This block is purely for safety.
+        if (proximitySensorModeEnabled()) {
+            Log.wtf(LOG_TAG, "PokeLock should not be used when proximity sensor is available on"
+                    + " the device.");
+            return;
+        }
+
         // This is kind of convoluted, but the basic thing to remember is
         // that the poke lock just sends a message to the screen to tell
         // it to stay on for a while.
@@ -1104,6 +1228,8 @@ private void updatePokeLock() {
      * Sets or clears the flag that tells the PowerManager that touch
      * (and cheek) events should NOT be considered "user activity".
      *
+     * This method is no-op when proximity sensor is available on the device.
+     *
      * Since the in-call UI is totally insensitive to touch in most
      * states, we set this flag whenever the InCallScreen is in the
      * foreground.  (Otherwise, repeated unintentional touches could
@@ -1115,6 +1241,11 @@ private void updatePokeLock() {
      */
     /* package */ void setIgnoreTouchUserActivity(boolean ignore) {
         if (VDBG) Log.d(LOG_TAG, "setIgnoreTouchUserActivity(" + ignore + ")...");
+        // stick with default timeout if we are using the proximity sensor
+        if (proximitySensorModeEnabled()) {
+            return;
+        }
+
         mIgnoreTouchUserActivity = ignore;
         updatePokeLock();
     }
@@ -1173,6 +1304,7 @@ private void updatePokeLock() {
      * 2) If a wired headset is connected
      * 3) if the speaker is ON
      * 4) If the slider is open(i.e. the hardkeyboard is *not* hidden)
+     * 5) If it was configured to stay on on Phone > Settings > Keep proximity sensor on
      *
      * @param state current state of the phone (see {@link Phone#State})
      */
@@ -1182,11 +1314,13 @@ private void updatePokeLock() {
         if (proximitySensorModeEnabled()) {
             synchronized (mProximityWakeLock) {
                 // turn proximity sensor off and turn screen on immediately if
-                // we are using a headset, the keyboard is open, or the device
+                // we are using a headset and is not configured to keep sensor on
+                // the keyboard is open, or the device
                 // is being held in a horizontal position.
-                boolean screenOnImmediately = (isHeadsetPlugged()
+                boolean keepOn = PhoneUtils.PhoneSettings.keepProximitySensorOn(this);
+                boolean screenOnImmediately = ((!keepOn && isHeadsetPlugged())
                             || PhoneUtils.isSpeakerOn(this)
-                            || ((mBtHandsfree != null) && mBtHandsfree.isAudioOn())
+                            || (!keepOn && (mBtHandsfree != null) && mBtHandsfree.isAudioOn())
                             || mIsHardKeyboardOpen);
 
                 // We do not keep the screen off when the user is outside in-call screen and we are
@@ -1196,6 +1330,19 @@ private void updatePokeLock() {
                         (mOrientation == AccelerometerListener.ORIENTATION_HORIZONTAL);
                 screenOnImmediately |= !isShowingCallScreenForProximity() && horizontal;
 
+                // We do not keep the screen off when dialpad is visible, we are horizontal, and
+                // the in-call screen is being shown.
+                // At that moment we're pretty sure users want to use it, instead of letting the
+                // proximity sensor turn off the screen by their hands.
+                boolean dialpadVisible = false;
+                if (mInCallScreen != null) {
+                    dialpadVisible =
+                            mInCallScreen.getUpdatedInCallControlState().dialpadEnabled
+                            && mInCallScreen.getUpdatedInCallControlState().dialpadVisible
+                            && isShowingCallScreen();
+                }
+                screenOnImmediately |= dialpadVisible && horizontal;
+
                 if (((state == Phone.State.OFFHOOK) || mBeginningCall) && !screenOnImmediately) {
                     // Phone is in use!  Arrange for the screen to turn off
                     // automatically when the sensor detects a close object.
@@ -1226,6 +1373,7 @@ private void updatePokeLock() {
         }
     }
 
+    @Override
     public void orientationChanged(int orientation) {
         mOrientation = orientation;
         updateProximitySensorMode(mCM.getState());
@@ -1233,12 +1381,41 @@ public void orientationChanged(int orientation) {
 
     /**
      * Notifies the phone app when the phone state changes.
-     * Currently used only for proximity sensor support.
+     *
+     * This method will updates various states inside Phone app (e.g. proximity sensor mode,
+     * accelerometer listener state, update-lock state, etc.)
      */
     /* package */ void updatePhoneState(Phone.State state) {
         if (state != mLastPhoneState) {
+            String voiceQualSetting = CallFeaturesSetting.getVoiceQuality();
+            if (mVoiceQualityParam != null && voiceQualSetting != null) {
+                AudioSystem.setParameters(mVoiceQualityParam + "=" + voiceQualSetting);
+            }
             mLastPhoneState = state;
             updateProximitySensorMode(state);
+
+            // Try to acquire or release UpdateLock.
+            //
+            // Watch out: we don't release the lock here when the screen is still in foreground.
+            // At that time InCallScreen will release it on onPause().
+            if (state != Phone.State.IDLE) {
+                // UpdateLock is a recursive lock, while we may get "acquire" request twice and
+                // "release" request once for a single call (RINGING + OFFHOOK and IDLE).
+                // We need to manually ensure the lock is just acquired once for each (and this
+                // will prevent other possible buggy situations too).
+                if (!mUpdateLock.isHeld()) {
+                    mUpdateLock.acquire();
+                }
+            } else {
+                if (!isShowingCallScreen()) {
+                    if (!mUpdateLock.isHeld()) {
+                        mUpdateLock.release();
+                    }
+                } else {
+                    // For this case InCallScreen will take care of the release() call.
+                }
+            }
+
             if (mAccelerometerListener != null) {
                 // use accelerometer to augment proximity sensor when in call
                 mOrientation = AccelerometerListener.ORIENTATION_UNKNOWN;
@@ -1261,6 +1438,13 @@ public void orientationChanged(int orientation) {
         return mLastPhoneState;
     }
 
+    /**
+     * Returns UpdateLock object.
+     */
+    /* package */ UpdateLock getUpdateLock() {
+        return mUpdateLock;
+    }
+
     /**
      * @return true if this device supports the "proximity sensor
      * auto-lock" feature while in-call (see updateProximitySensorMode()).
@@ -1468,9 +1652,6 @@ public void onReceive(Context context, Intent intent) {
                 if (VDBG) Log.d(LOG_TAG, "    name: " + intent.getStringExtra("name"));
                 mIsHeadsetPlugged = (intent.getIntExtra("state", 0) == 1);
                 mHandler.sendMessage(mHandler.obtainMessage(EVENT_WIRED_HEADSET_PLUG, 0));
-            } else if (action.equals(Intent.ACTION_BATTERY_LOW)) {
-                if (VDBG) Log.d(LOG_TAG, "mReceiver: ACTION_BATTERY_LOW");
-                notifier.sendBatteryLow();  // Play a warning tone if in-call
             } else if ((action.equals(TelephonyIntents.ACTION_SIM_STATE_CHANGED)) &&
                     (mPUKEntryActivity != null)) {
                 // if an attempt to un-PUK-lock the device was made, while we're
@@ -1516,6 +1697,18 @@ public void onReceive(Context context, Intent intent) {
                 if (ringerMode == AudioManager.RINGER_MODE_SILENT) {
                     notifier.silenceRinger();
                 }
+            } else if (action.equals(Intent.ACTION_SCREEN_OFF) ||
+                    action.equals(Intent.ACTION_SCREEN_ON)) {
+                  if (VDBG) Log.d(LOG_TAG, "mReceiver: ACTION_SCREEN_OFF / ACTION_SCREEN_ON");
+                  /*
+                   * Disable Accelerometer Listener while in-call and the screen is off.
+                   * This is done to ensure that power consumption is kept to a minimum
+                   * in such a scenario
+                   */
+                  if (mAccelerometerListener != null) {
+                      mAccelerometerListener.enable(mLastPhoneState == Phone.State.OFFHOOK &&
+                              action.equals(Intent.ACTION_SCREEN_ON));
+                  }
             }
         }
     }
@@ -1560,6 +1753,57 @@ public void onReceive(Context context, Intent intent) {
         }
     }
 
+    /**
+     * Accepts broadcast Intents which will be prepared by {@link NotificationMgr} and thus
+     * sent from framework's notification mechanism (which is outside Phone context).
+     * This should be visible from outside, but shouldn't be in "exported" state.
+     *
+     * TODO: If possible merge this into PhoneAppBroadcastReceiver.
+     */
+    public static class NotificationBroadcastReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            // TODO: use "if (VDBG)" here.
+            Log.d(LOG_TAG, "Broadcast from Notification: " + action);
+
+            if (action.equals(ACTION_HANG_UP_ONGOING_CALL)) {
+                PhoneUtils.hangup(PhoneApp.getInstance().mCM);
+            } else if (action.equals(ACTION_CALL_BACK_FROM_NOTIFICATION)) {
+                // Collapse the expanded notification and the notification item itself.
+                closeSystemDialogs(context);
+                clearMissedCallNotification(context);
+
+                Intent callIntent = new Intent(Intent.ACTION_CALL_PRIVILEGED, intent.getData());
+                callIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                        | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+                context.startActivity(callIntent);
+            } else if (action.equals(ACTION_SEND_SMS_FROM_NOTIFICATION)) {
+                // Collapse the expanded notification and the notification item itself.
+                closeSystemDialogs(context);
+                clearMissedCallNotification(context);
+
+                Intent smsIntent = new Intent(Intent.ACTION_SENDTO, intent.getData());
+                smsIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                context.startActivity(smsIntent);
+            } else {
+                Log.w(LOG_TAG, "Received hang-up request from notification,"
+                        + " but there's no call the system can hang up.");
+            }
+        }
+
+        private void closeSystemDialogs(Context context) {
+            Intent intent = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
+            context.sendBroadcast(intent);
+        }
+
+        private void clearMissedCallNotification(Context context) {
+            Intent clearIntent = new Intent(context, ClearMissedCallsService.class);
+            clearIntent.setAction(ClearMissedCallsService.ACTION_CLEAR_MISSED_CALLS);
+            context.startService(clearIntent);
+        }
+    }
+
     private void handleServiceStateChanged(Intent intent) {
         /**
          * This used to handle updating EriTextWidgetProvider this routine
@@ -1716,9 +1960,52 @@ private void handleSetTTYModeResponse(Message msg) {
     private static final String DEFAULT_CALL_ORIGIN_PACKAGE = "com.android.contacts";
     private static final String ALLOWED_EXTRA_CALL_ORIGIN =
             "com.android.contacts.activities.DialtactsActivity";
+    /**
+     * Used to determine if the preserved call origin is fresh enough.
+     */
+    private static final long CALL_ORIGIN_EXPIRATION_MILLIS = 30 * 1000;
 
     public void setLatestActiveCallOrigin(String callOrigin) {
         inCallUiState.latestActiveCallOrigin = callOrigin;
+        if (callOrigin != null) {
+            inCallUiState.latestActiveCallOriginTimeStamp = SystemClock.elapsedRealtime();
+        } else {
+            inCallUiState.latestActiveCallOriginTimeStamp = 0;
+        }
+    }
+
+    /**
+     * Reset call origin depending on its timestamp.
+     *
+     * See if the current call origin preserved by the app is fresh enough or not. If it is,
+     * previous call origin will be used as is. If not, call origin will be reset.
+     *
+     * This will be effective especially for 3rd party apps which want to bypass phone calls with
+     * their own telephone lines. In that case Phone app may finish the phone call once and make
+     * another for the external apps, which will drop call origin information in Intent.
+     * Even in that case we are sure the second phone call should be initiated just after the first
+     * phone call, so here we restore it from the previous information iff the second call is done
+     * fairly soon.
+     */
+    public void resetLatestActiveCallOrigin() {
+        final long callOriginTimestamp = inCallUiState.latestActiveCallOriginTimeStamp;
+        final long currentTimestamp = SystemClock.elapsedRealtime();
+        if (VDBG) {
+            Log.d(LOG_TAG, "currentTimeMillis: " + currentTimestamp
+                    + ", saved timestamp for call origin: " + callOriginTimestamp);
+        }
+        if (inCallUiState.latestActiveCallOriginTimeStamp > 0
+                && (currentTimestamp - callOriginTimestamp < CALL_ORIGIN_EXPIRATION_MILLIS)) {
+            if (VDBG) {
+                Log.d(LOG_TAG, "Resume previous call origin (" +
+                        inCallUiState.latestActiveCallOrigin + ")");
+            }
+            // Do nothing toward call origin itself but update the timestamp just in case.
+            inCallUiState.latestActiveCallOriginTimeStamp = currentTimestamp;
+        } else {
+            if (VDBG) Log.d(LOG_TAG, "Drop previous call origin and set the current one to null");
+            setLatestActiveCallOrigin(null);
+        }
     }
 
     /**
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ab6011c87..149f706cb 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -29,6 +29,7 @@
 import android.os.Message;
 import android.os.ServiceManager;
 import android.telephony.NeighboringCellInfo;
+import android.telephony.CellInfo;
 import android.telephony.ServiceState;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
@@ -57,6 +58,7 @@ public class PhoneInterfaceManager extends ITelephony.Stub {
     private static final int CMD_ANSWER_RINGING_CALL = 4;
     private static final int CMD_END_CALL = 5;  // not used yet
     private static final int CMD_SILENCE_RINGER = 6;
+    private static final int CMD_TOGGLE_LTE = 7; // not used yet
 
     /** The singleton instance. */
     private static PhoneInterfaceManager sInstance;
@@ -253,7 +255,7 @@ public void dial(String number) {
         }
 
         // PENDING: should we just silently fail if phone is offhook or ringing?
-        Phone.State state = mPhone.getState();
+        Phone.State state = mCM.getState();
         if (state != Phone.State.OFFHOOK && state != Phone.State.RINGING) {
             Intent  intent = new Intent(Intent.ACTION_DIAL, Uri.parse(url));
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -279,6 +281,27 @@ public void call(String number) {
         mApp.startActivity(intent);
     }
 
+    public void toggleLTE(boolean on) {
+        int network = -1;
+        if (getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE) {
+            if (on) {
+                network = Phone.NT_MODE_GLOBAL;
+            } else {
+                network = Phone.NT_MODE_CDMA;
+            }
+        } else if (getLteOnGsmMode() != 0) {
+            if (on) {
+                network = Phone.NT_MODE_LTE_GSM_WCDMA;
+            } else {
+                network = Phone.NT_MODE_WCDMA_PREF;
+            }
+        }
+        mPhone.setPreferredNetworkType(network,
+                mMainThreadHandler.obtainMessage(CMD_TOGGLE_LTE));
+        android.provider.Settings.Secure.putInt(mApp.getContentResolver(),
+                android.provider.Settings.Secure.PREFERRED_NETWORK_MODE, network);
+    }
+
     private boolean showCallScreenInternal(boolean specifyInitialDialpadState,
                                            boolean initialDialpadState) {
         if (!PhoneApp.sVoiceCapable) {
@@ -396,7 +419,7 @@ public void silenceRinger() {
      * @see silenceRinger
      */
     private void silenceRingerInternal() {
-        if ((mPhone.getState() == Phone.State.RINGING)
+        if ((mCM.getState() == Phone.State.RINGING)
             && mApp.notifier.isRinging()) {
             // Ringer is actually playing, so silence it.
             if (DBG) log("silenceRingerInternal: silencing...");
@@ -405,15 +428,15 @@ private void silenceRingerInternal() {
     }
 
     public boolean isOffhook() {
-        return (mPhone.getState() == Phone.State.OFFHOOK);
+        return (mCM.getState() == Phone.State.OFFHOOK);
     }
 
     public boolean isRinging() {
-        return (mPhone.getState() == Phone.State.RINGING);
+        return (mCM.getState() == Phone.State.RINGING);
     }
 
     public boolean isIdle() {
-        return (mPhone.getState() == Phone.State.IDLE);
+        return (mCM.getState() == Phone.State.IDLE);
     }
 
     public boolean isSimPinEnabled() {
@@ -583,7 +606,7 @@ public void cancelMissedCallsNotification() {
     }
 
     public int getCallState() {
-        return DefaultPhoneNotifier.convertCallState(mPhone.getState());
+        return DefaultPhoneNotifier.convertCallState(mCM.getState());
     }
 
     public int getDataState() {
@@ -649,6 +672,22 @@ public List<NeighboringCellInfo> getNeighboringCellInfo() {
     }
 
 
+    public List<CellInfo> getAllCellInfo() {
+        try {
+            mApp.enforceCallingOrSelfPermission(
+                android.Manifest.permission.ACCESS_FINE_LOCATION, null);
+        } catch (SecurityException e) {
+            // If we have ACCESS_FINE_LOCATION permission, skip the check for ACCESS_COARSE_LOCATION
+            // A failure should throw the SecurityException from ACCESS_COARSE_LOCATION since this
+            // is the weaker precondition
+            mApp.enforceCallingOrSelfPermission(
+                android.Manifest.permission.ACCESS_COARSE_LOCATION, null);
+        }
+
+        // TODO return cell info list got from mPhone
+        return null;
+    }
+
     //
     // Internal helper methods.
     //
@@ -740,40 +779,7 @@ public int getVoiceMessageCount() {
      * Returns the network type
      */
     public int getNetworkType() {
-        int radiotech = mPhone.getServiceState().getRadioTechnology();
-        switch(radiotech) {
-            case ServiceState.RADIO_TECHNOLOGY_GPRS:
-                return TelephonyManager.NETWORK_TYPE_GPRS;
-            case ServiceState.RADIO_TECHNOLOGY_EDGE:
-                return TelephonyManager.NETWORK_TYPE_EDGE;
-            case ServiceState.RADIO_TECHNOLOGY_UMTS:
-                return TelephonyManager.NETWORK_TYPE_UMTS;
-            case ServiceState.RADIO_TECHNOLOGY_HSDPA:
-                return TelephonyManager.NETWORK_TYPE_HSDPA;
-            case ServiceState.RADIO_TECHNOLOGY_HSUPA:
-                return TelephonyManager.NETWORK_TYPE_HSUPA;
-            case ServiceState.RADIO_TECHNOLOGY_HSPA:
-                return TelephonyManager.NETWORK_TYPE_HSPA;
-            case ServiceState.RADIO_TECHNOLOGY_IS95A:
-            case ServiceState.RADIO_TECHNOLOGY_IS95B:
-                return TelephonyManager.NETWORK_TYPE_CDMA;
-            case ServiceState.RADIO_TECHNOLOGY_1xRTT:
-                return TelephonyManager.NETWORK_TYPE_1xRTT;
-            case ServiceState.RADIO_TECHNOLOGY_EVDO_0:
-                return TelephonyManager.NETWORK_TYPE_EVDO_0;
-            case ServiceState.RADIO_TECHNOLOGY_EVDO_A:
-                return TelephonyManager.NETWORK_TYPE_EVDO_A;
-            case ServiceState.RADIO_TECHNOLOGY_EVDO_B:
-                return TelephonyManager.NETWORK_TYPE_EVDO_B;
-            case ServiceState.RADIO_TECHNOLOGY_EHRPD:
-                return TelephonyManager.NETWORK_TYPE_EHRPD;
-            case ServiceState.RADIO_TECHNOLOGY_LTE:
-                return TelephonyManager.NETWORK_TYPE_LTE;
-            case ServiceState.RADIO_TECHNOLOGY_HSPAP:
-                return TelephonyManager.NETWORK_TYPE_HSPAP;
-            default:
-                return TelephonyManager.NETWORK_TYPE_UNKNOWN;
-        }
+        return mPhone.getServiceState().getNetworkType();
     }
 
     /**
@@ -794,4 +800,8 @@ public boolean hasIccCard() {
     public int getLteOnCdmaMode() {
         return mPhone.getLteOnCdmaMode();
     }
+
+    public int getLteOnGsmMode() {
+        return mPhone.getLteOnGsmMode();
+    }
 }
diff --git a/src/com/android/phone/PhoneToggler.java b/src/com/android/phone/PhoneToggler.java
new file mode 100755
index 000000000..39acae73e
--- /dev/null
+++ b/src/com/android/phone/PhoneToggler.java
@@ -0,0 +1,183 @@
+package com.android.phone;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncResult;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+
+import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneFactory;
+
+public class PhoneToggler extends BroadcastReceiver  {
+
+    /** Used for brodcasting network data change and receive new mode **/
+    public static final String NETWORK_MODE_CHANGED="com.android.internal.telephony.NETWORK_MODE_CHANGED";
+    public static final String REQUEST_NETWORK_MODE="com.android.internal.telephony.REQUEST_NETWORK_MODE";
+    public static final String MODIFY_NETWORK_MODE="com.android.internal.telephony.MODIFY_NETWORK_MODE";
+    public static final String MOBILE_DATA_CHANGED="com.android.internal.telephony.MOBILE_DATA_CHANGED";
+    public static final String NETWORK_MODE = "networkMode";
+
+    public static final String CHANGE_NETWORK_MODE_PERM= "com.android.phone.CHANGE_NETWORK_MODE";
+    private static final String LOG_TAG = "PhoneToggler";
+    private static final boolean DBG = true;
+
+    private Phone mPhone;
+    private MyHandler mHandler;
+
+
+    private Phone getPhone() {
+        if (mPhone==null) mPhone = PhoneFactory.getDefaultPhone();
+        return mPhone;
+    }
+
+    private MyHandler getHandler() {
+        if (mHandler==null) mHandler = new MyHandler();
+        return mHandler;
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (intent.getAction().equals(MODIFY_NETWORK_MODE)) {
+            if (DBG) Log.d(LOG_TAG,"Got modify intent");
+            if (intent.getExtras()!=null) {
+                int networkMode = intent.getExtras().getInt(NETWORK_MODE);
+                boolean networkModeOk = false;
+                int phoneType = getPhone().getPhoneType();
+                boolean isLteOnCdma = getPhone().getLteOnCdmaMode() == Phone.LTE_ON_CDMA_TRUE;
+
+                if (phoneType == Phone.PHONE_TYPE_GSM) {
+                    if (networkMode == Phone.NT_MODE_GSM_ONLY
+                            || networkMode == Phone.NT_MODE_GSM_UMTS
+                            || networkMode == Phone.NT_MODE_WCDMA_PREF
+                            || networkMode == Phone.NT_MODE_LTE_GSM_WCDMA
+                            || networkMode == Phone.NT_MODE_WCDMA_ONLY) {
+                        networkModeOk = true;
+                    }
+                } else if (phoneType == Phone.PHONE_TYPE_CDMA) {
+                    if (networkMode == Phone.NT_MODE_CDMA
+                            || networkMode == Phone.NT_MODE_CDMA_NO_EVDO
+                            || networkMode == Phone.NT_MODE_EVDO_NO_CDMA) {
+                        networkModeOk = true;
+                    }
+                }
+                if (context.getResources().getBoolean(R.bool.world_phone) || isLteOnCdma) {
+                    if (networkMode == Phone.NT_MODE_GLOBAL) {
+                        networkModeOk = true;
+                    }
+                }
+
+                if (networkModeOk) {
+                    if (DBG) Log.d(LOG_TAG,"Will modify it to: "+networkMode);
+                    changeNetworkMode(networkMode);
+                    if (DBG) Log.d(LOG_TAG,"Accepted modification of network mode to : "+networkMode);
+                } else {
+                    Log.e(LOG_TAG,"Not accepted network mode: "+networkMode);
+                }
+            }
+        } else if (intent.getAction().equals(REQUEST_NETWORK_MODE)) {
+            if (DBG) Log.d(LOG_TAG,"Sending Intent with current phone network mode");
+            triggerIntent();
+        } else {
+            Log.e(LOG_TAG,"Not accepted intent: "+intent.getAction());
+        }
+    }
+
+    private void changeNetworkMode(int modemNetworkMode) {
+        getPhone().setPreferredNetworkType(modemNetworkMode, getHandler()
+                .obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE));
+
+    }
+
+    private void triggerIntent() {
+        getPhone().getPreferredNetworkType(getHandler()
+                .obtainMessage(MyHandler.MESSAGE_GET_PREFERRED_NETWORK_TYPE));
+    }
+
+    private class MyHandler extends Handler {
+
+        private static final int MESSAGE_GET_PREFERRED_NETWORK_TYPE = 0;
+        private static final int MESSAGE_SET_PREFERRED_NETWORK_TYPE = 1;
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MESSAGE_GET_PREFERRED_NETWORK_TYPE:
+                    handleGetPreferredNetworkTypeResponse(msg);
+                    break;
+
+                case MESSAGE_SET_PREFERRED_NETWORK_TYPE:
+                    handleSetPreferredNetworkTypeResponse(msg);
+                    break;
+            }
+        }
+
+        private void handleGetPreferredNetworkTypeResponse(Message msg) {
+            AsyncResult ar = (AsyncResult) msg.obj;
+
+            if (ar.exception == null) {
+                int modemNetworkMode = ((int[])ar.result)[0];
+                if (DBG) Log.d(LOG_TAG,"handleGetPreferredNetworkTypeResponse: modemNetworkMode = "+modemNetworkMode);
+                int settingsNetworkMode = android.provider.Settings.Secure.getInt(
+                        getPhone().getContext().getContentResolver(),
+                        android.provider.Settings.Secure.PREFERRED_NETWORK_MODE,
+                        MobileNetworkSettings.preferredNetworkMode);
+
+                if (DBG) Log.d(LOG_TAG,"handleGetPreferredNetworkTypeReponse: settingsNetworkMode = "+settingsNetworkMode);
+
+                //check that modemNetworkMode is from an accepted value
+                if (modemNetworkMode == Phone.NT_MODE_WCDMA_PREF ||
+                        modemNetworkMode == Phone.NT_MODE_GSM_ONLY ||
+                        modemNetworkMode == Phone.NT_MODE_WCDMA_ONLY ||
+                        modemNetworkMode == Phone.NT_MODE_GSM_UMTS ||
+                        modemNetworkMode == Phone.NT_MODE_LTE_GSM_WCDMA ||
+                        modemNetworkMode == Phone.NT_MODE_CDMA ||
+                        modemNetworkMode == Phone.NT_MODE_CDMA_NO_EVDO ||
+                        modemNetworkMode == Phone.NT_MODE_EVDO_NO_CDMA ||
+                        //A modem might report world phone sometimes
+                        //but it's not true. Double check here
+                        (getPhone().getContext().getResources().getBoolean(R.bool.world_phone) == true &&
+                            modemNetworkMode == Phone.NT_MODE_GLOBAL) ) {
+                    if (DBG) Log.d(LOG_TAG,"handleGetPreferredNetworkTypeResponse: if 1: modemNetworkMode = "+modemNetworkMode);
+
+                    //check changes in modemNetworkMode and updates settingsNetworkMode
+                    if (modemNetworkMode != settingsNetworkMode) {
+                        if (DBG) Log.d(LOG_TAG,"handleGetPreferredNetworkTypeResponse: if 2: modemNetworkMode != settingsNetworkMode");
+                        settingsNetworkMode = modemNetworkMode;
+                        if (DBG) Log.d(LOG_TAG,"handleGetPreferredNetworkTypeResponse: if 2: settingsNetworkMode = "+settingsNetworkMode);
+
+                        //changes the Settings.System accordingly to modemNetworkMode
+                        android.provider.Settings.Secure.putInt(
+                                getPhone().getContext().getContentResolver(),
+                                android.provider.Settings.Secure.PREFERRED_NETWORK_MODE,
+                                settingsNetworkMode );
+                    }
+                    Intent intent = new Intent(NETWORK_MODE_CHANGED);
+                    intent.putExtra(NETWORK_MODE, settingsNetworkMode);
+                    getPhone().getContext().sendBroadcast(intent,CHANGE_NETWORK_MODE_PERM);
+                } else if (modemNetworkMode == Phone.NT_MODE_LTE_ONLY) {
+                    if (DBG) Log.d(LOG_TAG,"handleGetPreferredNetworkTypeResponse: lte only: no action");
+                } else {
+                    if (DBG) Log.d(LOG_TAG,"handleGetPreferredNetworkTypeResponse: else: reset to default");
+                    resetNetworkModeToDefault();
+                }
+            }
+        }
+
+        private void handleSetPreferredNetworkTypeResponse(Message msg) {
+            //PSAFS - TODO: For now no status is stored, so we will always get the real status from Phone.
+            getPhone().getPreferredNetworkType(obtainMessage(MESSAGE_GET_PREFERRED_NETWORK_TYPE));
+        }
+
+        private void resetNetworkModeToDefault() {
+            android.provider.Settings.Secure.putInt(getPhone().getContext().getContentResolver(),
+                        android.provider.Settings.Secure.PREFERRED_NETWORK_MODE,
+                        MobileNetworkSettings.preferredNetworkMode );
+            //Set the Modem
+            getPhone().setPreferredNetworkType(MobileNetworkSettings.preferredNetworkMode,
+                    this.obtainMessage(MyHandler.MESSAGE_SET_PREFERRED_NETWORK_TYPE));
+        }
+    }
+}
diff --git a/src/com/android/phone/PhoneUtils.java b/src/com/android/phone/PhoneUtils.java
index 0bed83df1..9cbc91139 100644
--- a/src/com/android/phone/PhoneUtils.java
+++ b/src/com/android/phone/PhoneUtils.java
@@ -19,8 +19,8 @@
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ProgressDialog;
+import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -32,11 +32,15 @@
 import android.net.Uri;
 import android.net.sip.SipManager;
 import android.os.AsyncResult;
+import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteException;
 import android.os.SystemProperties;
+import android.preference.PreferenceManager;
+import android.provider.ContactsContract;
+import android.provider.Settings;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
 import android.util.Log;
@@ -48,6 +52,7 @@
 import android.widget.Toast;
 
 import com.android.internal.telephony.Call;
+import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.CallStateException;
 import com.android.internal.telephony.CallerInfo;
 import com.android.internal.telephony.CallerInfoAsyncQuery;
@@ -55,9 +60,9 @@
 import com.android.internal.telephony.IExtendedNetworkService;
 import com.android.internal.telephony.MmiCode;
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.TelephonyCapabilities;
 import com.android.internal.telephony.TelephonyProperties;
 import com.android.internal.telephony.cdma.CdmaConnection;
-import com.android.internal.telephony.CallManager;
 import com.android.internal.telephony.sip.SipPhone;
 
 import java.util.ArrayList;
@@ -72,6 +77,9 @@ public class PhoneUtils {
     private static final String LOG_TAG = "PhoneUtils";
     private static final boolean DBG = (PhoneApp.DBG_LEVEL >= 2);
 
+    // Do not check in with VDBG = true, since that may write PII to the system log.
+    private static final boolean VDBG = false;
+
     /** Control stack trace for Audio Mode settings */
     private static final boolean DBG_SETAUDIOMODE_STACK = false;
 
@@ -231,21 +239,24 @@ private PhoneUtils() {
      * @return true if we answered the call, or false if there wasn't
      *         actually a ringing incoming call, or some other error occurred.
      *
-     * @see answerAndEndHolding()
-     * @see answerAndEndActive()
+     * @see #answerAndEndHolding(CallManager, Call)
+     * @see #answerAndEndActive(CallManager, Call)
      */
-    static boolean answerCall(Call ringing) {
+    /* package */ static boolean answerCall(Call ringing) {
         log("answerCall(" + ringing + ")...");
         final PhoneApp app = PhoneApp.getInstance();
 
         // If the ringer is currently ringing and/or vibrating, stop it
-        // right now (before actually answering the call.)
-        app.getRinger().stopRing();
+        // right now and prevent new rings (before actually answering the call)
+        app.notifier.silenceRinger();
 
+        final Phone phone = ringing.getPhone();
+        final boolean phoneIsCdma = (phone.getPhoneType() == Phone.PHONE_TYPE_CDMA);
         boolean answered = false;
-        Phone phone = ringing.getPhone();
-        boolean phoneIsCdma = (phone.getPhoneType() == Phone.PHONE_TYPE_CDMA);
-        BluetoothHandsfree bthf = null;
+        BluetoothHandsfree bluetoothHandsfree = null;
+
+        // enable noise suppression
+        turnOnNoiseSuppression(app.getApplicationContext(), true);
 
         if (phoneIsCdma) {
             // Stop any signalInfo tone being played when a Call waiting gets answered
@@ -278,13 +289,15 @@ static boolean answerCall(Call ringing) {
                         // If a BluetoothHandsfree is valid we need to set the second call state
                         // so that the Bluetooth client can update the Call state correctly when
                         // a call waiting is answered from the Phone.
-                        bthf = app.getBluetoothHandsfree();
-                        if (bthf != null) {
-                            bthf.cdmaSetSecondCallState(true);
+                        bluetoothHandsfree = app.getBluetoothHandsfree();
+                        if (bluetoothHandsfree != null) {
+                            bluetoothHandsfree.cdmaSetSecondCallState(true);
                         }
                     }
                 }
 
+                final boolean isRealIncomingCall = isRealIncomingCall(ringing.getState());
+
                 //if (DBG) log("sPhone.acceptCall");
                 app.mCM.acceptCall(ringing);
                 answered = true;
@@ -295,7 +308,22 @@ static boolean answerCall(Call ringing) {
                 setAudioMode();
 
                 // Check is phone in any dock, and turn on speaker accordingly
-                activateSpeakerIfDocked(phone);
+                final boolean speakerActivated = activateSpeakerIfDocked(phone);
+
+                // When answering a phone call, the user will move the phone near to her/his ear
+                // and start conversation, without checking its speaker status. If some other
+                // application turned on the speaker mode before the call and didn't turn it off,
+                // Phone app would need to be responsible for the speaker phone.
+                // Here, we turn off the speaker if
+                // - the phone call is the first in-coming call,
+                // - we did not activate speaker by ourselves during the process above, and
+                // - Bluetooth headset is not in use.
+                if (isRealIncomingCall && !speakerActivated && isSpeakerOn(app)
+                        && !(bluetoothHandsfree != null && bluetoothHandsfree.isAudioOn())) {
+                    // This is not an error but might cause users' confusion. Add log just in case.
+                    Log.i(LOG_TAG, "Forcing speaker off due to new incoming call...");
+                    turnOnSpeaker(app, false, true);
+                }
             } catch (CallStateException ex) {
                 Log.w(LOG_TAG, "answerCall: caught " + ex, ex);
 
@@ -303,8 +331,8 @@ static boolean answerCall(Call ringing) {
                     // restore the cdmaPhoneCallState and bthf.cdmaSetSecondCallState:
                     app.cdmaPhoneCallState.setCurrentCallState(
                             app.cdmaPhoneCallState.getPreviousCallState());
-                    if (bthf != null) {
-                        bthf.cdmaSetSecondCallState(false);
+                    if (bluetoothHandsfree != null) {
+                        bluetoothHandsfree.cdmaSetSecondCallState(false);
                     }
                 }
             }
@@ -352,6 +380,58 @@ static boolean hangup(CallManager cm) {
         return hungup;
     }
 
+    static Call getCurrentCall(Phone phone) {
+        Call ringing = phone.getRingingCall();
+        Call fg = phone.getForegroundCall();
+        Call bg = phone.getBackgroundCall();
+        if (!ringing.isIdle()) {
+                return ringing;
+                }
+        if (!fg.isIdle()) {
+                return fg;
+                }
+        if (!bg.isIdle()) {
+                return bg;
+                }
+        return fg;
+    }
+
+    static Connection getConnection(Phone phone, Call call) {
+        if (call == null) {
+            return null;
+            }
+
+        if (phone.getPhoneType() == Phone.PHONE_TYPE_CDMA) {
+            return call.getLatestConnection();
+        }
+
+        return call.getEarliestConnection();
+    }
+
+    static class PhoneSettings {
+        static boolean vibOn45Secs(Context context) {
+            return PreferenceManager.getDefaultSharedPreferences(context)
+                    .getBoolean("button_vibrate_45", false);
+        }
+        static boolean vibHangup(Context context) {
+            return PreferenceManager.getDefaultSharedPreferences(context)
+                    .getBoolean("button_vibrate_hangup", false);
+        }
+        static boolean vibOutgoing(Context context) {
+            return PreferenceManager.getDefaultSharedPreferences(context)
+                    .getBoolean("button_vibrate_outgoing", false);
+        }
+
+        static boolean vibCallWaiting(Context context) {
+            return PreferenceManager.getDefaultSharedPreferences(context)
+                    .getBoolean("button_vibrate_call_waiting", false);
+        }
+        static boolean keepProximitySensorOn(Context context) {
+            return PreferenceManager.getDefaultSharedPreferences(context)
+                    .getBoolean("keep_proximity_sensor_on", false);
+        }
+    };
+
     static boolean hangupRingingCall(Call ringing) {
         if (DBG) log("hangup ringing call");
         int phoneType = ringing.getPhone().getPhoneType();
@@ -484,7 +564,20 @@ static boolean answerAndEndHolding(CallManager cm, Call ringing) {
 
     }
 
-    static boolean answerAndEndActive(CallManager cm, Call ringing) {
+    /**
+     * Answers the incoming call specified by "ringing", and ends the currently active phone call.
+     *
+     * This method is useful when's there's an incoming call which we cannot manage with the
+     * current call. e.g. when you are having a phone call with CDMA network and has received
+     * a SIP call, then we won't expect our telephony can manage those phone calls simultaneously.
+     * Note that some types of network may allow multiple phone calls at once; GSM allows to hold
+     * an ongoing phone call, so we don't need to end the active call. The caller of this method
+     * needs to check if the network allows multiple phone calls or not.
+     *
+     * @see #answerCall(Call)
+     * @see InCallScreen#internalAnswerCall()
+     */
+    /* package */ static boolean answerAndEndActive(CallManager cm, Call ringing) {
         if (DBG) log("answerAndEndActive()...");
 
         // Unlike the answerCall() method, we *don't* need to stop the
@@ -496,7 +589,7 @@ static boolean answerAndEndActive(CallManager cm, Call ringing) {
         // hanging up the active call also accepts the waiting call
         // while active call and waiting call are from the same phone
         // i.e. both from GSM phone
-        if ( !hangupActiveCall(cm.getActiveFgCall())) {
+        if (!hangupActiveCall(cm.getActiveFgCall())) {
             Log.w(LOG_TAG, "end active call failed!");
             return false;
         }
@@ -559,7 +652,16 @@ private static void updateCdmaCallStateOnNewOutgoingCall(PhoneApp app) {
     public static int placeCall(Context context, Phone phone,
             String number, Uri contactRef, boolean isEmergencyCall,
             Uri gatewayUri) {
-        if (DBG) log("placeCall '" + number + "' GW:'" + gatewayUri + "'");
+        if (VDBG) {
+            log("placeCall()... number: '" + number + "'"
+                    + ", GW:'" + gatewayUri + "'"
+                    + ", contactRef:" + contactRef
+                    + ", isEmergencyCall: " + isEmergencyCall);
+        } else {
+            log("placeCall()... number: " + toLogSafePhoneNumber(number)
+                    + ", GW: " + (gatewayUri != null ? "non-null" : "null")
+                    + ", emergency? " + isEmergencyCall);
+        }
         final PhoneApp app = PhoneApp.getInstance();
 
         boolean useGateway = false;
@@ -590,6 +692,10 @@ public static int placeCall(Context context, Phone phone,
             numberToDial = number;
         }
 
+        // Remember if the phone state was in IDLE state before this call.
+        // After calling CallManager#dial(), getState() will return different state.
+        final boolean initiallyIdle = app.mCM.getState() == Phone.State.IDLE;
+
         try {
             connection = app.mCM.dial(phone, numberToDial);
         } catch (CallStateException ex) {
@@ -682,12 +788,41 @@ public static int placeCall(Context context, Phone phone,
 
             if (DBG) log("about to activate speaker");
             // Check is phone in any dock, and turn on speaker accordingly
-            activateSpeakerIfDocked(phone);
+            final boolean speakerActivated = activateSpeakerIfDocked(phone);
+
+            // See also similar logic in answerCall().
+            final BluetoothHandsfree bluetoothHandsfree = app.getBluetoothHandsfree();
+            if (initiallyIdle && !speakerActivated && isSpeakerOn(app)
+                    && !(bluetoothHandsfree != null && bluetoothHandsfree.isAudioOn())) {
+                // This is not an error but might cause users' confusion. Add log just in case.
+                Log.i(LOG_TAG, "Forcing speaker off when initiating a new outgoing call...");
+                PhoneUtils.turnOnSpeaker(app, false, true);
+            }
         }
 
         return status;
     }
 
+    private static String toLogSafePhoneNumber(String number) {
+        if (VDBG) {
+            // When VDBG is true we emit PII.
+            return number;
+        }
+
+        // Do exactly same thing as Uri#toSafeString() does, which will enable us to compare
+        // sanitized phone numbers.
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < number.length(); i++) {
+            char c = number.charAt(i);
+            if (c == '-' || c == '@' || c == '.') {
+                builder.append(c);
+            } else {
+                builder.append('x');
+            }
+        }
+        return builder.toString();
+    }
+
     /**
      * Wrapper function to control when to send an empty Flash command to the network.
      * Mainly needed for CDMA networks, such as scenarios when we need to send a blank flash
@@ -799,7 +934,7 @@ static void mergeCalls(CallManager cm) {
 
     static void separateCall(Connection c) {
         try {
-            if (DBG) log("separateCall: " + c.getAddress());
+            if (DBG) log("separateCall: " + toLogSafePhoneNumber(c.getAddress()));
             c.separate();
         } catch (CallStateException ex) {
             Log.w(LOG_TAG, "separateCall: caught " + ex, ex);
@@ -866,11 +1001,12 @@ static Dialog displayMMIInitiate(Context context,
                 mNwService = null;
                 textmsg = context.getText(R.string.ussdRunning);
             }
-            if (DBG) log("Extended NW displayMMIInitiate (" + textmsg+ ")");
+            if (DBG) log("Extended NW displayMMIInitiate (" + textmsg + ")");
             pd.setMessage(textmsg);
             pd.setCancelable(false);
             pd.setIndeterminate(true);
-            pd.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND);
+            pd.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DIM_BEHIND
+                    | WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
             pd.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_DIALOG);
             pd.show();
             // trigger a 15 seconds timeout to clear this progress dialog
@@ -1171,6 +1307,54 @@ public static class VoiceMailNumberMissingException extends Exception {
         }
     }
 
+    /**
+     * Given an Intent (which is presumably the ACTION_CALL intent that
+     * initiated this outgoing call), figure out the actual phone number we
+     * should dial.
+     *
+     * Note that the returned "number" may actually be a SIP address,
+     * if the specified intent contains a sip: URI.
+     *
+     * This method is basically a wrapper around PhoneUtils.getNumberFromIntent(),
+     * except it's also aware of the EXTRA_ACTUAL_NUMBER_TO_DIAL extra.
+     * (That extra, if present, tells us the exact string to pass down to the
+     * telephony layer.  It's guaranteed to be safe to dial: it's either a PSTN
+     * phone number with separators and keypad letters stripped out, or a raw
+     * unencoded SIP address.)
+     *
+     * @return the phone number corresponding to the specified Intent, or null
+     *   if the Intent has no action or if the intent's data is malformed or
+     *   missing.
+     *
+     * @throws VoiceMailNumberMissingException if the intent
+     *   contains a "voicemail" URI, but there's no voicemail
+     *   number configured on the device.
+     */
+    public static String getInitialNumber(Intent intent)
+            throws PhoneUtils.VoiceMailNumberMissingException {
+        if (DBG) log("getInitialNumber(): " + intent);
+
+        String action = intent.getAction();
+        if (TextUtils.isEmpty(action)) {
+            return null;
+        }
+
+        // If the EXTRA_ACTUAL_NUMBER_TO_DIAL extra is present, get the phone
+        // number from there.  (That extra takes precedence over the actual data
+        // included in the intent.)
+        if (intent.hasExtra(OutgoingCallBroadcaster.EXTRA_ACTUAL_NUMBER_TO_DIAL)) {
+            String actualNumberToDial =
+                    intent.getStringExtra(OutgoingCallBroadcaster.EXTRA_ACTUAL_NUMBER_TO_DIAL);
+            if (DBG) {
+                log("==> got EXTRA_ACTUAL_NUMBER_TO_DIAL; returning '"
+                        + toLogSafePhoneNumber(actualNumberToDial) + "'");
+            }
+            return actualNumberToDial;
+        }
+
+        return getNumberFromIntent(PhoneApp.getInstance(), intent);
+    }
+
     /**
      * Gets the phone number to be called from an intent.  Requires a Context
      * to access the contacts database, and a Phone to access the voicemail
@@ -1194,7 +1378,7 @@ public static class VoiceMailNumberMissingException extends Exception {
      * @return the phone number (or SIP address) that would be called by the intent,
      *         or <code>null</code> if the number cannot be found.
      */
-    static String getNumberFromIntent(Context context, Intent intent)
+    private static String getNumberFromIntent(Context context, Intent intent)
             throws VoiceMailNumberMissingException {
         Uri uri = intent.getData();
         String scheme = uri.getScheme();
@@ -1261,7 +1445,7 @@ static CallerInfo getCallerInfo(Context context, Connection c) {
                     // querying a new CallerInfo using the connection's phone number.
                     String number = c.getAddress();
 
-                    if (DBG) log("getCallerInfo: number = " + number);
+                    if (DBG) log("getCallerInfo: number = " + toLogSafePhoneNumber(number));
 
                     if (!TextUtils.isEmpty(number)) {
                         info = CallerInfo.getCallerInfo(context, number);
@@ -1380,7 +1564,7 @@ static CallerInfoToken startGetCallerInfo(Context context, Connection c,
 
             if (DBG) {
                 log("PhoneUtils.startGetCallerInfo: new query for phone number...");
-                log("- number (address): " + number);
+                log("- number (address): " + toLogSafePhoneNumber(number));
                 log("- c: " + c);
                 log("- phone: " + c.getCall().getPhone());
                 int phoneType = c.getCall().getPhone().getPhoneType();
@@ -1405,7 +1589,7 @@ static CallerInfoToken startGetCallerInfo(Context context, Connection c,
             cit.currentInfo.numberPresentation = c.getNumberPresentation();
             cit.currentInfo.namePresentation = c.getCnapNamePresentation();
 
-            if (DBG) {
+            if (VDBG) {
                 log("startGetCallerInfo: number = " + number);
                 log("startGetCallerInfo: CNAP Info from FW(1): name="
                     + cit.currentInfo.cnapName
@@ -1444,7 +1628,9 @@ static CallerInfoToken startGetCallerInfo(Context context, Connection c,
 
             c.setUserData(cit);
 
-            if (DBG) log("startGetCallerInfo: query based on number: " + number);
+            if (DBG) {
+                log("startGetCallerInfo: query based on number: " + toLogSafePhoneNumber(number));
+            }
 
         } else if (userDataObject instanceof CallerInfoToken) {
             // State (2): query is executing, but has not completed.
@@ -1461,7 +1647,10 @@ static CallerInfoToken startGetCallerInfo(Context context, Connection c,
             } else {
                 // handling case where number/name gets updated later on by the network
                 String updatedNumber = c.getAddress();
-                if (DBG) log("startGetCallerInfo: updatedNumber initially = " + updatedNumber);
+                if (DBG) {
+                    log("startGetCallerInfo: updatedNumber initially = "
+                            + toLogSafePhoneNumber(updatedNumber));
+                }
                 if (!TextUtils.isEmpty(updatedNumber)) {
                     // Store CNAP information retrieved from the Connection
                     cit.currentInfo.cnapName =  c.getCnapName();
@@ -1474,10 +1663,17 @@ static CallerInfoToken startGetCallerInfo(Context context, Connection c,
                             updatedNumber, cit.currentInfo.numberPresentation);
 
                     cit.currentInfo.phoneNumber = updatedNumber;
-                    if (DBG) log("startGetCallerInfo: updatedNumber=" + updatedNumber);
-                    if (DBG) log("startGetCallerInfo: CNAP Info from FW(2): name="
-                            + cit.currentInfo.cnapName
-                            + ", Name/Number Pres=" + cit.currentInfo.numberPresentation);
+                    if (DBG) {
+                        log("startGetCallerInfo: updatedNumber="
+                                + toLogSafePhoneNumber(updatedNumber));
+                    }
+                    if (VDBG) {
+                        log("startGetCallerInfo: CNAP Info from FW(2): name="
+                                + cit.currentInfo.cnapName
+                                + ", Name/Number Pres=" + cit.currentInfo.numberPresentation);
+                    } else if (DBG) {
+                        log("startGetCallerInfo: CNAP Info from FW(2)");
+                    }
                     // For scenarios where we may receive a valid number from the network but a
                     // restricted/unavailable presentation, we do not want to perform a contact query
                     // (see note on isFinal above). So we set isFinal to true here as well.
@@ -1501,9 +1697,13 @@ static CallerInfoToken startGetCallerInfo(Context context, Connection c,
                     cit.currentInfo.numberPresentation = c.getNumberPresentation();
                     cit.currentInfo.namePresentation = c.getCnapNamePresentation();
 
-                    if (DBG) log("startGetCallerInfo: CNAP Info from FW(3): name="
-                            + cit.currentInfo.cnapName
-                            + ", Name/Number Pres=" + cit.currentInfo.numberPresentation);
+                    if (VDBG) {
+                        log("startGetCallerInfo: CNAP Info from FW(3): name="
+                                + cit.currentInfo.cnapName
+                                + ", Name/Number Pres=" + cit.currentInfo.numberPresentation);
+                    } else if (DBG) {
+                        log("startGetCallerInfo: CNAP Info from FW(3)");
+                    }
                     cit.isFinal = true; // please see note on isFinal, above.
                 }
             }
@@ -1619,7 +1819,7 @@ static String getCompactNameFromCallerInfo(CallerInfo ci, Context context) {
                 compactName = context.getString(R.string.unknown);
             }
         }
-        if (DBG) log("getCompactNameFromCallerInfo: compactName=" + compactName);
+        if (VDBG) log("getCompactNameFromCallerInfo: compactName=" + compactName);
         return compactName;
     }
 
@@ -1686,14 +1886,14 @@ static boolean isConferenceCall(Call call) {
      * Launch the Dialer to start a new call.
      * This is just a wrapper around the ACTION_DIAL intent.
      */
-    static void startNewCall(final CallManager cm) {
+    /* package */ static boolean startNewCall(final CallManager cm) {
         final PhoneApp app = PhoneApp.getInstance();
 
         // Sanity-check that this is OK given the current state of the phone.
         if (!okToAddCall(cm)) {
             Log.w(LOG_TAG, "startNewCall: can't add a new call in the current state");
             dumpCallManager();
-            return;
+            return false;
         }
 
         // if applicable, mute the call while we're showing the add call UI.
@@ -1711,11 +1911,27 @@ static void startNewCall(final CallManager cm) {
         // it that we're going through the "add call" option from the
         // InCallScreen / PhoneUtils.
         intent.putExtra(ADD_CALL_MODE_KEY, true);
+        try {
+            app.startActivity(intent);
+        } catch (ActivityNotFoundException e) {
+            // This is rather rare but possible.
+            // Note: this method is used even when the phone is encrypted. At that moment
+            // the system may not find any Activity which can accept this Intent.
+            Log.e(LOG_TAG, "Activity for adding calls isn't found.");
+            return false;
+        }
 
-        app.startActivity(intent);
+        return true;
     }
 
-    static void turnOnSpeaker(Context context, boolean flag, boolean store) {
+    /**
+     * Turns on/off speaker.
+     *
+     * @param context Context
+     * @param flag True when speaker should be on. False otherwise.
+     * @param store True when the settings should be stored in the device.
+     */
+    /* package */ static void turnOnSpeaker(Context context, boolean flag, boolean store) {
         if (DBG) log("turnOnSpeaker(flag=" + flag + ", store=" + store + ")...");
         final PhoneApp app = PhoneApp.getInstance();
 
@@ -1761,7 +1977,7 @@ static boolean isSpeakerOn(Context context) {
     }
 
 
-    static void turnOnNoiseSuppression(Context context, boolean flag, boolean store) {
+    static void turnOnNoiseSuppression(Context context, boolean flag) {
         if (DBG) log("turnOnNoiseSuppression: " + flag);
         AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
 
@@ -1769,47 +1985,29 @@ static void turnOnNoiseSuppression(Context context, boolean flag, boolean store)
             return;
         }
 
-        if (flag) {
-            audioManager.setParameters("noise_suppression=auto");
-        } else {
-            audioManager.setParameters("noise_suppression=off");
-        }
-
-        // record the speaker-enable value
-        if (store) {
-            sIsNoiseSuppressionEnabled = flag;
-        }
-
-        // TODO: implement and manage ICON
+        int nsp = android.provider.Settings.System.getInt(context.getContentResolver(),android.provider.Settings.System.NOISE_SUPPRESSION,1);
 
-    }
-
-    static void restoreNoiseSuppression(Context context) {
-        if (DBG) log("restoreNoiseSuppression, restoring to: " + sIsNoiseSuppressionEnabled);
+        String aParam = context.getResources().getString(R.string.in_call_noise_suppression_audioparameter);
+        String[] aPValues = aParam.split("=");
 
-        if (!context.getResources().getBoolean(R.bool.has_in_call_noise_suppression)) {
-            return;
+        if(aPValues[0].length() == 0) {
+            aPValues[0] = "noise_suppression";
         }
 
-        // change the mode if needed.
-        if (isNoiseSuppressionOn(context) != sIsNoiseSuppressionEnabled) {
-            turnOnNoiseSuppression(context, sIsNoiseSuppressionEnabled, false);
+        if(aPValues[1].length() == 0) {
+            aPValues[1] = "on";
         }
-    }
 
-    static boolean isNoiseSuppressionOn(Context context) {
-
-        if (!context.getResources().getBoolean(R.bool.has_in_call_noise_suppression)) {
-            return false;
+        if(aPValues[2].length() == 0) {
+            aPValues[2] = "off";
         }
 
-        AudioManager audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-        String noiseSuppression = audioManager.getParameters("noise_suppression");
-        if (DBG) log("isNoiseSuppressionOn: " + noiseSuppression);
-        if (noiseSuppression.contains("off")) {
-            return false;
+        if (nsp == 1 && flag) {
+            if (DBG) log("turnOnNoiseSuppression: " + aPValues[0] + "=" + aPValues[1]);
+            audioManager.setParameters(aPValues[0] + "=" + aPValues[1]);
         } else {
-            return true;
+            if (DBG) log("turnOnNoiseSuppression: " + aPValues[0] + "=" + aPValues[2]);
+            audioManager.setParameters(aPValues[0] + "=" + aPValues[2]);
         }
     }
 
@@ -1845,17 +2043,19 @@ static void setMute(boolean muted) {
      */
     private static void setMuteInternal(Phone phone, boolean muted) {
         final PhoneApp app = PhoneApp.getInstance();
-        Context context = phone.getContext();
-        boolean routeToAudioManager =
-            context.getResources().getBoolean(R.bool.send_mic_mute_to_AudioManager);
-        if (routeToAudioManager) {
-            AudioManager audioManager =
-                (AudioManager) phone.getContext().getSystemService(Context.AUDIO_SERVICE);
-            if (DBG) log("setMuteInternal: using setMicrophoneMute(" + muted + ")...");
-            audioManager.setMicrophoneMute(muted);
-        } else {
-            if (DBG) log("setMuteInternal: using phone.setMute(" + muted + ")...");
-            phone.setMute(muted);
+        if (phone != null) {
+            Context context = phone.getContext();
+            boolean routeToAudioManager =
+                context.getResources().getBoolean(R.bool.send_mic_mute_to_AudioManager);
+            if (routeToAudioManager) {
+                AudioManager audioManager =
+                    (AudioManager) phone.getContext().getSystemService(Context.AUDIO_SERVICE);
+                if (DBG) log("setMuteInternal: using setMicrophoneMute(" + muted + ")...");
+                audioManager.setMicrophoneMute(muted);
+            } else {
+                if (DBG) log("setMuteInternal: using phone.setMute(" + muted + ")...");
+                phone.setMute(muted);
+            }
         }
         app.notificationMgr.updateMuteNotification();
     }
@@ -2173,8 +2373,11 @@ private static int checkCnapSpecialCases(String n) {
         // displayed/logged after this function returns based on the presentation value.
         if (ci == null || number == null) return number;
 
-        if (DBG) log("modifyForSpecialCnapCases: initially, number=" + number
-                + ", presentation=" + presentation + " ci " + ci);
+        if (DBG) {
+            log("modifyForSpecialCnapCases: initially, number="
+                    + toLogSafePhoneNumber(number)
+                    + ", presentation=" + presentation + " ci " + ci);
+        }
 
         // "ABSENT NUMBER" is a possible value we could get from the network as the
         // phone number, so if this happens, change it to "Unknown" in the CallerInfo
@@ -2201,12 +2404,17 @@ private static int checkCnapSpecialCases(String n) {
                 } else if (cnapSpecialCase == Connection.PRESENTATION_UNKNOWN) {
                     number = context.getString(R.string.unknown);
                 }
-                if (DBG) log("SpecialCnap: number=" + number
-                        + "; presentation now=" + cnapSpecialCase);
+                if (DBG) {
+                    log("SpecialCnap: number=" + toLogSafePhoneNumber(number)
+                            + "; presentation now=" + cnapSpecialCase);
+                }
                 ci.numberPresentation = cnapSpecialCase;
             }
         }
-        if (DBG) log("modifyForSpecialCnapCases: returning number string=" + number);
+        if (DBG) {
+            log("modifyForSpecialCnapCases: returning number string="
+                    + toLogSafePhoneNumber(number));
+        }
         return number;
     }
 
@@ -2343,10 +2551,12 @@ private static int checkCnapSpecialCases(String n) {
     * Check if the phone is in a car dock or desk dock.
     * If yes, turn on the speaker, when no wired or BT headsets are connected.
     * Otherwise do nothing.
+    * @return true if activated
     */
-    private static void activateSpeakerIfDocked(Phone phone) {
+    private static boolean activateSpeakerIfDocked(Phone phone) {
         if (DBG) log("activateSpeakerIfDocked()...");
 
+        boolean activated = false;
         if (PhoneApp.mDockState != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
             if (DBG) log("activateSpeakerIfDocked(): In a dock -> may need to turn on speaker.");
             PhoneApp app = PhoneApp.getInstance();
@@ -2354,8 +2564,10 @@ private static void activateSpeakerIfDocked(Phone phone) {
 
             if (!app.isHeadsetPlugged() && !(bthf != null && bthf.isAudioOn())) {
                 turnOnSpeaker(phone.getContext(), true, true);
+                activated = true;
             }
         }
+        return activated;
     }
 
 
@@ -2388,8 +2600,12 @@ private static void activateSpeakerIfDocked(Phone phone) {
      */
     public static Phone pickPhoneBasedOnNumber(CallManager cm,
             String scheme, String number, String primarySipUri) {
-        if (DBG) log("pickPhoneBasedOnNumber: scheme " + scheme
-                + ", number " + number + ", sipUri " + primarySipUri);
+        if (DBG) {
+            log("pickPhoneBasedOnNumber: scheme " + scheme
+                    + ", number " + toLogSafePhoneNumber(number)
+                    + ", sipUri "
+                    + (primarySipUri != null ? Uri.parse(primarySipUri).toSafeString() : "null"));
+        }
 
         if (primarySipUri != null) {
             Phone phone = getSipPhoneFromUri(cm, primarySipUri);
@@ -2413,9 +2629,12 @@ public static Phone getSipPhoneFromUri(CallManager cm, String target) {
         return null;
     }
 
+    /**
+     * Returns true when the given call is in INCOMING state and there's no foreground phone call,
+     * meaning the call is the first real incoming call the phone is having.
+     */
     public static boolean isRealIncomingCall(Call.State state) {
         return (state == Call.State.INCOMING && !PhoneApp.getInstance().mCM.hasActiveFgCall());
-
     }
 
     private static boolean sVoipSupported = false;
@@ -2433,6 +2652,49 @@ static boolean isVoipSupported() {
         return sVoipSupported;
     }
 
+    /**
+     * On GSM devices, we never use short tones.
+     * On CDMA devices, it depends upon the settings.
+     */
+    public static boolean useShortDtmfTones(Phone phone, Context context) {
+        int phoneType = phone.getPhoneType();
+        if (phoneType == Phone.PHONE_TYPE_GSM) {
+            return false;
+        } else if (phoneType == Phone.PHONE_TYPE_CDMA) {
+            int toneType = android.provider.Settings.System.getInt(
+                    context.getContentResolver(),
+                    Settings.System.DTMF_TONE_TYPE_WHEN_DIALING,
+                    CallFeaturesSetting.DTMF_TONE_TYPE_NORMAL);
+            if (toneType == CallFeaturesSetting.DTMF_TONE_TYPE_NORMAL) {
+                return true;
+            } else {
+                return false;
+            }
+        } else if (phoneType == Phone.PHONE_TYPE_SIP) {
+            return false;
+        } else {
+            throw new IllegalStateException("Unexpected phone type: " + phoneType);
+        }
+    }
+
+    public static String getPresentationString(Context context, int presentation) {
+        String name = context.getString(R.string.unknown);
+        if (presentation == Connection.PRESENTATION_RESTRICTED) {
+            name = context.getString(R.string.private_num);
+        } else if (presentation == Connection.PRESENTATION_PAYPHONE) {
+            name = context.getString(R.string.payphone);
+        }
+        return name;
+    }
+
+    public static void sendViewNotificationAsync(Context context, Uri contactUri) {
+        if (DBG) Log.d(LOG_TAG, "Send view notification to Contacts (uri: " + contactUri + ")");
+        Intent intent = new Intent("com.android.contacts.VIEW_NOTIFICATION", contactUri);
+        intent.setClassName("com.android.contacts",
+                "com.android.contacts.ViewNotificationService");
+        context.startService(intent);
+    }
+
     //
     // General phone and call state debugging/testing code
     //
diff --git a/src/com/android/phone/RespondViaSmsManager.java b/src/com/android/phone/RespondViaSmsManager.java
index 451198f95..ea9e188a0 100644
--- a/src/com/android/phone/RespondViaSmsManager.java
+++ b/src/com/android/phone/RespondViaSmsManager.java
@@ -18,6 +18,7 @@
 
 import com.android.internal.telephony.Call;
 import com.android.internal.telephony.Connection;
+import com.android.internal.telephony.Phone;
 
 import android.app.ActionBar;
 import android.app.AlertDialog;
@@ -89,6 +90,8 @@ public class RespondViaSmsManager {
     private static final String KEY_CANNED_RESPONSE_PREF_3 = "canned_response_pref_3";
     private static final String KEY_CANNED_RESPONSE_PREF_4 = "canned_response_pref_4";
 
+    private static final String ACTION_SENDTO_NO_CONFIRMATION =
+            "com.android.mms.intent.action.SENDTO_NO_CONFIRMATION";
 
     /**
      * RespondViaSmsManager constructor.
@@ -98,6 +101,12 @@ public RespondViaSmsManager() {
 
     public void setInCallScreenInstance(InCallScreen inCallScreen) {
         mInCallScreen = inCallScreen;
+
+        if (mInCallScreen != null) {
+            // Prefetch shared preferences to make the first canned response lookup faster
+            // (and to prevent StrictMode violation)
+            mInCallScreen.getSharedPreferences(SHARED_PREFERENCES_NAME, Context.MODE_PRIVATE);
+        }
     }
 
     /**
@@ -111,9 +120,6 @@ public void showRespondViaSmsPopup(Call ringingCall) {
         ListView lv = new ListView(mInCallScreen);
 
         // Refresh the array of "canned responses".
-        // TODO: don't do this here in the UI thread!  (This lookup is very
-        // cheap, but it's still a StrictMode violation.  See the TODO comment
-        // following loadCannedResponses() for more info.)
         mCannedResponses = loadCannedResponses();
 
         // Build the list: start with the canned responses, but manually add
@@ -183,6 +189,10 @@ public void dismissPopup() {
         }
     }
 
+    public boolean isShowingPopup() {
+        return mPopup != null && mPopup.isShowing();
+    }
+
     /**
      * OnItemClickListener for the "Respond via SMS" popup.
      */
@@ -197,6 +207,7 @@ public RespondViaSmsItemClickListener(String phoneNumber) {
         /**
          * Handles the user selecting an item from the popup.
          */
+        @Override
         public void onItemClick(AdapterView<?> parent,  // The ListView
                                 View view,  // The TextView that was clicked
                                 int position,
@@ -245,7 +256,17 @@ public void onItemClick(AdapterView<?> parent,  // The ListView
             // So reject the call now.
             mInCallScreen.hangupRingingCall();
 
-            PhoneApp.getInstance().dismissCallScreen();
+            dismissPopup();
+
+            final Phone.State state = PhoneApp.getInstance().mCM.getState();
+            if (state == Phone.State.IDLE) {
+                // There's no other phone call to interact. Exit the entire in-call screen.
+                PhoneApp.getInstance().dismissCallScreen();
+            } else {
+                // The user is still in the middle of other phone calls, so we should keep the
+                // in-call screen.
+                mInCallScreen.requestUpdateScreen();
+            }
         }
     }
 
@@ -260,28 +281,39 @@ public RespondViaSmsCancelListener() {
          * Handles the user canceling the popup, either by touching
          * outside the popup or by pressing Back.
          */
+        @Override
         public void onCancel(DialogInterface dialog) {
             if (DBG) log("RespondViaSmsCancelListener.onCancel()...");
 
-            // If the user cancels the popup, this presumably means that
-            // they didn't actually mean to bring up the "Respond via SMS"
-            // UI in the first place (and instead want to go back to the
-            // state where they can either answer or reject the call.)
-            // So restart the ringer and bring back the regular incoming
-            // call UI.
+            dismissPopup();
 
-            // This will have no effect if the incoming call isn't still ringing.
-            PhoneApp.getInstance().notifier.restartRinger();
+            final Phone.State state = PhoneApp.getInstance().mCM.getState();
+            if (state == Phone.State.IDLE) {
+                // This means the incoming call is already hung up when the user chooses not to
+                // use "Respond via SMS" feature. Let's just exit the whole in-call screen.
+                PhoneApp.getInstance().dismissCallScreen();
+            } else {
 
-            // We hid the MultiWaveView widget way back in
-            // InCallTouchUi.onTrigger(), when the user first selected
-            // the "SMS" trigger.
-            //
-            // To bring it back, just force the entire InCallScreen to
-            // update itself based on the current telephony state.
-            // (Assuming the incoming call is still ringing, this will
-            // cause the incoming call widget to reappear.)
-            mInCallScreen.requestUpdateScreen();
+                // If the user cancels the popup, this presumably means that
+                // they didn't actually mean to bring up the "Respond via SMS"
+                // UI in the first place (and instead want to go back to the
+                // state where they can either answer or reject the call.)
+                // So restart the ringer and bring back the regular incoming
+                // call UI.
+
+                // This will have no effect if the incoming call isn't still ringing.
+                PhoneApp.getInstance().notifier.restartRinger();
+
+                // We hid the GlowPadView widget way back in
+                // InCallTouchUi.onTrigger(), when the user first selected
+                // the "SMS" trigger.
+                //
+                // To bring it back, just force the entire InCallScreen to
+                // update itself based on the current telephony state.
+                // (Assuming the incoming call is still ringing, this will
+                // cause the incoming call widget to reappear.)
+                mInCallScreen.requestUpdateScreen();
+            }
         }
     }
 
@@ -292,10 +324,7 @@ private void sendText(String phoneNumber, String message) {
         if (VDBG) log("sendText: number "
                       + phoneNumber + ", message '" + message + "'");
 
-        Uri uri = Uri.fromParts(Constants.SCHEME_SMSTO, phoneNumber, null);
-        Intent intent = new Intent("com.android.mms.intent.action.SENDTO_NO_CONFIRMATION", uri);
-        intent.putExtra(Intent.EXTRA_TEXT, message);
-        mInCallScreen.startService(intent);
+        mInCallScreen.startService(getInstantTextIntent(phoneNumber, message));
     }
 
     /**
@@ -304,32 +333,30 @@ private void sendText(String phoneNumber, String message) {
     private void launchSmsCompose(String phoneNumber) {
         if (VDBG) log("launchSmsCompose: number " + phoneNumber);
 
-        Uri uri = Uri.fromParts(Constants.SCHEME_SMS, phoneNumber, null);
-        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+        Intent intent = getInstantTextIntent(phoneNumber, null);
 
         if (VDBG) log("- Launching SMS compose UI: " + intent);
-        mInCallScreen.startActivity(intent);
-
-        // TODO: One open issue here: if the user selects "Custom message"
-        // for an incoming call while the device was locked, and the user
-        // does *not* have a secure keyguard set, we bring up the
-        // non-secure keyguard at this point :-(
-        // Instead, we should immediately go to the SMS compose UI.
-        //
-        // I *believe* the fix is for the SMS compose activity to set the
-        // FLAG_DISMISS_KEYGUARD window flag (which will cause the
-        // keyguard to be dismissed *only* if it is not a secure lock
-        // keyguard.)
-        //
-        // But it there an equivalent way for me to accomplish that here,
-        // without needing to change the SMS app?
-        //
-        // In any case, I'm pretty sure the SMS UI should *not* to set
-        // FLAG_SHOW_WHEN_LOCKED, since we do want the force the user to
-        // enter their lock pattern or PIN at this point if they have a
-        // secure keyguard set.
+        mInCallScreen.startService(intent);
     }
 
+    /**
+     * @param phoneNumber Must not be null.
+     * @param message Can be null. If message is null, the returned Intent will be configured to
+     * launch the SMS compose UI. If non-null, the returned Intent will cause the specified message
+     * to be sent with no interaction from the user.
+     * @return Service Intent for the instant response.
+     */
+    private static Intent getInstantTextIntent(String phoneNumber, String message) {
+        Uri uri = Uri.fromParts(Constants.SCHEME_SMSTO, phoneNumber, null);
+        Intent intent = new Intent(ACTION_SENDTO_NO_CONFIRMATION, uri);
+        if (message != null) {
+            intent.putExtra(Intent.EXTRA_TEXT, message);
+        } else {
+            intent.putExtra("exit_on_sent", true);
+            intent.putExtra("showUI", true);
+        }
+        return intent;
+    }
 
     /**
      * Settings activity under "Call settings" to let you manage the
@@ -382,6 +409,7 @@ protected void onCreate(Bundle icicle) {
         }
 
         // Preference.OnPreferenceChangeListener implementation
+        @Override
         public boolean onPreferenceChange(Preference preference, Object newValue) {
             if (DBG) log("onPreferenceChange: key = " + preference.getKey());
             if (VDBG) log("  preference = '" + preference + "'");
@@ -417,7 +445,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
      * This method does disk I/O (reading the SharedPreferences file)
      * so don't call it from the main thread.
      *
-     * @see RespondViaSmsManager$Settings
+     * @see RespondViaSmsManager.Settings
      */
     private String[] loadCannedResponses() {
         if (DBG) log("loadCannedResponses()...");
@@ -442,29 +470,6 @@ private String[] loadCannedResponses() {
                                        res.getString(R.string.respond_via_sms_canned_response_4));
         return responses;
     }
-    // TODO: Don't call loadCannedResponses() from the UI thread.
-    //
-    // We should either (1) kick off a background task when the call first
-    // starts ringing (probably triggered from the InCallScreen
-    // onNewRingingConnection() method) which would run loadCannedResponses()
-    // and stash the result away in mCannedResponses, or (2) use an
-    // OnSharedPreferenceChangeListener to listen for changes to this
-    // SharedPreferences instance, and use that to kick off the background task.
-    //
-    // In either case:
-    //
-    // - Make sure we recover sanely if mCannedResponses is still null when it's
-    //   actually time to show the popup (i.e. if the background task was too
-    //   slow, or if the background task never got started for some reason)
-    //
-    // - Make sure that all setting and getting of mCannedResponses happens
-    //   inside a synchronized block
-    //
-    // - If we kick off the background task when the call first starts ringing,
-    //   consider delaying that until the incoming-call UI actually comes to the
-    //   foreground; this way we won't steal any CPU away from the caller-id
-    //   query.  Maybe do it from InCallScreen.onResume()?
-    //   Or InCallTouchUi.showIncomingCallWidget()?
 
     /**
      * @return true if the "Respond via SMS" feature should be enabled
@@ -484,7 +489,7 @@ private String[] loadCannedResponses() {
      * networks at least), so we still enable this feature even though
      * SMSes to that number will silently fail.
      */
-    public static boolean allowRespondViaSmsForCall(Call ringingCall) {
+    public static boolean allowRespondViaSmsForCall(Context context, Call ringingCall) {
         if (DBG) log("allowRespondViaSmsForCall(" + ringingCall + ")...");
 
         // First some basic sanity checks:
@@ -538,6 +543,12 @@ public static boolean allowRespondViaSmsForCall(Call ringingCall) {
             return false;
         }
 
+        // Allow the feature only when there's a destination for it.
+        if (context.getPackageManager().resolveService(getInstantTextIntent(number, null) , 0)
+                == null) {
+            return false;
+        }
+
         // TODO: with some carriers (in certain countries) you *can* actually
         // tell whether a given number is a mobile phone or not.  So in that
         // case we could potentially return false here if the incoming call is
diff --git a/src/com/android/phone/Ringer.java b/src/com/android/phone/Ringer.java
index a800f7eed..9122f0cc0 100644
--- a/src/com/android/phone/Ringer.java
+++ b/src/com/android/phone/Ringer.java
@@ -16,11 +16,13 @@
 
 package com.android.phone;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.media.AudioManager;
 import android.media.Ringtone;
 import android.media.RingtoneManager;
 import android.net.Uri;
+import android.provider.Settings;
 import android.os.Handler;
 import android.os.IPowerManager;
 import android.os.Looper;
@@ -29,7 +31,9 @@
 import android.os.ServiceManager;
 import android.os.SystemClock;
 import android.os.SystemProperties;
+import android.os.SystemVibrator;
 import android.os.Vibrator;
+import android.provider.Settings;
 import android.util.Log;
 
 import com.android.internal.telephony.Phone;
@@ -43,6 +47,7 @@ public class Ringer {
 
     private static final int PLAY_RING_ONCE = 1;
     private static final int STOP_RING = 3;
+    private static final int INCREASE_RING_VOLUME = 4;
 
     private static final int VIBRATE_LENGTH = 1000; // ms
     private static final int PAUSE_LENGTH = 1000; // ms
@@ -51,18 +56,22 @@ public class Ringer {
     private static Ringer sInstance;
 
     // Uri for the ringtone.
-    Uri mCustomRingtoneUri;
+    Uri mCustomRingtoneUri = Settings.System.DEFAULT_RINGTONE_URI;
 
     Ringtone mRingtone;
-    Vibrator mVibrator = new Vibrator();
+    Vibrator mVibrator;
+    AudioManager mAudioManager;
     IPowerManager mPowerManager;
     volatile boolean mContinueVibrating;
     VibratorThread mVibratorThread;
     Context mContext;
     private Worker mRingThread;
+    private Handler mHandler;
     private Handler mRingHandler;
     private long mFirstRingEventTime = -1;
     private long mFirstRingStartTime = -1;
+    private int mRingerVolumeSetting = -1;
+    private int mRingIncreaseInterval;
 
     /**
      * Initialize the singleton Ringer instance.
@@ -82,7 +91,11 @@ public class Ringer {
     /** Private constructor; @see init() */
     private Ringer(Context context) {
         mContext = context;
+        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
         mPowerManager = IPowerManager.Stub.asInterface(ServiceManager.getService(Context.POWER_SERVICE));
+        // We don't rely on getSystemService(Context.VIBRATOR_SERVICE) to make sure this
+        // vibrator object will be isolated from others.
+        mVibrator = new SystemVibrator();
     }
 
     /**
@@ -146,9 +159,9 @@ void ring() {
             try {
                 if (PhoneApp.getInstance().showBluetoothIndication()) {
                     mPowerManager.setAttentionLight(true, 0x000000ff);
-		} else {
+                } else {
                     mPowerManager.setAttentionLight(true, 0x00ffffff);
-		}
+                }
             } catch (RemoteException ex) {
                 // the other end of this binder call is in the system process.
             }
@@ -159,16 +172,39 @@ void ring() {
                 if (DBG) log("- starting vibrator...");
                 mVibratorThread.start();
             }
-            AudioManager audioManager =
-                    (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
 
-            if (audioManager.getStreamVolume(AudioManager.STREAM_RING) == 0) {
+            int ringerVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_RING);
+            if (ringerVolume == 0 && mRingerVolumeSetting <= 0) {
                 if (DBG) log("skipping ring because volume is zero");
                 return;
             }
 
             makeLooper();
             if (mFirstRingEventTime < 0) {
+                ContentResolver cr = mContext.getContentResolver();
+                boolean increasing = Settings.System.getInt(cr,
+                        Settings.System.INCREASING_RING, 0) == 1;
+                int minVolume = Settings.System.getInt(cr,
+                        Settings.System.INCREASING_RING_MIN_VOLUME, 1);
+
+                if (increasing && minVolume < ringerVolume) {
+                    mRingIncreaseInterval = Settings.System.getInt(cr,
+                            Settings.System.INCREASING_RING_INTERVAL, 0);
+
+                    mRingerVolumeSetting = ringerVolume;
+                    mAudioManager.setStreamVolume(AudioManager.STREAM_RING, minVolume, 0);
+                    if (DBG) {
+                        log("increasing ring is enabled, starting at " +
+                                minVolume + "/" + ringerVolume);
+                    }
+                    if (mRingIncreaseInterval > 0) {
+                        mHandler.sendEmptyMessageDelayed(
+                                INCREASE_RING_VOLUME, mRingIncreaseInterval);
+                    }
+                } else {
+                    mRingerVolumeSetting = -1;
+                }
+
                 mFirstRingEventTime = SystemClock.elapsedRealtime();
                 mRingHandler.sendEmptyMessage(PLAY_RING_ONCE);
             } else {
@@ -181,6 +217,9 @@ void ring() {
                     if (DBG) {
                         log("delaying ring by " + (mFirstRingStartTime - mFirstRingEventTime));
                     }
+                    if (mRingerVolumeSetting > 0 && mRingIncreaseInterval == 0) {
+                        mHandler.sendEmptyMessage(INCREASE_RING_VOLUME);
+                    }
                     mRingHandler.sendEmptyMessageDelayed(PLAY_RING_ONCE,
                             mFirstRingStartTime - mFirstRingEventTime);
                 } else {
@@ -194,8 +233,12 @@ void ring() {
     }
 
     boolean shouldVibrate() {
-        AudioManager audioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
-        return audioManager.shouldVibrate(AudioManager.VIBRATE_TYPE_RINGER);
+        int ringerMode = mAudioManager.getRingerMode();
+        if (CallFeaturesSetting.getVibrateWhenRinging(mContext)) {
+            return ringerMode != AudioManager.RINGER_MODE_SILENT;
+        } else {
+            return ringerMode == AudioManager.RINGER_MODE_VIBRATE;
+        }
     }
 
     /**
@@ -212,6 +255,15 @@ void stopRing() {
                 // the other end of this binder call is in the system process.
             }
 
+            if (mHandler != null) {
+                mHandler.removeCallbacksAndMessages(null);
+                mHandler = null;
+            }
+            if (mRingerVolumeSetting >= 0) {
+                if (DBG) log("- stopRing: resetting ring volume to " + mRingerVolumeSetting);
+                mAudioManager.setStreamVolume(AudioManager.STREAM_RING, mRingerVolumeSetting, 0);
+                mRingerVolumeSetting = -1;
+            }
             if (mRingHandler != null) {
                 mRingHandler.removeCallbacksAndMessages(null);
                 Message msg = mRingHandler.obtainMessage(STOP_RING);
@@ -292,6 +344,30 @@ void setCustomRingtoneUri (Uri uri) {
     }
 
     private void makeLooper() {
+        if (mHandler == null) {
+            mHandler = new Handler() {
+                @Override
+                public void handleMessage(Message msg) {
+                    switch (msg.what) {
+                        case INCREASE_RING_VOLUME:
+                            int ringerVolume = mAudioManager.getStreamVolume(AudioManager.STREAM_RING);
+                            if (mRingerVolumeSetting > 0 && ringerVolume < mRingerVolumeSetting) {
+                                ringerVolume++;
+                                if (DBG) {
+                                    log("increasing ring volume to " +
+                                            ringerVolume + "/" + mRingerVolumeSetting);
+                                }
+                                mAudioManager.setStreamVolume(AudioManager.STREAM_RING, ringerVolume, 0);
+                                if (mRingIncreaseInterval > 0) {
+                                    sendEmptyMessageDelayed(INCREASE_RING_VOLUME, mRingIncreaseInterval);
+                                }
+                            }
+                            break;
+                    }
+                }
+            };
+        }
+
         if (mRingThread == null) {
             mRingThread = new Worker("ringer");
             mRingHandler = new Handler(mRingThread.getLooper()) {
diff --git a/src/com/android/phone/SipCallOptionHandler.java b/src/com/android/phone/SipCallOptionHandler.java
index 0734cd767..64d18c522 100644
--- a/src/com/android/phone/SipCallOptionHandler.java
+++ b/src/com/android/phone/SipCallOptionHandler.java
@@ -224,7 +224,7 @@ protected Dialog onCreateDialog(int id) {
         case DIALOG_SELECT_PHONE_TYPE:
             dialog = new AlertDialog.Builder(this)
                     .setTitle(R.string.pick_outgoing_call_phone_type)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
                     .setSingleChoiceItems(R.array.phone_type_values, -1, this)
                     .setNegativeButton(android.R.string.cancel, this)
                     .setOnCancelListener(this)
@@ -233,7 +233,7 @@ protected Dialog onCreateDialog(int id) {
         case DIALOG_SELECT_OUTGOING_SIP_PHONE:
             dialog = new AlertDialog.Builder(this)
                     .setTitle(R.string.pick_outgoing_sip_phone)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
                     .setSingleChoiceItems(getProfileNameArray(), -1, this)
                     .setNegativeButton(android.R.string.cancel, this)
                     .setOnCancelListener(this)
@@ -244,7 +244,7 @@ protected Dialog onCreateDialog(int id) {
             dialog = new AlertDialog.Builder(this)
                     .setTitle(R.string.no_sip_account_found_title)
                     .setMessage(R.string.no_sip_account_found)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
                     .setPositiveButton(R.string.sip_menu_add, this)
                     .setNegativeButton(android.R.string.cancel, this)
                     .setOnCancelListener(this)
@@ -257,7 +257,7 @@ protected Dialog onCreateDialog(int id) {
                                        : R.string.no_internet_available_title)
                     .setMessage(wifiOnly ? R.string.no_wifi_available
                                          : R.string.no_internet_available)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
                     .setPositiveButton(android.R.string.ok, this)
                     .setOnCancelListener(this)
                     .create();
@@ -265,7 +265,7 @@ protected Dialog onCreateDialog(int id) {
         case DIALOG_NO_VOIP:
             dialog = new AlertDialog.Builder(this)
                     .setTitle(R.string.no_voip)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
                     .setPositiveButton(android.R.string.ok, this)
                     .setOnCancelListener(this)
                     .create();
diff --git a/src/com/android/phone/SmallerHitTargetTouchListener.java b/src/com/android/phone/SmallerHitTargetTouchListener.java
new file mode 100644
index 000000000..74f46f783
--- /dev/null
+++ b/src/com/android/phone/SmallerHitTargetTouchListener.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2012 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.phone;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+/**
+ * OnTouchListener used to shrink the "hit target" of some onscreen buttons.
+ *
+ * We do this for a few specific buttons which are vulnerable to
+ * "false touches" because either (1) they're near the edge of the
+ * screen and might be unintentionally touched while holding the
+ * device in your hand, or (2) they're in the upper corners and might
+ * be touched by the user's ear before the prox sensor has a chance to
+ * kick in.
+ *
+ * TODO (new ICS layout): not sure which buttons need this yet.
+ * For now, use it only with the "End call" button (which extends all
+ * the way to the edges of the screen).  But we can consider doing
+ * this for "Dialpad" and/or "Add call" if those turn out to be a
+ * problem too.
+ */
+public class SmallerHitTargetTouchListener implements View.OnTouchListener {
+    /**
+     * Width of the allowable "hit target" as a percentage of
+     * the total width of this button.
+     */
+    private static final int HIT_TARGET_PERCENT_X = 50;
+
+    /**
+     * Height of the allowable "hit target" as a percentage of
+     * the total height of this button.
+     *
+     * This is larger than HIT_TARGET_PERCENT_X because some of
+     * the onscreen buttons are wide but not very tall and we don't
+     * want to make the vertical hit target *too* small.
+     */
+    private static final int HIT_TARGET_PERCENT_Y = 80;
+
+    // Size (percentage-wise) of the "edge" area that's *not* touch-sensitive.
+    private static final int X_EDGE = (100 - HIT_TARGET_PERCENT_X) / 2;
+    private static final int Y_EDGE = (100 - HIT_TARGET_PERCENT_Y) / 2;
+    // Min/max values (percentage-wise) of the touch-sensitive hit target.
+    private static final int X_HIT_MIN = X_EDGE;
+    private static final int X_HIT_MAX = 100 - X_EDGE;
+    private static final int Y_HIT_MIN = Y_EDGE;
+    private static final int Y_HIT_MAX = 100 - Y_EDGE;
+
+    // True if the most recent DOWN event was a "hit".
+    boolean mDownEventHit;
+
+    /**
+     * Called when a touch event is dispatched to a view. This allows listeners to
+     * get a chance to respond before the target view.
+     *
+     * @return True if the listener has consumed the event, false otherwise.
+     *         (In other words, we return true when the touch is *outside*
+     *         the "smaller hit target", which will prevent the actual
+     *         button from handling these events.)
+     */
+    @Override
+    public boolean onTouch(View v, MotionEvent event) {
+        // if (DBG) log("SmallerHitTargetTouchListener: " + v + ", event " + event);
+
+        if (event.getAction() == MotionEvent.ACTION_DOWN) {
+            // Note that event.getX() and event.getY() are already
+            // translated into the View's coordinates.  (In other words,
+            // "0,0" is a touch on the upper-left-most corner of the view.)
+            int touchX = (int) event.getX();
+            int touchY = (int) event.getY();
+
+            int viewWidth = v.getWidth();
+            int viewHeight = v.getHeight();
+
+            // Touch location as a percentage of the total button width or height.
+            int touchXPercent = (int) ((float) (touchX * 100) / (float) viewWidth);
+            int touchYPercent = (int) ((float) (touchY * 100) / (float) viewHeight);
+            // if (DBG) log("- percentage:  x = " + touchXPercent + ",  y = " + touchYPercent);
+
+            // TODO: user research: add event logging here of the actual
+            // hit location (and button ID), and enable it for dogfooders
+            // for a few days.  That'll give us a good idea of how close
+            // to the center of the button(s) most touch events are, to
+            // help us fine-tune the HIT_TARGET_PERCENT_* constants.
+
+            if (touchXPercent < X_HIT_MIN || touchXPercent > X_HIT_MAX
+                    || touchYPercent < Y_HIT_MIN || touchYPercent > Y_HIT_MAX) {
+                // Missed!
+                // if (DBG) log("  -> MISSED!");
+                mDownEventHit = false;
+                return true;  // Consume this event; don't let the button see it
+            } else {
+                // Hit!
+                // if (DBG) log("  -> HIT!");
+                mDownEventHit = true;
+                return false;  // Let this event through to the actual button
+            }
+        } else {
+            // This is a MOVE, UP or CANCEL event.
+            //
+            // We only do the "smaller hit target" check on DOWN events.
+            // For the subsequent MOVE/UP/CANCEL events, we let them
+            // through to the actual button IFF the previous DOWN event
+            // got through to the actual button (i.e. it was a "hit".)
+            return !mDownEventHit;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/phone/SpecialCharSequenceMgr.java b/src/com/android/phone/SpecialCharSequenceMgr.java
index 34c0a32d4..35519a68d 100644
--- a/src/com/android/phone/SpecialCharSequenceMgr.java
+++ b/src/com/android/phone/SpecialCharSequenceMgr.java
@@ -27,6 +27,8 @@
 import android.util.Log;
 import android.view.WindowManager;
 
+import com.android.internal.telephony.TelephonyCapabilities;
+
 /**
  * Helper class to listen for some magic dialpad character sequences
  * that are handled specially by the Phone app.
diff --git a/src/com/android/phone/TelephonyCapabilities.java b/src/com/android/phone/TelephonyCapabilities.java
deleted file mode 100644
index ebb68386c..000000000
--- a/src/com/android/phone/TelephonyCapabilities.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * Copyright (C) 2010 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.phone;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.util.Log;
-
-import com.android.internal.telephony.Phone;
-
-/**
- * TODO: This is intended as a temporary repository for behavior policy
- * functions that depend upon the type of phone or the carrier.  Ultimately
- * these sorts of questions should be answered by the telephony layer.
- */
-public class TelephonyCapabilities {
-    private static final String LOG_TAG = "TelephonyCapabilities";
-
-    /** This class is never instantiated. */
-    private TelephonyCapabilities() {
-    }
-
-    /**
-     * On GSM devices, we never use short tones.
-     * On CDMA devices, it depends upon the settings.
-     * TODO: I don't think this has anything to do with GSM versus CDMA,
-     * should we be looking only at the setting?
-     */
-    /* package */ static boolean useShortDtmfTones(Phone phone, Context context) {
-        int phoneType = phone.getPhoneType();
-        if (phoneType == Phone.PHONE_TYPE_GSM) {
-            return false;
-        } else if (phoneType == Phone.PHONE_TYPE_CDMA) {
-            int toneType = android.provider.Settings.System.getInt(
-                    context.getContentResolver(),
-                Settings.System.DTMF_TONE_TYPE_WHEN_DIALING,
-                CallFeaturesSetting.DTMF_TONE_TYPE_NORMAL);
-            if (toneType == CallFeaturesSetting.DTMF_TONE_TYPE_NORMAL) {
-                return true;
-            } else {
-                return false;
-            }
-        } else if (phoneType == Phone.PHONE_TYPE_SIP) {
-            return false;
-        } else {
-            throw new IllegalStateException("Unexpected phone type: " + phoneType);
-        }
-    }
-
-    /**
-     * Return true if the current phone supports ECM ("Emergency Callback
-     * Mode"), which is a feature where the device goes into a special
-     * state for a short period of time after making an outgoing emergency
-     * call.
-     *
-     * (On current devices, that state lasts 5 minutes.  It prevents data
-     * usage by other apps, to avoid conflicts with any possible incoming
-     * calls.  It also puts up a notification in the status bar, showing a
-     * countdown while ECM is active, and allowing the user to exit ECM.)
-     *
-     * Currently this is assumed to be true for CDMA phones, and false
-     * otherwise.
-     *
-     * TODO: This capability should really be exposed by the telephony
-     * layer, since it depends on the underlying telephony technology.
-     * (Or, is this actually carrier-specific?  Is it VZW-only?)
-     */
-    /* package */ static boolean supportsEcm(Phone phone) {
-        return (phone.getPhoneType() == Phone.PHONE_TYPE_CDMA);
-    }
-
-    /**
-     * Return true if the current phone supports Over The Air Service
-     * Provisioning (OTASP)
-     *
-     * Currently this is assumed to be true for CDMA phones, and false
-     * otherwise.
-     *
-     * TODO: This capability should really be exposed by the telephony
-     * layer, since it depends on the underlying telephony technology.
-     *
-     * TODO: Watch out: this is also highly carrier-specific, since the
-     * OTA procedure is different from one carrier to the next, *and* the
-     * different carriers may want very different onscreen UI as well.
-     * The procedure may even be different for different devices with the
-     * same carrier.
-     *
-     * So we eventually will need a much more flexible, pluggable design.
-     * This method here is just a placeholder to reduce hardcoded
-     * "if (CDMA)" checks sprinkled throughout the rest of the phone app.
-     *
-     * TODO: consider using the term "OTASP" rather "OTA" everywhere in the
-     * phone app, since OTA can also mean over-the-air software updates.
-     */
-    /* package */ static boolean supportsOtasp(Phone phone) {
-        return (phone.getPhoneType() == Phone.PHONE_TYPE_CDMA);
-    }
-
-    /**
-     * Return true if the current phone can retrieve the voice message count.
-     *
-     * Currently this is assumed to be true on CDMA phones and false otherwise.
-     *
-     * TODO: This capability should really be exposed by the telephony
-     * layer, since it depends on the underlying telephony technology.
-     */
-    /* package */ static boolean supportsVoiceMessageCount(Phone phone) {
-        return (phone.getPhoneType() == Phone.PHONE_TYPE_CDMA);
-    }
-
-    /**
-     * Return true if this phone allows the user to select which
-     * network to use.
-     *
-     * Currently this is assumed to be true only on GSM phones.
-     *
-     * TODO: Should CDMA phones allow this as well?
-     */
-    /* package */ static boolean supportsNetworkSelection(Phone phone) {
-        return (phone.getPhoneType() == Phone.PHONE_TYPE_GSM);
-    }
-
-    /**
-     * Returns a resource ID for a label to use when displaying the
-     * "device id" of the current device.  (This is currently used as the
-     * title of the "device id" dialog.)
-     *
-     * This is specific to the device's telephony technology: the device
-     * id is called "IMEI" on GSM phones and "MEID" on CDMA phones.
-     * TODO: ultimately this name should come directly from the
-     * telephony layer.
-     */
-    /* package */ static int getDeviceIdLabel(Phone phone) {
-        if (phone.getPhoneType() == Phone.PHONE_TYPE_GSM) {
-            return R.string.imei;
-        } else if (phone.getPhoneType() == Phone.PHONE_TYPE_CDMA) {
-            return R.string.meid;
-        } else {
-            Log.w(LOG_TAG, "getDeviceIdLabel: no known label for phone "
-                  + phone.getPhoneName());
-            return 0;
-        }
-    }
-
-    /**
-     * Return true if the current phone supports the ability to explicitly
-     * manage the state of a conference call (i.e. view the participants,
-     * and hangup or separate individual callers.)
-     *
-     * The in-call screen's "Manage conference" UI is available only on
-     * devices that support this feature.
-     *
-     * Currently this is assumed to be true on GSM phones and false otherwise.
-     * TODO: This capability should really be exposed by the telephony
-     * layer, since it depends on the underlying telephony technology.
-     */
-    /* package */ static boolean supportsConferenceCallManagement(Phone phone) {
-        return ((phone.getPhoneType() == Phone.PHONE_TYPE_GSM)
-                || (phone.getPhoneType() == Phone.PHONE_TYPE_SIP));
-    }
-
-    /**
-     * Return true if the current phone supports explicit "Hold" and
-     * "Unhold" actions for an active call.  (If so, the in-call UI will
-     * provide onscreen "Hold" / "Unhold" buttons.)
-     *
-     * Currently this is assumed to be true on GSM phones and false
-     * otherwise.  (In particular, CDMA has no concept of "putting a call
-     * on hold.")
-     * TODO: This capability should really be exposed by the telephony
-     * layer, since it depends on the underlying telephony technology.
-     */
-    /* package */ static boolean supportsHoldAndUnhold(Phone phone) {
-        return ((phone.getPhoneType() == Phone.PHONE_TYPE_GSM)
-                || (phone.getPhoneType() == Phone.PHONE_TYPE_SIP));
-    }
-
-    /**
-     * Return true if the current phone supports distinct "Answer & Hold"
-     * and "Answer & End" behaviors in the call-waiting scenario.  If so,
-     * the in-call UI may provide separate buttons or menu items for these
-     * two actions.
-     *
-     * Currently this is assumed to be true on GSM phones and false
-     * otherwise.  (In particular, CDMA has no concept of explicitly
-     * managing the background call, or "putting a call on hold.")
-     *
-     * TODO: This capability should really be exposed by the telephony
-     * layer, since it depends on the underlying telephony technology.
-     *
-     * TODO: It might be better to expose this capability in a more
-     * generic form, like maybe "supportsExplicitMultipleLineManagement()"
-     * rather than focusing specifically on call-waiting behavior.
-     */
-    /* package */ static boolean supportsAnswerAndHold(Phone phone) {
-        return ((phone.getPhoneType() == Phone.PHONE_TYPE_GSM)
-                || (phone.getPhoneType() == Phone.PHONE_TYPE_SIP));
-    }
-}
diff --git a/src/com/android/phone/TelephonyDebugService.java b/src/com/android/phone/TelephonyDebugService.java
new file mode 100644
index 000000000..fdfe8f516
--- /dev/null
+++ b/src/com/android/phone/TelephonyDebugService.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2012 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.phone;
+
+import com.android.internal.telephony.DebugService;
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.util.Log;
+
+import java.io.FileDescriptor;
+import java.io.PrintWriter;
+
+/**
+ * A debug service for telephony.
+ */
+public class TelephonyDebugService extends Service {
+    private static String TAG = "TelephonyDebugService";
+    private DebugService mDebugService = new DebugService();
+
+    /** Constructor */
+    public TelephonyDebugService() {
+        Log.d(TAG, "TelephonyDebugService()");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
+        mDebugService.dump(fd, pw, args);
+    }
+}
+
diff --git a/src/com/android/phone/TimeConsumingPreferenceActivity.java b/src/com/android/phone/TimeConsumingPreferenceActivity.java
index 94568f2d7..89275e79d 100644
--- a/src/com/android/phone/TimeConsumingPreferenceActivity.java
+++ b/src/com/android/phone/TimeConsumingPreferenceActivity.java
@@ -21,11 +21,28 @@ interface  TimeConsumingPreferenceListener {
 }
 
 public class TimeConsumingPreferenceActivity extends PreferenceActivity
-                        implements TimeConsumingPreferenceListener, DialogInterface.OnClickListener,
+                        implements TimeConsumingPreferenceListener,
                         DialogInterface.OnCancelListener {
     private static final String LOG_TAG = "TimeConsumingPreferenceActivity";
     private final boolean DBG = (PhoneApp.DBG_LEVEL >= 2);
 
+    private class DismissOnClickListener implements DialogInterface.OnClickListener {
+        @Override
+        public void onClick(DialogInterface dialog, int which) {
+            dialog.dismiss();
+        }
+    }
+    private class DismissAndFinishOnClickListener implements DialogInterface.OnClickListener {
+        @Override
+        public void onClick(DialogInterface dialog, int which) {
+            dialog.dismiss();
+            finish();
+        }
+    }
+    private final DialogInterface.OnClickListener mDismiss = new DismissOnClickListener();
+    private final DialogInterface.OnClickListener mDismissAndFinish
+            = new DismissAndFinishOnClickListener();
+
     private static final int BUSY_READING_DIALOG = 100;
     private static final int BUSY_SAVING_DIALOG = 200;
 
@@ -34,7 +51,7 @@ public class TimeConsumingPreferenceActivity extends PreferenceActivity
     static final int RADIO_OFF_ERROR = 500;
     static final int FDN_CHECK_FAILURE = 600;
 
-    private final ArrayList<String> mBusyList=new ArrayList<String> ();
+    private final ArrayList<String> mBusyList = new ArrayList<String>();
 
     protected boolean mIsForeground = false;
 
@@ -61,7 +78,7 @@ protected Dialog onCreateDialog(int id) {
 
         if (id == RESPONSE_ERROR || id == RADIO_OFF_ERROR || id == EXCEPTION_ERROR
                 || id == FDN_CHECK_FAILURE) {
-            AlertDialog.Builder b = new AlertDialog.Builder(this);
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
             int msgId;
             int titleId = R.string.error_updating_title;
@@ -69,33 +86,29 @@ protected Dialog onCreateDialog(int id) {
             switch (id) {
                 case RESPONSE_ERROR:
                     msgId = R.string.response_error;
-                    // Set Button 2, tells the activity that the error is
-                    // recoverable on dialog exit.
-                    b.setNegativeButton(R.string.close_dialog, this);
+                    builder.setPositiveButton(R.string.close_dialog, mDismiss);
                     break;
                 case RADIO_OFF_ERROR:
                     msgId = R.string.radio_off_error;
-                    // Set Button 3
-                    b.setNeutralButton(R.string.close_dialog, this);
+                    // The error is not recoverable on dialog exit.
+                    builder.setPositiveButton(R.string.close_dialog, mDismissAndFinish);
                     break;
                 case FDN_CHECK_FAILURE:
-                    msgId = R.string.fdn_only_error;
-                    // Set Button 2
-                    b.setNegativeButton(R.string.close_dialog, this);
+                    msgId = R.string.fdn_check_failure;
+                    builder.setPositiveButton(R.string.close_dialog, mDismiss);
                     break;
                 case EXCEPTION_ERROR:
                 default:
                     msgId = R.string.exception_error;
-                    // Set Button 3, tells the activity that the error is
-                    // not recoverable on dialog exit.
-                    b.setNeutralButton(R.string.close_dialog, this);
+                    // The error is not recoverable on dialog exit.
+                    builder.setPositiveButton(R.string.close_dialog, mDismissAndFinish);
                     break;
             }
 
-            b.setTitle(getText(titleId));
-            b.setMessage(getText(msgId));
-            b.setCancelable(false);
-            AlertDialog dialog = b.create();
+            builder.setTitle(getText(titleId));
+            builder.setMessage(getText(msgId));
+            builder.setCancelable(false);
+            AlertDialog dialog = builder.create();
 
             // make the dialog more obvious by blurring the background.
             dialog.getWindow().addFlags(WindowManager.LayoutParams.FLAG_BLUR_BEHIND);
@@ -117,10 +130,7 @@ public void onPause() {
         mIsForeground = false;
     }
 
-    public void onClick(DialogInterface dialog, int which) {
-        dialog.dismiss();
-    }
-
+    @Override
     public void onStarted(Preference preference, boolean reading) {
         if (DBG) dumpState();
         if (DBG) Log.d(LOG_TAG, "onStarted, preference=" + preference.getKey()
@@ -137,6 +147,7 @@ public void onStarted(Preference preference, boolean reading) {
 
     }
 
+    @Override
     public void onFinished(Preference preference, boolean reading) {
         if (DBG) dumpState();
         if (DBG) Log.d(LOG_TAG, "onFinished, preference=" + preference.getKey()
@@ -150,8 +161,10 @@ public void onFinished(Preference preference, boolean reading) {
                 dismissDialogSafely(BUSY_SAVING_DIALOG);
             }
         }
+        preference.setEnabled(true);
     }
 
+    @Override
     public void onError(Preference preference, int error) {
         if (DBG) dumpState();
         if (DBG) Log.d(LOG_TAG, "onError, preference=" + preference.getKey() + ", error=" + error);
@@ -159,8 +172,10 @@ public void onError(Preference preference, int error) {
         if (mIsForeground) {
             showDialog(error);
         }
+        preference.setEnabled(false);
     }
 
+    @Override
     public void onException(Preference preference, CommandException exception) {
         if (exception.getCommandError() == CommandException.Error.FDN_CHECK_FAILURE) {
             onError(preference, FDN_CHECK_FAILURE);
@@ -169,6 +184,8 @@ public void onException(Preference preference, CommandException exception) {
             onError(preference, EXCEPTION_ERROR);
         }
     }
+
+    @Override
     public void onCancel(DialogInterface dialog) {
         if (DBG) dumpState();
         finish();
@@ -184,7 +201,7 @@ private void dismissDialogSafely(int id) {
         }
     }
 
-    void dumpState() {
+    /* package */ void dumpState() {
         Log.d(LOG_TAG, "dumpState begin");
         for (String key : mBusyList) {
             Log.d(LOG_TAG, "mBusyList: key=" + key);
diff --git a/src/com/android/phone/Use2GOnlyCheckBoxPreference.java b/src/com/android/phone/Use2GOnlyCheckBoxPreference.java
index f3a3a9560..a25882eb1 100644
--- a/src/com/android/phone/Use2GOnlyCheckBoxPreference.java
+++ b/src/com/android/phone/Use2GOnlyCheckBoxPreference.java
@@ -28,7 +28,6 @@
 
 public class Use2GOnlyCheckBoxPreference extends CheckBoxPreference {
     private static final String LOG_TAG = "Use2GOnlyCheckBoxPreference";
-    private static final boolean DBG = true;
 
     private Phone mPhone;
     private MyHandler mHandler;
@@ -63,8 +62,8 @@ protected void  onClick() {
 
     private class MyHandler extends Handler {
 
-        private static final int MESSAGE_GET_PREFERRED_NETWORK_TYPE = 0;
-        private static final int MESSAGE_SET_PREFERRED_NETWORK_TYPE = 1;
+        static final int MESSAGE_GET_PREFERRED_NETWORK_TYPE = 0;
+        static final int MESSAGE_SET_PREFERRED_NETWORK_TYPE = 1;
 
         @Override
         public void handleMessage(Message msg) {
diff --git a/src/com/android/phone/sip/SipEditor.java b/src/com/android/phone/sip/SipEditor.java
index e1bfaff16..bab46adef 100644
--- a/src/com/android/phone/sip/SipEditor.java
+++ b/src/com/android/phone/sip/SipEditor.java
@@ -68,6 +68,7 @@ public class SipEditor extends PreferenceActivity
     private boolean mDisplayNameSet;
     private boolean mHomeButtonClicked;
     private boolean mUpdateRequired;
+    private boolean mUpdatedFieldIsEmpty;
 
     private SipManager mSipManager;
     private SipProfileDb mProfileDb;
@@ -181,12 +182,6 @@ public void onCreate(Bundle savedInstanceState) {
         mPrimaryAccountSelector = new PrimaryAccountSelector(p);
 
         loadPreferencesFromProfile(p);
-
-        ActionBar actionBar = getActionBar();
-        if (actionBar != null) {
-            // android.R.id.home will be triggered in onOptionsItemSelected()
-            actionBar.setDisplayHomeAsUpEnabled(true);
-        }
     }
 
     @Override
@@ -202,10 +197,10 @@ public void onPause() {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
+        menu.add(0, MENU_DISCARD, 0, R.string.sip_menu_discard)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
         menu.add(0, MENU_SAVE, 0, R.string.sip_menu_save)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-        menu.add(0, MENU_DISCARD, 0, R.string.sip_menu_discard)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         menu.add(0, MENU_REMOVE, 0, R.string.remove_sip_account)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         return true;
@@ -215,14 +210,13 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onPrepareOptionsMenu(Menu menu) {
         MenuItem removeMenu = menu.findItem(MENU_REMOVE);
         removeMenu.setVisible(mOldProfile != null);
+        menu.findItem(MENU_SAVE).setEnabled(mUpdateRequired);
         return super.onPrepareOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-            case android.R.id.home: // See ActionBar#setDisplayHomeAsUpEnabled()
-                // This time just work as "back" or "save" capability.
             case MENU_SAVE:
                 validateAndSetResult();
                 return true;
@@ -298,10 +292,11 @@ private void showAlert(final String message) {
             return;
         }
         runOnUiThread(new Runnable() {
+            @Override
             public void run() {
                 new AlertDialog.Builder(SipEditor.this)
                         .setTitle(android.R.string.dialog_alert_title)
-                        .setIcon(android.R.drawable.ic_dialog_alert)
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
                         .setMessage(message)
                         .setPositiveButton(R.string.alert_dialog_ok, null)
                         .show();
@@ -441,7 +436,10 @@ public boolean onPreferenceChange(Preference pref, Object newValue) {
                 unregisterProfile(mOldProfile.getUriString());
             }
         }
-        if (pref instanceof CheckBoxPreference) return true;
+        if (pref instanceof CheckBoxPreference) {
+            invalidateOptionsMenu();
+            return true;
+        }
         String value = (newValue == null) ? "" : newValue.toString();
         if (TextUtils.isEmpty(value)) {
             pref.setSummary(getPreferenceKey(pref).defaultSummary);
@@ -455,6 +453,9 @@ public boolean onPreferenceChange(Preference pref, Object newValue) {
             ((EditTextPreference) pref).setText(value);
             checkIfDisplayNameSet();
         }
+
+        // SAVE menu should be enabled once the user modified some preference.
+        invalidateOptionsMenu();
         return true;
     }
 
diff --git a/src/com/android/phone/sip/SipSettings.java b/src/com/android/phone/sip/SipSettings.java
index 226ee7a5d..ef3ba48db 100644
--- a/src/com/android/phone/sip/SipSettings.java
+++ b/src/com/android/phone/sip/SipSettings.java
@@ -46,7 +46,6 @@
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.widget.Button;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -186,23 +185,25 @@ protected void onActivityResult(final int requestCode, final int resultCode,
             final Intent intent) {
         if (resultCode != RESULT_OK && resultCode != RESULT_FIRST_USER) return;
         new Thread() {
+            @Override
             public void run() {
-            try {
-                if (mProfile != null) {
-                    Log.v(TAG, "Removed Profile:" + mProfile.getProfileName());
-                    deleteProfile(mProfile);
-                }
+                try {
+                    if (mProfile != null) {
+                        Log.v(TAG, "Removed Profile:" + mProfile.getProfileName());
+                        deleteProfile(mProfile);
+                    }
 
-                SipProfile profile = intent.getParcelableExtra(KEY_SIP_PROFILE);
-                if (resultCode == RESULT_OK) {
-                    Log.v(TAG, "New Profile Name:" + profile.getProfileName());
-                    addProfile(profile);
+                    SipProfile profile = intent.getParcelableExtra(KEY_SIP_PROFILE);
+                    if (resultCode == RESULT_OK) {
+                        Log.v(TAG, "New Profile Name:" + profile.getProfileName());
+                        addProfile(profile);
+                    }
+                    updateProfilesStatus();
+                } catch (IOException e) {
+                    Log.v(TAG, "Can not handle the profile : " + e.getMessage());
                 }
-                updateProfilesStatus();
-            } catch (IOException e) {
-                Log.v(TAG, "Can not handle the profile : " + e.getMessage());
             }
-        }}.start();
+        }.start();
     }
 
     private void registerForReceiveCallsCheckBox() {
@@ -265,6 +266,7 @@ private SipProfile updateAutoRegistrationFlag(
 
     private void updateProfilesStatus() {
         new Thread(new Runnable() {
+            @Override
             public void run() {
                 try {
                     retrieveSipLists();
@@ -288,6 +290,7 @@ private void retrieveSipLists() {
         mSipProfileList = mProfileDb.retrieveSipProfileList();
         processActiveProfilesFromSipService();
         Collections.sort(mSipProfileList, new Comparator<SipProfile>() {
+            @Override
             public int compare(SipProfile p1, SipProfile p2) {
                 return getProfileName(p1).compareTo(getProfileName(p2));
             }
@@ -345,6 +348,7 @@ private void addPreferenceFor(SipProfile p) {
 
         pref.setOnPreferenceClickListener(
                 new Preference.OnPreferenceClickListener() {
+                    @Override
                     public boolean onPreferenceClick(Preference pref) {
                         handleProfileClick(((SipPreference) pref).mProfile);
                         return true;
@@ -360,9 +364,10 @@ private void handleProfileClick(final SipProfile profile) {
         }
         new AlertDialog.Builder(this)
                 .setTitle(R.string.alert_dialog_close)
-                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setIconAttribute(android.R.attr.alertDialogIcon)
                 .setPositiveButton(R.string.close_profile,
                         new DialogInterface.OnClickListener() {
+                            @Override
                             public void onClick(DialogInterface dialog, int w) {
                                 deleteProfile(profile);
                                 unregisterProfile(profile);
@@ -375,6 +380,7 @@ public void onClick(DialogInterface dialog, int w) {
     private void unregisterProfile(final SipProfile p) {
         // run it on background thread for better UI response
         new Thread(new Runnable() {
+            @Override
             public void run() {
                 try {
                     mSipManager.close(p.getUriString());
@@ -412,6 +418,7 @@ private void startSipEditor(final SipProfile profile) {
     private void showRegistrationMessage(final String profileUri,
             final String message) {
         runOnUiThread(new Runnable() {
+            @Override
             public void run() {
                 SipPreference pref = mSipPreferenceMap.get(profileUri);
                 if (pref != null) {
@@ -423,16 +430,19 @@ public void run() {
 
     private SipRegistrationListener createRegistrationListener() {
         return new SipRegistrationListener() {
+            @Override
             public void onRegistrationDone(String profileUri, long expiryTime) {
                 showRegistrationMessage(profileUri, getString(
                         R.string.registration_status_done));
             }
 
+            @Override
             public void onRegistering(String profileUri) {
                 showRegistrationMessage(profileUri, getString(
                         R.string.registration_status_registering));
             }
 
+            @Override
             public void onRegistrationFailed(String profileUri, int errorCode,
                     String message) {
                 switch (errorCode) {